This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Using uncrustify for indent.


I found that uncrustify has most options of our style.
It solves most problem with wrapping so I will reply to Joseph's mail.
It has some bugs so I it needs time.

On Fri, May 31, 2013 at 05:02:10PM +0000, Joseph S. Myers wrote:
> The cases of actual function calls are comparatively uncontroversial (and 
> likewise cases such as "if(" that this patch also fixes).  But:
> 
> * If a change makes a line occupy 80 columns or more that previously 
> occupied 79 columns, the code needs wrapping accordingly.
>
Uncrustify currently has option to do wrapping however it is broken for
strings. I will file bug report.
 
> * If the arguments to a function call go only another line, then 
> subsequent lines need their indentation adjusted.
>
This uncrustify does relatively well but it is choice between formatting
entire file and nothing.
 
> * The patch changes intl/plural.c, a generated file; you need to get the 
> Bison template fixed in upstream Bison instead.

We could add comment that to disable is which is exactly /*INDENT-OFF*/.
> 
> It should be straightforward to make the code generating these changes 
> exclude cases where the line would go to 80 columns or more or where 
> parentheses are unbalanced at the end of the line, as well as excluding 
> GLRO, GL and ElfW (at least).  (The cases where wrapping is involved could 
> then be fixed separately with a patch that involved some manual editing of 
> the results of initial automatic running of a script.)  I'd still suggest 
> splitting up the resulting changes by directory for easier review.
> 
Patch above has 11116 lines. You need to test it automaticaly or you
spend 3 hours at rate line checked per second.


My config file is following:

#
# GNU format (sorta)
#

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			= 2
# indent_label			= 2		# pos: absolute col, neg: relative column
indent_align_string		= False		# align broken strings
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_func_var_def_blk		= 0
nl_before_case			= 0
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			= add
nl_brace_else			= add
nl_func_proto_type_name = add
nl_squeeze_ifdef		= TRUE
nl_end_of_file  = add

# 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		= ignore	# "for () a--;" vs "for () { a--; }"
# mod_full_brace_do		= ignore	# "do a--; while ();" vs "do { a--; } while ();"
# mod_full_brace_while		= ignore	# "while (a) a--;" vs "while (a) { a--; }"

sp_before_semi			= remove
sp_paren_paren			= remove	# space between (( and ))
sp_return_paren			= force	  # "return (1);" vs "return(1);"
sp_sizeof_paren			= force	  # "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			= 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_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
# align_enum_equ_span		= 4
# align_nl_cont			= TRUE
# align_var_def_span		= 2
# align_var_def_inline		= TRUE
# align_var_def_star		= TRUE
# 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_left		= TRUE
# align_typedef_span		= 5
# align_typedef_gap		= 3

# cmt_star_cont			= TRUE

# code_width = 80

eat_blanks_before_close_brace	= TRUE
eat_blanks_after_open_brace	= TRUE



Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]