From: TimePath Date: Fri, 30 Jan 2015 03:45:37 +0000 (+1100) Subject: Update uncrustify.cfg X-Git-Tag: xonotic-v0.8.1~133^2~9 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=32783a659701677a769aa69f77cbc7fcaaee6291;p=xonotic%2Fxonotic-data.pk3dir.git Update uncrustify.cfg --- diff --git a/qcsrc/uncrustify.cfg b/qcsrc/uncrustify.cfg index 982e527f9..4709cdc2d 100644 --- a/qcsrc/uncrustify.cfg +++ b/qcsrc/uncrustify.cfg @@ -140,11 +140,9 @@ indent_func_def_force_col1 = false # false/true indent_func_call_param = true # false/true # Same as indent_func_call_param, but for function defs -# WARNING: Code doesn't seem to use this feature - delete from the config? -indent_func_def_param = false # false/true +indent_func_def_param = true # false/true # Same as indent_func_call_param, but for function protos -# WARNING: Code doesn't seem to use this feature - delete from the config? indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations @@ -160,7 +158,7 @@ indent_func_ctor_var_param = false # false/true indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = true # false/true +indent_func_param_double = false # false/true # Indentation column for standalone 'const' function decl/proto qualifier # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -213,8 +211,7 @@ indent_access_spec = 0 # number 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) -# WARNING: Code doesn't seem to use this feature - delete from the config? -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true #force # Controls the indent of a close paren after a newline. # 0: Indent to body level @@ -262,10 +259,10 @@ indent_oc_msg_colon = 0 # number #ignore # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = ignore # ignore/add/remove/force #force +sp_arith = add # ignore/add/remove/force #force # Add or remove space around assignment operator '=', '+=', etc -# NOTE: is 54 worse than ignore +# NOTE: is 64 worse than ignore sp_assign = add # ignore/add/remove/force # Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign @@ -297,13 +294,13 @@ sp_enum_before_assign = ignore # ignore/add/remove/force #f sp_enum_after_assign = ignore # ignore/add/remove/force #force # Add or remove space around preprocessor '##' concatenation operator. Default=Add -# NOTE: is 4 worse than ignore sp_pp_concat = remove # ignore/add/remove/force # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. sp_pp_stringify = remove # ignore/add/remove/force # Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. +# NOTE: is 6 worse than ignore sp_before_pp_stringify = add # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' @@ -311,7 +308,7 @@ sp_before_pp_stringify = add # ignore/add/remove/force sp_bool = add # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -# NOTE: is 198 worse than ignore +# NOTE: is 210 worse than ignore sp_compare = add # ignore/add/remove/force # Add or remove space inside '(' and ')' @@ -335,24 +332,28 @@ 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 = add # ignore/add/remove/force +# WARNING: Code doesn't seem to use this feature - delete from the config? +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' # WARNING: Code doesn't seem to use this feature - delete from the config? 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 +# WARNING: Code doesn't seem to use this feature - delete from the config? +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 = add # ignore/add/remove/force +# WARNING: Code doesn't seem to use this feature - delete from the config? +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). # WARNING: Code doesn't seem to use this feature - delete from the config? 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 = add # ignore/add/remove/force +# WARNING: Code doesn't seem to use this feature - delete from the config? +sp_before_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&' # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -417,10 +418,10 @@ sp_angle_shift = ignore # ignore/add/remove/force sp_permit_cpp11_shift = false # false/true # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = remove # ignore/add/remove/force #force +sp_before_sparen = add # ignore/add/remove/force #force # Add or remove space inside if-condition '(' and ')' -# NOTE: is 42 worse than ignore +# NOTE: is 68 worse than ignore sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. @@ -430,8 +431,7 @@ sp_inside_sparen_close = ignore # ignore/add/remove/force #f sp_inside_sparen_open = ignore # ignore/add/remove/force #force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -# WARNING: Code doesn't seem to use this feature - delete from the config? -sp_after_sparen = ignore # 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 @@ -457,7 +457,7 @@ sp_before_semi_for = remove # 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 -# NOTE: is 56 worse than ignore +# NOTE: is 42 worse than ignore sp_after_semi = add # ignore/add/remove/force # Add or remove space after ';' in non-empty 'for' statements. Default=Force @@ -480,7 +480,7 @@ sp_inside_square = remove # ignore/add/remove/force sp_after_comma = add # ignore/add/remove/force #force # Add or remove space before ',' -# NOTE: is 58 worse than ignore +# NOTE: is 26 worse than ignore sp_before_comma = remove # ignore/add/remove/force # Add or remove space between an open paren and comma: '(,' vs '( ,' @@ -547,18 +547,18 @@ sp_inside_braces_empty = remove # ignore/add/remove/force sp_type_func = add # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -# NOTE: is 30 worse than ignore +# NOTE: is 138 worse than ignore sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -# NOTE: is 400 worse than ignore +# NOTE: is 236 worse than ignore sp_func_def_paren = remove # 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 ')' -# NOTE: is 78 worse than ignore +# NOTE: is 68 worse than ignore sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space inside the first parens in the function type: 'void (*x)(...)' @@ -577,7 +577,7 @@ sp_square_fparen = ignore # ignore/add/remove/force sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -# NOTE: is 940 worse than ignore +# NOTE: is 436 worse than ignore sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between function name and '()' on function calls without parameters. @@ -600,8 +600,7 @@ sp_return_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)' -# WARNING: Code doesn't seem to use this feature - delete from the config? -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = remove # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -687,7 +686,7 @@ sp_inv = remove # ignore/add/remove/force sp_addr = ignore # ignore/add/remove/force # Add or remove space around the '.' or '->' operators. Default=Remove -# NOTE: is 28 worse than ignore +# NOTE: is 26 worse than ignore sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. Default=Remove @@ -938,7 +937,7 @@ align_typedef_star_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 = 2 # number +align_right_cmt_span = indent_columns # 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 @@ -1102,12 +1101,11 @@ nl_var_def_blk_in = 0 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -# NOTE: is 28 worse than ignore +# NOTE: is 23 worse than ignore nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -# WARNING: Code doesn't seem to use this feature - delete from the config? -nl_enum_brace = ignore # ignore/add/remove/force +nl_enum_brace = remove # ignore/add/remove/force # Add or remove newline between 'struct and '{' nl_struct_brace = add # ignore/add/remove/force @@ -1117,7 +1115,7 @@ nl_struct_brace = add # ignore/add/remove/force nl_union_brace = ignore # ignore/add/remove/force # Add or remove newline between 'if' and '{' -# NOTE: is 231 worse than ignore +# NOTE: is 136 worse than ignore nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' @@ -1150,7 +1148,7 @@ nl_try_brace = ignore # ignore/add/remove/force nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -# NOTE: is 93 worse than ignore +# NOTE: is 109 worse than ignore nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' @@ -1162,7 +1160,7 @@ nl_catch_brace = ignore # ignore/add/remove/force nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -# NOTE: is 21 worse than ignore +# NOTE: is 22 worse than ignore nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'scope (x)' and '{' (D) @@ -1193,7 +1191,7 @@ nl_do_brace = add # ignore/add/remove/force nl_brace_while = add # ignore/add/remove/force #force # Add or remove newline between 'switch' and '{' -# NOTE: is 21 worse than ignore +# NOTE: is 24 worse than ignore 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. @@ -1215,7 +1213,7 @@ nl_before_throw = ignore # ignore/add/remove/force nl_after_case = false # false/true # Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. -# NOTE: is 27 worse than ignore +# NOTE: is 125 worse than ignore nl_case_colon_brace = add # ignore/add/remove/force # Newline between namespace and { @@ -1258,11 +1256,11 @@ nl_func_paren = remove # ignore/add/remove/force nl_func_def_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -# NOTE: is 6 worse than ignore +# NOTE: is 19 worse than ignore nl_func_decl_start = remove # ignore/add/remove/force # Add or remove newline after '(' in a function definition -# NOTE: is 23 worse than ignore +# NOTE: is 26 worse than ignore nl_func_def_start = remove # ignore/add/remove/force # Overrides nl_func_decl_start when there is only one parameter. @@ -1272,11 +1270,10 @@ nl_func_decl_start_single = ignore # ignore/add/remove/force #f nl_func_def_start_single = ignore # ignore/add/remove/force #force # Add or remove newline after each ',' in a function declaration -# NOTE: is 38 worse than ignore +# NOTE: is 6 worse than ignore nl_func_decl_args = remove # ignore/add/remove/force # Add or remove newline after each ',' in a function definition -# NOTE: is 37 worse than ignore nl_func_def_args = remove # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration @@ -1302,11 +1299,11 @@ nl_func_def_empty = remove # ignore/add/remove/force nl_oc_msg_args = false # false/true #ignore # Add or remove newline between function signature and '{' -# NOTE: is 156 worse than ignore +# NOTE: is 159 worse than ignore nl_fdef_brace = add # ignore/add/remove/force # Add or remove a newline between the return keyword and return expression. -# NOTE: is 15 worse than ignore +# NOTE: is 6 worse than ignore nl_return_expr = remove # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements @@ -1379,7 +1376,6 @@ nl_before_do = ignore # ignore/add/remove/force #f nl_after_do = ignore # ignore/add/remove/force #force # Whether to double-space commented-entries in struct/enum -# WARNING: Code doesn't seem to use this feature - delete from the config? nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum @@ -1496,11 +1492,10 @@ nl_before_c_comment = 0 # number nl_before_cpp_comment = 0 # number # Whether to force a newline after a multi-line comment. -# WARNING: Code doesn't seem to use this feature - delete from the config? nl_after_multiline_comment = false # false/true # The number of newlines after '}' or ';' of a struct/enum/union definition -# WARNING: Code doesn't seem to use this feature - delete from the config? +# WARNING: Best is not unique (0 1) nl_after_struct = 0 # number # The number of newlines after '}' or ';' of a class definition @@ -1552,8 +1547,7 @@ eat_blanks_before_close_brace = true # false/true #force # 1: Remove most newlines not handled by other config # 2: Remove all newlines and reformat completely by config # ERROR: nl_remove_extra_newlines = 1 crashes with status 139. -# ERROR: nl_remove_extra_newlines = 2 crashes with status 139. -# WARNING: Best is not unique (0 indent_columns) +# WARNING: Best is not unique (0 3) nl_remove_extra_newlines = 0 # number # Whether to put a blank line before 'return' statements, unless after an open brace. @@ -1579,7 +1573,7 @@ nl_between_annotation = ignore # ignore/add/remove/force mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -# NOTE: is 5 worse than ignore +# NOTE: is 3 worse than ignore mod_full_brace_for = remove # ignore/add/remove/force # Add or remove braces on single-line function definitions. (Pawn) @@ -1603,7 +1597,7 @@ mod_full_brace_while = remove # ignore/add/remove/force mod_full_brace_using = ignore # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -# NOTE: is 42 worse than ignore +# NOTE: is 54 worse than ignore mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons @@ -1650,7 +1644,7 @@ 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. -# NOTE: is 507 worse than ignore +# NOTE: is 78 worse than ignore 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.