Обновление

default.cfg

@@ -1,4 +1,4 @@
-# Uncrustify-0.73.0_f
+# Uncrustify-0.74.0_f
 
 #
 # General options
@@ -169,7 +169,7 @@ sp_compare                      = add      # ignore/add/remove/force/not_defined
 sp_inside_paren                 = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = force    # ignore/add/remove/force/not_defined
+sp_paren_paren                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
 sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
@@ -190,7 +190,7 @@ sp_before_ptr_star              = remove   # ignore/add/remove/force/not_defined
 # variable name. If set to ignore, sp_before_ptr_star is used instead.
 sp_before_unnamed_ptr_star      = remove   # ignore/add/remove/force/not_defined
 
-# Add or remove space between pointer stars '*'.
+# Add or remove space between pointer stars '*', as in 'int ***a;'.
 sp_between_ptr_star             = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after pointer star '*', if followed by a word.
@@ -210,14 +210,26 @@ sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force/not_defined
 # Overrides sp_after_ptr_star and sp_type_func.
 sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space after a pointer star '*' in the trailing return of a
+# function prototype or function definition.
+sp_after_ptr_star_trailing      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between the pointer star '*' and the name of the variable
+# in a function pointer definition.
+sp_ptr_star_func_var            = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after a pointer star '*', if followed by an open
-# parenthesis, as in 'void* (*)().
+# parenthesis, as in 'void* (*)()'.
 sp_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before a pointer star '*', if followed by a function
 # prototype or function definition.
 sp_before_ptr_star_func         = remove   # ignore/add/remove/force/not_defined
 
+# Add or remove space before a pointer star '*' in the trailing return of a
+# function prototype or function definition.
+sp_before_ptr_star_trailing     = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space before a reference sign '&'.
 sp_before_byref                 = remove   # ignore/add/remove/force/not_defined
 
@@ -303,33 +315,50 @@ sp_permit_cpp11_shift           = false    # true/false
 # 'while', etc.).
 sp_before_sparen                = force    # ignore/add/remove/force/not_defined
 
-# Add or remove space inside '(' and ')' of control statements.
+# Add or remove space inside '(' and ')' of control statements other than
+# 'for'.
 sp_inside_sparen                = force    # ignore/add/remove/force/not_defined
 
-# Add or remove space after '(' of control statements.
+# Add or remove space after '(' of control statements other than 'for'.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
+sp_inside_sparen_open           = force    # ignore/add/remove/force/not_defined
 
-# Add or remove space before ')' of control statements.
+# Add or remove space before ')' of control statements other than 'for'.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
+sp_inside_sparen_close          = force    # ignore/add/remove/force/not_defined
+
+# Add or remove space inside '(' and ')' of 'for' statements.
+sp_inside_for                   = force    # ignore/add/remove/force/not_defined
+
+# Add or remove space after '(' of 'for' statements.
+#
+# Overrides sp_inside_for.
+sp_inside_for_open              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before ')' of 'for' statements.
+#
+# Overrides sp_inside_for.
+sp_inside_for_close             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '((' or '))' of control statements.
+sp_sparen_paren                 = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ')' of control statements.
 sp_after_sparen                 = force    # ignore/add/remove/force/not_defined
 
-# Add or remove space between ')' and '{' of of control statements.
+# Add or remove space between ')' and '{' of control statements.
 sp_sparen_brace                 = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
+sp_do_brace_open                = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
+sp_brace_close_while            = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'while' and '('. Overrides sp_before_sparen.
-sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
+sp_while_paren_open             = force    # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between 'invariant' and '('.
 sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
@@ -348,13 +377,18 @@ sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
 # Add or remove space before ';' in non-empty 'for' statements.
 sp_before_semi_for              = remove   # ignore/add/remove/force/not_defined
 
-# 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 left part of a for
-sp_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
+# statement, as in 'for ( <here> ; ; )'.
+sp_before_semi_for_empty        = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space between the semicolons of an empty middle part of a for
+# statement, as in 'for ( ; <here> ; )'.
+sp_between_semi_for_empty       = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';', except when followed by a comment.
 #
 # Default: add
-sp_after_semi                   = add      # ignore/add/remove/force/not_defined
+sp_after_semi                   = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';' in non-empty 'for' statements.
 #
@@ -363,7 +397,7 @@ sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space after the final semicolon of an empty part of a for
 # statement, as in 'for ( ; ; <here> )'.
-sp_after_semi_for_empty         = add      # ignore/add/remove/force/not_defined
+sp_after_semi_for_empty         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' (except '[]').
 sp_before_square                = ignore   # ignore/add/remove/force/not_defined
