Skip to content

Commit 84bf6f4

Browse files
committed
uncrustify UPDATE use version 0.77.1
1 parent 210da63 commit 84bf6f4

File tree

4 files changed

+63
-10
lines changed

4 files changed

+63
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
shell: bash
123123
working-directory: ${{ github.workspace }}
124124
run: |
125-
git clone --branch uncrustify-0.75.1 https://github.com/uncrustify/uncrustify
125+
git clone --branch uncrustify-0.77.1 https://github.com/uncrustify/uncrustify
126126
cd uncrustify
127127
mkdir build
128128
cd build

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ endif()
316316

317317
if ("${BUILD_TYPE_UPPER}" STREQUAL "DEBUG")
318318
# enable before adding tests to let them detect that format checking is available - one of the tests is format checking
319-
source_format_enable(0.76)
319+
source_format_enable(0.77)
320320
endif()
321321

322322
# generate files

tests/utests/schema/test_schema.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,8 @@ test_key_order(void **state)
10861086
const struct lysc_node *node;
10871087

10881088
struct module_clb_list list1[] = {
1089-
{"a", "module a {"
1089+
{
1090+
"a", "module a {"
10901091
"yang-version 1.1;"
10911092
"namespace urn:test:a;"
10921093
"prefix a;"
@@ -1095,7 +1096,8 @@ test_key_order(void **state)
10951096
" leaf k2 {type string;}"
10961097
" leaf k1 {type string;}"
10971098
"}"
1098-
"}"},
1099+
"}"
1100+
},
10991101
{NULL, NULL}
11001102
};
11011103

@@ -1109,7 +1111,8 @@ test_key_order(void **state)
11091111
assert_string_equal("k2", node->name);
11101112

11111113
struct module_clb_list list2[] = {
1112-
{"b", "module b {"
1114+
{
1115+
"b", "module b {"
11131116
"yang-version 1.1;"
11141117
"namespace urn:test:b;"
11151118
"prefix b;"
@@ -1124,7 +1127,8 @@ test_key_order(void **state)
11241127
" leaf k1 {type string;}"
11251128
" leaf k3 {type string;}"
11261129
"}"
1127-
"}"},
1130+
"}"
1131+
},
11281132
{NULL, NULL}
11291133
};
11301134

uncrustify.cfg

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Uncrustify-0.76.0_f
1+
# Uncrustify-0.77.1_f
22

33
#
44
# General options
@@ -210,6 +210,11 @@ sp_before_ptr_star = force # ignore/add/remove/force
210210
# variable name. If set to ignore, sp_before_ptr_star is used instead.
211211
sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force
212212

213+
# Add or remove space between a qualifier and a pointer star '*' that isn't
214+
# followed by a variable name, as in '(char const *)'. If set to ignore,
215+
# sp_before_ptr_star is used instead.
216+
sp_qualifier_unnamed_ptr_star = ignore # ignore/add/remove/force/not_defined
217+
213218
# Add or remove space between pointer stars '*'.
214219
sp_between_ptr_star = remove # ignore/add/remove/force
215220

@@ -250,10 +255,20 @@ sp_ptr_star_paren = remove # ignore/add/remove/force
250255
# prototype or function definition.
251256
sp_before_ptr_star_func = force # ignore/add/remove/force
252257

258+
# Add or remove space between a qualifier and a pointer star '*' followed by
259+
# the name of the function in a function prototype or definition, as in
260+
# 'char const *foo()`. If set to ignore, sp_before_ptr_star is used instead.
261+
sp_qualifier_ptr_star_func = ignore # ignore/add/remove/force/not_defined
262+
253263
# Add or remove space before a pointer star '*' in the trailing return of a
254264
# function prototype or function definition.
255265
sp_before_ptr_star_trailing = ignore # ignore/add/remove/force/not_defined
256266

267+
# Add or remove space between a qualifier and a pointer star '*' in the
268+
# trailing return of a function prototype or function definition, as in
269+
# 'auto foo() -> char const *'.
270+
sp_qualifier_ptr_star_trailing = force # ignore/add/remove/force/not_defined
271+
257272
# Add or remove space before a reference sign '&'.
258273
sp_before_byref = ignore # ignore/add/remove/force
259274

@@ -611,6 +626,16 @@ sp_inside_fparens = remove # ignore/add/remove/force
611626
# Add or remove space inside function '(' and ')'.
612627
sp_inside_fparen = remove # ignore/add/remove/force
613628

629+
# Add or remove space inside user functor '(' and ')'.
630+
sp_func_call_user_inside_rparen = ignore # ignore/add/remove/force/not_defined
631+
632+
# Add or remove space inside empty functor '()'.
633+
# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
634+
sp_inside_rparens = ignore # ignore/add/remove/force/not_defined
635+
636+
# Add or remove space inside functor '(' and ')'.
637+
sp_inside_rparen = ignore # ignore/add/remove/force/not_defined
638+
614639
# Add or remove space inside the first parentheses in a function type, as in
615640
# 'void (*x)(...)'.
616641
sp_inside_tparen = remove # ignore/add/remove/force
@@ -951,6 +976,14 @@ sp_extern_paren = ignore # ignore/add/remove/force
951976
# i.e. '// A' vs. '//A'.
952977
sp_cmt_cpp_start = force # ignore/add/remove/force
953978

979+
# remove space after the '//' and the pvs command '-V1234',
980+
# only works with sp_cmt_cpp_start set to add or force.
981+
sp_cmt_cpp_pvs = false # true/false
982+
983+
# remove space after the '//' and the command 'lint',
984+
# only works with sp_cmt_cpp_start set to add or force.
985+
sp_cmt_cpp_lint = false # true/false
986+
954987
# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
955988
# A region marker is defined as a comment which is not preceded by other text
956989
# (i.e. the comment is the first non-whitespace on the line), and which starts
@@ -2804,9 +2837,19 @@ align_single_line_brace_gap = 1 # unsigned number
28042837
# 0: Don't align (default).
28052838
align_oc_msg_spec_span = 0 # unsigned number
28062839

2807-
# Whether to align macros wrapped with a backslash and a newline. This will
2808-
# not work right if the macro contains a multi-line comment.
2809-
align_nl_cont = false # true/false
2840+
# 0: Do nothing (default)
2841+
# 1: Align the backslashes in the column at the end of the longest line
2842+
# 2: Align with the backslash that is farthest to the left, or, if that
2843+
# backslash is farther left than the end of the longest line, at the end of
2844+
# the longest line
2845+
# 3: Align with the backslash that is farthest to the right
2846+
align_nl_cont = 0 # unsigned number
2847+
2848+
# The minimum number of spaces between the end of a line and its continuation
2849+
# backslash. Requires align_nl_cont.
2850+
#
2851+
# Default: 1
2852+
align_nl_cont_spaces = 1 # unsigned number
28102853

28112854
# Whether to align macro functions and variables together.
28122855
align_pp_define_together = false # true/false
@@ -3117,6 +3160,12 @@ mod_remove_extra_semicolon = true # true/false
31173160
# Whether to remove duplicate include.
31183161
mod_remove_duplicate_include = true # true/false
31193162

3163+
# the following options (mod_XX_closebrace_comment) use different comment,
3164+
# depending of the setting of the next option.
3165+
# false: Use the c comment (default)
3166+
# true : Use the cpp comment
3167+
mod_add_force_c_closebrace_comment = false # true/false
3168+
31203169
# If a function body exceeds the specified number of newlines and doesn't have
31213170
# a comment after the close brace, a comment will be added.
31223171
mod_add_long_function_closebrace_comment = 0 # unsigned number

0 commit comments

Comments
 (0)