Compare commits

...

2 Commits

Author SHA1 Message Date
0f0d578961 Merge branch 'master' of git.246060.ru:f1x1t/uncrustify 2019-05-31 14:25:19 +03:00
3c9d3f849c next 2019-05-31 14:25:09 +03:00

View File

@ -193,7 +193,7 @@ sp_before_byref = ignore # ignore/add/remove/force
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. # Add or remove space after reference sign '&', if followed by a word.
sp_after_byref = ignore # ignore/add/remove/force sp_after_byref = add # ignore/add/remove/force
# Add or remove space after a reference sign '&', if followed by a function # Add or remove space after a reference sign '&', if followed by a function
# prototype or function definition. # prototype or function definition.
@ -305,7 +305,7 @@ sp_after_semi_for = force # ignore/add/remove/force
# Add or remove space after the final semicolon of an empty part of a for # Add or remove space after the final semicolon of an empty part of a for
# statement, as in 'for ( ; ; <here> )'. # statement, as in 'for ( ; ; <here> )'.
sp_after_semi_for_empty = ignore # ignore/add/remove/force sp_after_semi_for_empty = add # ignore/add/remove/force
# Add or remove space before '[' (except '[]'). # Add or remove space before '[' (except '[]').
sp_before_square = ignore # ignore/add/remove/force sp_before_square = ignore # ignore/add/remove/force
@ -1739,15 +1739,15 @@ nl_namespace_two_to_one_liner = false # true/false
# Whether to remove a newline in simple unbraced if statements, turning them # Whether to remove a newline in simple unbraced if statements, turning them
# into one-liners, as in 'if(b)\n i++;' → 'if(b) i++;'. # into one-liners, as in 'if(b)\n i++;' → 'if(b) i++;'.
nl_create_if_one_liner = false # true/false nl_create_if_one_liner = true # true/false
# Whether to remove a newline in simple unbraced for statements, turning them # Whether to remove a newline in simple unbraced for statements, turning them
# into one-liners, as in 'for (...)\n stmt;' → 'for (...) stmt;'. # into one-liners, as in 'for (...)\n stmt;' → 'for (...) stmt;'.
nl_create_for_one_liner = false # true/false nl_create_for_one_liner = true # true/false
# Whether to remove a newline in simple unbraced while statements, turning # Whether to remove a newline in simple unbraced while statements, turning
# them into one-liners, as in 'while (expr)\n stmt;' → 'while (expr) stmt;'. # them into one-liners, as in 'while (expr)\n stmt;' → 'while (expr) stmt;'.
nl_create_while_one_liner = false # true/false nl_create_while_one_liner = true # true/false
# Whether to collapse a function definition whose body (not counting braces) # Whether to collapse a function definition whose body (not counting braces)
# is only one line so that the entire definition (prototype, braces, body) is # is only one line so that the entire definition (prototype, braces, body) is
@ -1771,10 +1771,10 @@ nl_split_while_one_liner = false # true/false
# #
# The maximum number of consecutive newlines (3 = 2 blank lines). # The maximum number of consecutive newlines (3 = 2 blank lines).
nl_max = 0 # unsigned number nl_max = 3 # unsigned number
# The maximum number of consecutive newlines in a function. # The maximum number of consecutive newlines in a function.
nl_max_blank_in_func = 0 # unsigned number nl_max_blank_in_func = 2 # unsigned number
# The number of newlines before a function prototype. # The number of newlines before a function prototype.
nl_before_func_body_proto = 0 # unsigned number nl_before_func_body_proto = 0 # unsigned number