@@ -395,7 +429,7 @@ sp_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
 sp_after_comma                  = force    # ignore/add/remove/force/not_defined
 
-# Add or remove space before ','.
+# Add or remove space before ',', i.e. 'a,b' vs. 'a ,b'.
 #
 # Default: remove
 sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
@@ -418,12 +452,21 @@ sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 # Default: force
 sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
 
+# Add or remove space after the variadic '...' when preceded by a
+# non-punctuator.
+# The value REMOVE will be overriden with FORCE
+sp_after_ellipsis               = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space before the variadic '...' when preceded by a
 # non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
+# The value REMOVE will be overriden with FORCE
+sp_before_ellipsis              = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
+sp_type_ellipsis                = force    # ignore/add/remove/force/not_defined
+
+# Add or remove space between a '*' and '...'.
+sp_ptr_type_ellipsis            = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between a type and '?'.
 sp_type_question                = ignore   # ignore/add/remove/force/not_defined
@@ -431,6 +474,9 @@ sp_type_question                = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space between ')' and '...'.
 sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between '&&' and '...'.
+sp_byref_ellipsis               = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space between ')' and a qualifier such as 'const'.
 sp_paren_qualifier              = force    # ignore/add/remove/force/not_defined
 
@@ -444,9 +490,13 @@ sp_after_class_colon            = force    # ignore/add/remove/force/not_defined
 sp_before_class_colon           = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space after class constructor ':'.
+#
+# Default: add
 sp_after_constr_colon           = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space before class constructor ':'.
+#
+# Default: add
 sp_before_constr_colon          = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space before case ':'.
@@ -485,6 +535,12 @@ sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space between 'sizeof...' and '('.
 sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between '...' and a parameter pack.
+sp_ellipsis_parameter_pack      = force    # ignore/add/remove/force/not_defined
+
+# Add or remove space between a parameter pack and '...'.
+sp_parameter_pack_ellipsis      = force    # ignore/add/remove/force/not_defined
+
 # Add or remove space between 'decltype' and '('.
 sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
 
@@ -501,14 +557,21 @@ sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
 sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after open brace in an unnamed temporary
-# direct-list-initialization.
+# direct-list-initialization
+# if statement is a brace_init_lst
+# works only if sp_brace_brace is set to ignore.
 sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before close brace in an unnamed temporary
-# direct-list-initialization.
+# direct-list-initialization
+# if statement is a brace_init_lst
+# works only if sp_brace_brace is set to ignore.
 sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space inside an unnamed temporary direct-list-initialization.
+# Add or remove space inside an unnamed temporary direct-list-initialization
+# if statement is a brace_init_lst
+# works only if sp_brace_brace is set to ignore
+# works only if sp_before_type_brace_init_lst_close is set to ignore.
 sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{' and '}'.
@@ -603,6 +666,11 @@ sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
 # and '()'.
 sp_func_class_paren_empty       = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space after 'return'.
+#
+# Default: force
+sp_return                       = force    # ignore/add/remove/force/not_defined
+
 # Add or remove space between 'return' and '('.
 sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
 
@@ -701,12 +769,12 @@ sp_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a variable and '{' for C++ uniform
 # initialization.
-sp_word_brace_init_lst          = add      # ignore/add/remove/force/not_defined
+sp_word_brace_init_lst          = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space between a variable and '{' for a namespace.
 #
 # Default: add
-sp_word_brace_ns                = add      # ignore/add/remove/force/not_defined
+sp_word_brace_ns                = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space before the '::' operator.
 sp_before_dc                    = remove   # ignore/add/remove/force/not_defined
@@ -926,11 +994,31 @@ sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force/not_defined
 # Overrides sp_inside_newop_paren.
 sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space before a trailing or embedded comment.
+# Add or remove space before a trailing comment.
-sp_before_tr_emb_cmt            = force    # ignore/add/remove/force/not_defined
+sp_before_tr_cmt                = ignore   # ignore/add/remove/force/not_defined
 
-# Number of spaces before a trailing or embedded comment.
+# Number of spaces before a trailing comment.
-sp_num_before_tr_emb_cmt        = 0        # unsigned number
+sp_num_before_tr_cmt            = 0        # unsigned number
+
+# Add or remove space before an embedded comment.
+#
+# Default: force
+sp_before_emb_cmt               = force    # ignore/add/remove/force/not_defined
+
+# Number of spaces before an embedded comment.
+#
+# Default: 1
+sp_num_before_emb_cmt           = 1        # unsigned number
+
+# Add or remove space after an embedded comment.
+#
+# Default: force
+sp_after_emb_cmt                = force    # ignore/add/remove/force/not_defined
+
+# Number of spaces after an embedded comment.
+#
+# Default: 1
+sp_num_after_emb_cmt            = 1        # unsigned number
 
 # (Java) Add or remove space between an annotation and the open parenthesis.
 sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
