From f2f3dd0473d0e6145b309a83212dce690c457105 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Tue, 16 Sep 2014 00:25:52 +0200
Subject: [PATCH] new formating config?
---
uncrustify.cfg | 150 ++++++++++++++++++++++++-------------------------
1 file changed, 75 insertions(+), 75 deletions(-)
diff --git a/uncrustify.cfg b/uncrustify.cfg
index 6e3c2c4615..ec33a24fd2 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -8,10 +8,10 @@
newlines = lf # auto / lf / crlf / cr
# The original size of tabs in the input
- input_tab_size = 8 # number
+ input_tab_size = 4 # number
# The size of tabs in the output (only used if align_with_tabs=true)
- output_tab_size = 3 # number
+ output_tab_size = 4 # number
# The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn)
string_escape_char = 92 # number
@@ -22,7 +22,7 @@ newlines = lf # auto / lf / crlf / cr
# Allow interpreting '>=' and '>>=' as part of a template in 'void f(list<list<B>>=val);'.
# If true (default), 'assert(x<0 && y>=3)' will be broken.
# Improvements to template detection may make this option obsolete.
- tok_split_gte = false # false / true
+ tok_split_gte = true # false / true
# Control what to do with the UTF-8 BOM (recommend 'remove')
utf8_bom = remove # ignore / add / remove / force
@@ -39,7 +39,7 @@ newlines = lf # auto / lf / crlf / cr
# The number of columns to indent per level.
# Usually 2, 3, 4, or 8.
- indent_columns = 3 # number
+ indent_columns = 4 # number
# The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents.
# For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level
@@ -49,7 +49,7 @@ newlines = lf # auto / lf / crlf / cr
# 0 =spaces only
# 1 =indent with tabs to brace level, align with spaces
# 2 =indent and align with tabs, using spaces when not on a tabstop
- indent_with_tabs = 1 # number
+ indent_with_tabs = 2 # number
# Comments that are not a brace level are indented with tabs on a tabstop.
# Requires indent_with_tabs=2. If false, will use spaces.
@@ -238,19 +238,19 @@ newlines = lf # auto / lf / crlf / cr
sp_cpp_lambda_assign = remove # ignore / add / remove / force
# Add or remove space after the capture specification in C++11 lambda.
- sp_cpp_lambda_paren = add # ignore / add / remove / force
+ sp_cpp_lambda_paren = force # ignore / add / remove / force
# Add or remove space around assignment operator '=' in a prototype
- sp_assign_default = add # ignore / add / remove / force
+ sp_assign_default = force # ignore / add / remove / force
# Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign.
- sp_before_assign = add # ignore / add / remove / force
+ sp_before_assign = force # ignore / add / remove / force
# Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign.
- sp_after_assign = add # ignore / add / remove / force
+ sp_after_assign = force # ignore / add / remove / force
# Add or remove space around assignment '=' in enum
- sp_enum_assign = add # ignore / add / remove / force
+ sp_enum_assign = force # ignore / add / remove / force
# Add or remove space before assignment '=' in enum. Overrides sp_enum_assign.
sp_enum_before_assign = ignore # ignore / add / remove / force
@@ -259,10 +259,10 @@ newlines = lf # auto / lf / crlf / cr
sp_enum_after_assign = ignore # ignore / add / remove / force
# Add or remove space around preprocessor '##' concatenation operator. Default=Add
- sp_pp_concat = add # ignore / add / remove / force
+ sp_pp_concat = force # ignore / add / remove / force
# Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add
- sp_pp_stringify = add # ignore / add / remove / force
+ sp_pp_stringify = force # ignore / add / remove / force
# Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'.
sp_before_pp_stringify = ignore # ignore / add / remove / force
@@ -277,54 +277,54 @@ newlines = lf # auto / lf / crlf / cr
sp_inside_paren = force # ignore / add / remove / force
# Add or remove space between nested parens: '((' vs ') )'
- sp_paren_paren = add # ignore / add / remove / force
+ sp_paren_paren = force # ignore / add / remove / force
# Add or remove space between back-to-back parens: ')(' vs ') ('
- sp_cparen_oparen = ignore # ignore / add / remove / force
+ sp_cparen_oparen = force # ignore / add / remove / force
# Whether to balance spaces inside nested parens
sp_balance_nested_parens = false # false / true
# Add or remove space between ')' and '{'
- sp_paren_brace = add # ignore / add / remove / force
+ sp_paren_brace = force # ignore / add / remove / force
# Add or remove space before pointer star '*'
- sp_before_ptr_star = add # ignore / add / remove / force
+ sp_before_ptr_star = force # 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
+ sp_before_unnamed_ptr_star = force # ignore / add / remove / force
# Add or remove space between pointer stars '*'
- sp_between_ptr_star = remove # ignore / add / remove / force
+ sp_between_ptr_star = force # ignore / add / remove / force
# Add or remove space after pointer star '*', if followed by a word.
- sp_after_ptr_star = remove # ignore / add / remove / force
+ sp_after_ptr_star = force # 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
+ sp_after_ptr_star_func = force # ignore / add / remove / force
# Add or remove space after a pointer star '*', if followed by an open paren (function types).
- sp_ptr_star_paren = ignore # ignore / add / remove / force
+ sp_ptr_star_paren = force # 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
+ sp_before_ptr_star_func = force # ignore / add / remove / force
# Add or remove space before a reference sign '&'
- sp_before_byref = add # ignore / add / remove / force
+ sp_before_byref = force # ignore / add / remove / force
# Add or remove space before a reference sign '&' that isn't followed by a variable name
# If set to 'ignore', sp_before_byref is used instead.
- sp_before_unnamed_byref = add # ignore / add / remove / force
+ sp_before_unnamed_byref = force # ignore / add / remove / force
# Add or remove space after reference sign '&', if followed by a word.
- sp_after_byref = add # ignore / add / remove / force
+ sp_after_byref = force # ignore / add / remove / force
# Add or remove space after a reference sign '&', if followed by a func proto/def.
- sp_after_byref_func = add # ignore / add / remove / force
+ sp_after_byref_func = force # ignore / add / remove / force
# Add or remove space before a reference sign '&', if followed by a func proto/def.
- sp_before_byref_func = add # ignore / add / remove / force
+ sp_before_byref_func = force # ignore / add / remove / force
# Add or remove space between type and word. Default=Force
sp_after_type = force # ignore / add / remove / force
@@ -334,38 +334,38 @@ newlines = lf # auto / lf / crlf / cr
# Add or remove space in 'template <' vs 'template<'.
# If set to ignore, sp_before_angle is used.
- sp_template_angle = ignore # ignore / add / remove / force
+ sp_template_angle = force # ignore / add / remove / force
# Add or remove space before '<>'
- sp_before_angle = remove # ignore / add / remove / force
+ sp_before_angle = force # ignore / add / remove / force
# Add or remove space inside '<' and '>'
- sp_inside_angle = remove # ignore / add / remove / force
+ sp_inside_angle = force # ignore / add / remove / force
# Add or remove space after '<>'
sp_after_angle = force # ignore / add / remove / force
# Add or remove space between '<>' and '(' as found in 'new List<byte>();'
- sp_angle_paren = ignore # ignore / add / remove / force
+ sp_angle_paren = force # ignore / add / remove / force
# Add or remove space between '<>' and a word as in 'List<byte> m;'
- sp_angle_word = ignore # ignore / add / remove / force
+ sp_angle_word = force # ignore / add / remove / force
# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add
- sp_angle_shift = add # ignore / add / remove / force
+ sp_angle_shift = force # ignore / add / remove / force
# Permit removal of the space between '>>' in 'foo<bar<int> >' (C++11 only). Default=False
# sp_angle_shift cannot remove the space without this option.
- sp_permit_cpp11_shift = false # false / true
+ sp_permit_cpp11_shift = true # false / true
# Add or remove space before '(' of 'if', 'for', 'switch', and 'while'
sp_before_sparen = force # ignore / add / remove / force
# Add or remove space inside if-condition '(' and ')'
- sp_inside_sparen = add # ignore / add / remove / force
+ sp_inside_sparen = force # ignore / add / remove / force
# Add or remove space before if-condition ')'. Overrides sp_inside_sparen.
- sp_inside_sparen_close = add # ignore / add / remove / force
+ sp_inside_sparen_close = force # ignore / add / remove / force
# Add or remove space before if-condition '('. Overrides sp_inside_sparen.
sp_inside_sparen_open = ignore # ignore / add / remove / force
@@ -374,13 +374,13 @@ newlines = lf # auto / lf / crlf / cr
sp_after_sparen = force # ignore / add / remove / force
# Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while'
- sp_sparen_brace = add # ignore / add / remove / force
+ sp_sparen_brace = force # ignore / add / remove / force
# Add or remove space between 'invariant' and '(' in the D language.
sp_invariant_paren = ignore # ignore / add / remove / force
# Add or remove space after the ')' in 'invariant (C) c' in the D language.
- sp_after_invariant_paren = ignore # ignore / add / remove / force
+ sp_after_invariant_paren = force # ignore / add / remove / force
# Add or remove space before empty statement ';' on 'if', 'for' and 'while'
sp_special_semi = ignore # ignore / add / remove / force
@@ -395,7 +395,7 @@ newlines = lf # auto / lf / crlf / cr
sp_before_semi_for_empty = force # ignore / add / remove / force
# Add or remove space after ';', except when followed by a comment. Default=Add
- sp_after_semi = add # ignore / add / remove / force
+ sp_after_semi = force # ignore / add / remove / force
# Add or remove space after ';' in non-empty 'for' statements. Default=Force
sp_after_semi_for = force # ignore / add / remove / force
@@ -425,31 +425,31 @@ newlines = lf # auto / lf / crlf / cr
sp_before_ellipsis = ignore # ignore / add / remove / force
# Add or remove space after class ':'
- sp_after_class_colon = ignore # ignore / add / remove / force
+ sp_after_class_colon = force # ignore / add / remove / force
# Add or remove space before class ':'
- sp_before_class_colon = ignore # ignore / add / remove / force
+ sp_before_class_colon = force # ignore / add / remove / force
# Add or remove space before case ':'. Default=Remove
sp_before_case_colon = remove # ignore / add / remove / force
# Add or remove space between 'operator' and operator sign
- sp_after_operator = ignore # ignore / add / remove / force
+ sp_after_operator = force # ignore / add / remove / force
# Add or remove space between the operator symbol and the open paren, as in 'operator ++('
- sp_after_operator_sym = ignore # ignore / add / remove / force
+ sp_after_operator_sym = remove # ignore / add / remove / force
# Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'
- sp_after_cast = remove # ignore / add / remove / force
+ sp_after_cast = force # ignore / add / remove / force
# Add or remove spaces inside cast parens
- sp_inside_paren_cast = ignore # ignore / add / remove / force
+ sp_inside_paren_cast = force # ignore / add / remove / force
# Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'
- sp_cpp_cast_paren = ignore # ignore / add / remove / force
+ sp_cpp_cast_paren = force # ignore / add / remove / force
# Add or remove space between 'sizeof' and '('
- sp_sizeof_paren = remove # ignore / add / remove / force
+ sp_sizeof_paren = force # ignore / add / remove / force
# Add or remove space after the tag keyword (Pawn)
sp_after_tag = ignore # ignore / add / remove / force
@@ -483,10 +483,10 @@ newlines = lf # auto / lf / crlf / cr
sp_inside_fparen = force # ignore / add / remove / force
# Add or remove space inside the first parens in the function type: 'void (*x)(...)'
- sp_inside_tparen = ignore # ignore / add / remove / force
+ sp_inside_tparen = force # ignore / add / remove / force
# Add or remove between the parens in the function type: 'void (*x)(...)'
- sp_after_tparen_close = ignore # ignore / add / remove / force
+ sp_after_tparen_close = force # ignore / add / remove / force
# Add or remove space between ']' and '(' when part of a function call.
sp_square_fparen = ignore # ignore / add / remove / force
@@ -506,26 +506,26 @@ newlines = lf # auto / lf / crlf / cr
sp_func_call_user_paren = ignore # ignore / add / remove / force
# Add or remove space between a constructor/destructor and the open paren
- sp_func_class_paren = add # ignore / add / remove / force
+ sp_func_class_paren = force # ignore / add / remove / force
# Add or remove space between 'return' and '('
- sp_return_paren = remove # ignore / add / remove / force
+ sp_return_paren = force # ignore / add / remove / force
# Add or remove space between '__attribute__' and '('
- sp_attribute_paren = add # ignore / add / remove / force
+ sp_attribute_paren = force # ignore / add / remove / force
# Add or remove space between 'defined' and '(' in '#if defined (FOO)'
sp_defined_paren = ignore # ignore / add / remove / force
# Add or remove space between 'throw' and '(' in 'throw (something)'
- sp_throw_paren = add # ignore / add / remove / force
+ sp_throw_paren = force # ignore / add / remove / force
# Add or remove space between 'throw' and anything other than '(' as in '@throw [...];'
sp_after_throw = ignore # ignore / add / remove / force
# Add or remove space between 'catch' and '(' in 'catch (something) { }'
# If set to ignore, sp_before_sparen is used.
- sp_catch_paren = add # ignore / add / remove / force
+ sp_catch_paren = force # ignore / add / remove / force
# Add or remove space between 'version' and '(' in 'version (something) { }' (D language)
# If set to ignore, sp_before_sparen is used.
@@ -569,10 +569,10 @@ newlines = lf # auto / lf / crlf / cr
sp_getset_brace = force # ignore / add / remove / force
# Add or remove space between a variable and '{' for C++ uniform initialization
- sp_word_brace = add # ignore / add / remove / force
+ sp_word_brace = force # ignore / add / remove / force
# Add or remove space between a variable and '{' for a namespace
- sp_word_brace_ns = add # ignore / add / remove / force
+ sp_word_brace_ns = force # ignore / add / remove / force
# Add or remove space before the '::' operator
sp_before_dc = remove # ignore / add / remove / force
@@ -607,7 +607,7 @@ newlines = lf # auto / lf / crlf / cr
sp_incdec = remove # ignore / add / remove / force
# Add or remove space before a backslash-newline at the end of a line. Default=Add
- sp_before_nl_cont = add # ignore / add / remove / force
+ sp_before_nl_cont = force # ignore / add / remove / force
# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'
sp_after_oc_scope = ignore # ignore / add / remove / force
@@ -717,29 +717,29 @@ newlines = lf # auto / lf / crlf / cr
#
# Whether to keep non-indenting tabs
- align_keep_tabs = false # false / true
+ align_keep_tabs = true # false / true
# Whether to use tabs for aligning
- align_with_tabs = false # false / true
+ align_with_tabs = true # false / true
# Whether to bump out to the next tab when aligning
align_on_tabstop = false # false / true
# Whether to left-align numbers
- align_number_left = true # false / true
+ align_number_left = false # false / true
# Whether to keep whitespace not required for alignment.
align_keep_extra_space = false # false / true
# Align variable definitions in prototypes and functions
- align_func_params = true # false / true
+ align_func_params = false # false / true
# Align parameters in single-line functions that have the same name.
# The function names must already be aligned with each other.
align_same_func_call_params = false # false / true
# The span for aligning variable definitions (0=don't align)
- align_var_def_span = 1 # number
+ align_var_def_span = 0 # number
# How to align the star in variable definitions.
# 0 =Part of the type 'void * foo;'
@@ -754,34 +754,34 @@ newlines = lf # auto / lf / crlf / cr
align_var_def_amp_style = 0 # number
# The threshold for aligning variable definitions (0=no limit)
- align_var_def_thresh = 16 # number
+ align_var_def_thresh = 1 # number
# The gap for aligning variable definitions
align_var_def_gap = 0 # number
# Whether to align the colon in struct bit fields
- align_var_def_colon = true # false / true
+ align_var_def_colon = false # false / true
# Whether to align any attribute after the variable name
align_var_def_attribute = false # false / true
# Whether to align inline struct/enum/union variable definitions
- align_var_def_inline = true # false / true
+ align_var_def_inline = false # false / true
# The span for aligning on '=' in assignments (0=don't align)
align_assign_span = 1 # number
# The threshold for aligning on '=' in assignments (0=no limit)
- align_assign_thresh = 12 # number
+ align_assign_thresh = 1 # number
# The span for aligning on '=' in enums (0=don't align)
- align_enum_equ_span = 16 # number
+ align_enum_equ_span = 1 # number
# The threshold for aligning on '=' in enums (0=no limit)
align_enum_equ_thresh = 0 # number
# The span for aligning struct/union (0=don't align)
- align_var_struct_span = 99 # number
+ align_var_struct_span = 1 # number
# The threshold for aligning struct/union member definitions (0=no limit)
align_var_struct_thresh = 0 # number
@@ -790,13 +790,13 @@ newlines = lf # auto / lf / crlf / cr
align_var_struct_gap = 0 # number
# The span for aligning struct initializer values (0=don't align)
- align_struct_init_span = 3 # number
+ align_struct_init_span = 0 # number
# The minimum space between the type and the synonym of a typedef
align_typedef_gap = 3 # number
# The span for aligning single-line typedefs (0=don't align)
- align_typedef_span = 5 # number
+ align_typedef_span = 0 # number
# How to align typedef'd functions with other typedefs
# 0 : Don't mix them at all
@@ -958,7 +958,7 @@ newlines = lf # auto / lf / crlf / cr
# The maximum consecutive newlines within a block of variable definitions
# 0 = No change (default)
- nl_var_def_blk_in = 0 # number
+ nl_var_def_blk_in = 2 # number
# Add or remove newline between a function call's ')' and '{', as in:
# list_for_each (item, &list) { }
@@ -1008,7 +1008,7 @@ newlines = lf # auto / lf / crlf / cr
nl_catch_brace = remove # ignore / add / remove / force
# Add or remove newline between '}' and 'catch'
- nl_brace_catch = force # ignore / add / remove / force
+ nl_brace_catch = remove # ignore / add / remove / force
# Add or remove newline between 'while' and '{'
nl_while_brace = remove # ignore / add / remove / force
@@ -1281,10 +1281,10 @@ newlines = lf # auto / lf / crlf / cr
nl_max = 2 # number
# The number of newlines after a function prototype, if followed by another function prototype
- nl_after_func_proto = 2 # number
+ nl_after_func_proto = 1 # number
# The number of newlines after a function prototype, if not followed by another function prototype
- nl_after_func_proto_group = 2 # number
+ nl_after_func_proto_group = 1 # number
# The number of newlines after '}' of a multi-line function body
nl_after_func_body = 2 # number
@@ -1323,7 +1323,7 @@ newlines = lf # auto / lf / crlf / cr
# The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.
# 0 = No change.
- nl_after_access_spec = 2 # number
+ nl_after_access_spec = 1 # number
# The number of newlines between a function def and the function comment.
# 0 = No change.
--
GitLab