Update r2-indent rules

This commit is contained in:
pancake 2017-02-27 00:40:25 +01:00
parent 3b83e18c51
commit 0aff2ab8ca
3 changed files with 36 additions and 27 deletions

View File

@ -9,8 +9,8 @@ input_tab_size = 8
output_tab_size = 8
sp_arith = Force
sp_assign = Force
sp_after_ptr_star = Remove
sp_after_ptr_star_func = Remove
sp_after_ptr_star = ignore
sp_after_ptr_star_func = ignore
sp_before_ptr_star_func = Force
sp_before_ptr_star = Remove
sp_after_cast = Force
@ -118,7 +118,7 @@ sp_inside_paren = remove
sp_paren_paren = remove
sp_cparen_oparen = ignore
sp_balance_nested_parens = false
sp_paren_brace = ignore
sp_paren_brace = force
sp_before_ptr_star = add
sp_before_unnamed_ptr_star = ignore
sp_between_ptr_star = remove
@ -140,7 +140,7 @@ sp_angle_paren_empty = ignore
sp_angle_word = ignore
sp_angle_shift = add
sp_permit_cpp11_shift = false
sp_before_sparen = ignore
sp_before_sparen = force
sp_inside_sparen = remove
sp_inside_sparen_close = ignore
sp_inside_sparen_open = ignore
@ -155,10 +155,10 @@ sp_before_semi_for_empty = ignore
sp_after_semi = add
sp_after_semi_for = force
sp_after_semi_for_empty = remove
sp_before_square = ignore
sp_before_square = remove
sp_before_squares = remove
sp_inside_square = remove
sp_after_comma = ignore
sp_after_comma = force
sp_before_comma = remove
sp_after_mdatype_commas = ignore
sp_before_mdatype_commas = ignore
@ -179,7 +179,7 @@ sp_sizeof_paren = ignore
sp_after_tag = ignore
sp_inside_braces_enum = ignore
sp_inside_braces_struct = ignore
sp_inside_braces = ignore
sp_inside_braces = force
sp_inside_braces_empty = remove
sp_type_func = ignore
sp_func_proto_paren = ignore
@ -209,8 +209,8 @@ sp_this_paren = remove
sp_macro = ignore
sp_macro_func = ignore
sp_else_brace = force
sp_brace_else = ignore
sp_brace_typedef = ignore
sp_brace_else = force
sp_brace_typedef = force
sp_catch_brace = ignore
sp_brace_catch = ignore
sp_finally_brace = ignore
@ -219,7 +219,7 @@ sp_try_brace = ignore
sp_getset_brace = ignore
sp_word_brace = add
sp_word_brace_ns = add
sp_before_dc = ignore
sp_before_dc = force
sp_after_dc = ignore
sp_d_array_colon = ignore
sp_not = remove
@ -330,7 +330,7 @@ nl_cpp_lambda_leave_one_liners = false
nl_if_leave_one_liners = false
nl_while_leave_one_liners = false
nl_oc_msg_leave_one_liner = false
nl_oc_block_brace = ignore
nl_oc_block_brace = force
nl_start_of_file = ignore
nl_start_of_file_min = 0
nl_end_of_file = ignore
@ -362,14 +362,14 @@ nl_catch_brace = ignore
nl_brace_catch = ignore
nl_brace_square = ignore
nl_brace_fparen = ignore
nl_while_brace = ignore
nl_while_brace = remove
nl_scope_brace = ignore
nl_unittest_brace = ignore
nl_version_brace = ignore
nl_using_brace = ignore
nl_brace_brace = ignore
nl_do_brace = Remove
nl_brace_while = ignore
nl_brace_while = remove
nl_switch_brace = ignore
nl_synchronized_brace = ignore
nl_multi_line_cond = false
@ -501,8 +501,8 @@ nl_before_return = false
nl_after_return = false
nl_after_annotation = ignore
nl_between_annotation = ignore
mod_full_brace_do = ignore
mod_full_brace_for = ignore
mod_full_brace_do = force
mod_full_brace_for = force
mod_full_brace_function = ignore
mod_full_brace_if_chain = false
mod_full_brace_if_chain_only = false

View File

@ -9,6 +9,15 @@ libr/util/log.c
libr/util/cache.c
libr/util/print.c
libr/hash/calc.c
libr/hash/crc16.c
libr/hash/luhn.c
libr/hash/xxhash.c
libr/hash/md4.c
libr/hash/adler32.c
libr/hash/hash.c
libr/hash/sha2.c
libr/reg/reg.c
libr/reg/arena.c
libr/reg/double.c

View File

@ -61,20 +61,20 @@ indentFile() {
fi
echo "Indenting ${IFILE} ..." >&2
(
if [ "${UNCRUST}" = 1 ]; then
cp -f doc/clang-format ${CWD}/.clang-format
cd "$CWD"
uncrustify -c ${CWD}/doc/uncrustify.cfg -f "${IFILE}" > .tmp-format
else
cp -f doc/clang-format ${CWD}/.clang-format
cd "$CWD"
clang-format "${IFILE}" > .tmp-format
fi
if [ "${UNCRUST}" = 1 ]; then
cp -f doc/clang-format ${CWD}/.clang-format
cd "$CWD"
uncrustify -c ${CWD}/doc/uncrustify.cfg -f "${IFILE}" > .tmp-format
else
cp -f doc/clang-format ${CWD}/.clang-format
cd "$CWD"
clang-format "${IFILE}" > .tmp-format
fi
# one of those rules fuckups the ascii art in comment blocks
# fix ternary conditional indent
perl -ne 's/ \? /? /g;print' < .tmp-format > .tmp-format2
cat .tmp-format2 | sed -e 's, : ,: ,g' > .tmp-format
cat .tmp-format2 | perl -ne 's/\r//g;print' | sed -e 's, : ,: ,g' > .tmp-format
mv .tmp-format .tmp-format2
# do not space before parenthesis on function signatures
awk '{if (/^static/ || /^R_API/) { gsub(/ \(/,"("); }; print;}' \
@ -106,8 +106,8 @@ fi
mv .tmp-format .tmp-format2
perl -ne 's/[\xa0\xc2]//g;print' < .tmp-format2 > .tmp-format
# remove spaces after #if
mv .tmp-format .tmp-format2
perl -ne 's/#if\ */#if /g;print' < .tmp-format2 > .tmp-format
#mv .tmp-format .tmp-format2
#perl -ne 's/#if\ */#if /g;print' < .tmp-format2 > .tmp-format
# add spce after every //
if [ "$UNIFIED" = 1 ]; then