@@ -1062,11 +1150,16 @@ indent_class_on_colon           = true     # true/false
 # Whether to indent the stuff after a leading class initializer colon.
 indent_constr_colon             = false    # true/false
 
-# Virtual indent from the ':' for member initializers.
+# Virtual indent from the ':' for leading member initializers.
 #
 # Default: 2
 indent_ctor_init_leading        = 2        # unsigned number
 
+# Virtual indent from the ':' for following member initializers.
+#
+# Default: 2
+indent_ctor_init_following      = 2        # unsigned number
+
 # Additional indent for constructor initializer list.
 # Negative values decrease indent down to the first column.
 indent_ctor_init                = 0        # number
@@ -1152,7 +1245,10 @@ indent_member                   = 0        # unsigned number
 indent_member_single            = false    # true/false
 
 # Spaces to indent single line ('//') comments on lines before code.
-indent_sing_line_comments       = 0        # unsigned number
+indent_single_line_comments_before = 0        # unsigned number
+
+# Spaces to indent single line ('//') comments on lines after code.
+indent_single_line_comments_after = 0        # unsigned number
 
 # When opening a paren for a control statement (if, for, while, etc), increase
 # the indent level by this value. Negative values decrease the indent level.
@@ -1163,12 +1259,16 @@ indent_sparen_extra             = 0        # number
 indent_relative_single_line_comments = true     # true/false
 
 # Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-# It might wise to choose the same value for the option indent_case_brace.
+# It might be wise to choose the same value for the option indent_case_brace.
 indent_switch_case              = 0        # unsigned number
 
+# Spaces to indent the body of a 'switch' before any 'case'.
+# Usually the same as indent_columns or indent_switch_case.
+indent_switch_body              = 0        # unsigned number
+
 # Spaces to indent '{' from 'case'. By default, the brace will appear under
 # the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
-# It might wise to choose the same value for the option indent_switch_case.
+# It might be wise to choose the same value for the option indent_switch_case.
 indent_case_brace               = 0        # number
 
 # indent 'break' with 'case' from 'switch'.
@@ -1183,13 +1283,31 @@ indent_switch_pp                = true     # true/false
 # Usually 0.
 indent_case_shift               = 0        # unsigned number
 
+# Whether to align comments before 'case' with the 'case'.
+#
+# Default: true
+indent_case_comment             = true     # true/false
+
+# Whether to indent comments not found in first column.
+#
+# Default: true
+indent_comment                  = true     # true/false
+
 # Whether to indent comments found in first column.
 indent_col1_comment             = false    # true/false
 
 # Whether to indent multi string literal in first column.
 indent_col1_multi_string_literal = false    # true/false
 
-# How to indent goto labels.
+# Align comments on adjacent lines that are this many columns apart or less.
+#
+# Default: 3
+indent_comment_align_thresh     = 3        # unsigned number
+
+# Whether to ignore indent for goto labels.
+indent_ignore_label             = false    # true/false
+
+# How to indent goto labels. Requires indent_ignore_label=false.
 #
 #  >0: Absolute column where 1 is the leftmost column
 # <=0: Subtract from brace indent
@@ -1502,20 +1620,20 @@ nl_struct_brace                 = force    # ignore/add/remove/force/not_defined
 nl_union_brace                  = force    # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'if' and '{'.
-nl_if_brace                     = add      # ignore/add/remove/force/not_defined
+nl_if_brace                     = force    # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'else'.
-nl_brace_else                   = add      # ignore/add/remove/force/not_defined
+nl_brace_else                   = force    # ignore/add/remove/force/not_defined
 
 # 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/not_defined
+nl_elseif_brace                 = force    # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and '{'.
-nl_else_brace                   = add      # ignore/add/remove/force/not_defined
+nl_else_brace                   = force    # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and 'if'.
-nl_else_if                      = add      # ignore/add/remove/force/not_defined
+nl_else_if                      = force    # ignore/add/remove/force/not_defined
 
 # Add or remove newline before '{' opening brace
 nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
@@ -1875,8 +1993,10 @@ nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force/not_defined
 # direct-list-initialization.
 nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
 
-# Whether to add a newline after '{'. This also adds a newline before the
+# Whether to add a newline before '{'.
-# matching '}'.
+nl_before_brace_open            = false    # true/false
+
+# Whether to add a newline after '{'.
 nl_after_brace_open             = false    # true/false
 
 # Whether to add a newline between the open brace and a trailing single-line
@@ -1956,6 +2076,12 @@ nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
 # Add or remove blank line after 'do/while' statement.
 nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
 
+# Ignore nl_before_{if,for,switch,do,synchronized} if the control
+# statement is immediately after a case statement.
+# if nl_before_{if,for,switch,do} is set to remove, this option
+# does nothing.
+nl_before_ignore_after_case     = false    # true/false
+
 # Whether to put a blank line before 'return' statements, unless after an open
 # brace.
 nl_before_return                = false    # true/false
@@ -1987,7 +2113,7 @@ nl_constr_colon                 = force    # ignore/add/remove/force/not_defined
 
 # Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
 # into a single line. If true, prevents other brace newline rules from turning
-# such code into four lines.
+# such code into four lines. If true, it also preserves one-liner namespaces.
 nl_namespace_two_to_one_liner   = false    # true/false
 
 # Whether to remove a newline in simple unbraced if statements, turning them
@@ -2007,7 +2133,7 @@ nl_create_while_one_liner       = true     # true/false
 # a single line.
 nl_create_func_def_one_liner    = false    # true/false
 
-# Whether to split one-line simple unbraced if statements into three lines by
+# Whether to split one-line simple list definitions into three lines by
 # adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
 nl_create_list_one_liner        = false    # true/false
 
@@ -2151,6 +2277,9 @@ nl_after_multiline_comment      = false    # true/false
 # Whether to force a newline after a label's colon.
 nl_after_label_colon            = false    # true/false
 
+# The number of newlines before a struct definition.
+nl_before_struct                = 0        # unsigned number
+
 # The number of newlines after '}' or ';' of a struct/enum/union definition.
 nl_after_struct                 = 0        # unsigned number
 
@@ -2558,6 +2687,22 @@ align_right_cmt_at_col          = 1        # unsigned number
 # 0: Don't align (default).
 align_func_proto_span           = 0        # unsigned number
 
+# How to consider (or treat) the '*' in the alignment of function prototypes.
+#
+# 0: Part of the type     'void *   foo();' (default)
+# 1: Part of the function 'void     *foo();'
+# 2: Dangling             'void    *foo();'
+# Dangling: the '*' will not be taken into account when aligning.
+align_func_proto_star_style     = 0        # unsigned number
+
+# How to consider (or treat) the '&' in the alignment of function prototypes.
+#
+# 0: Part of the type     'long &   foo();' (default)
+# 1: Part of the function 'long     &foo();'
+# 2: Dangling             'long    &foo();'
+# Dangling: the '&' will not be taken into account when aligning.
+align_func_proto_amp_style      = 0        # unsigned number
+
 # The threshold for aligning function prototypes.
 # Use a negative number for absolute thresholds.
 #
@@ -2713,6 +2858,9 @@ cmt_align_doxygen_javadoc_tags  = false    # true/false
 # Default: 1
 cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
 
+# Whether to change trailing, single-line c-comments into cpp-comments.
+cmt_trailing_single_line_c_to_cpp = false    # true/false
+
 # Whether to group c-comments that look like they are in a block.
 cmt_c_group                     = false    # true/false
 
@@ -2882,6 +3030,9 @@ mod_full_paren_if_bool          = true     # true/false
 # Whether to remove superfluous semicolons.
 mod_remove_extra_semicolon      = true     # true/false
 
+# Whether to remove duplicate include.
+mod_remove_duplicate_include    = true     # true/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 = 20       # unsigned number
@@ -3024,10 +3175,16 @@ pp_indent_if                    = 0        # number
 # Whether to indent the code between #if, #else and #endif.
 pp_if_indent_code               = false    # true/false
 
+# Whether to indent the body of an #if that encompasses all the code in the file.
+pp_indent_in_guard              = false    # true/false
+
 # Whether to indent '#define' at the brace level. If false, these are
 # indented from column 1.
 pp_define_at_level              = false    # true/false
 
+# Whether to indent '#include' at the brace level.
+pp_include_at_level             = false    # true/false
+
 # Whether to ignore the '#define' body while formatting.
 pp_ignore_define_body           = false    # true/false
 
@@ -3210,5 +3367,5 @@ debug_truncate                  = 0        # unsigned number
 #       `macro-close END_MESSAGE_MAP`
 #
 #
-# option(s) with 'not default' value: 177
+# option(s) with 'not default' value: 193
 #