[Bf-blender-cvs] [2986bc1d6e5] master: ClangFormat: add comments to ignore formatting
Campbell Barton
noreply at git.blender.org
Tue Apr 16 16:58:07 CEST 2019
Commit: 2986bc1d6e5d89aa59e191f3b0e7eb0be7de42ba
Author: Campbell Barton
Date: Tue Apr 16 16:53:50 2019 +0200
Branches: master
https://developer.blender.org/rB2986bc1d6e5d89aa59e191f3b0e7eb0be7de42ba
ClangFormat: add comments to ignore formatting
===================================================================
M source/blender/blenkernel/intern/idcode.c
M source/blender/blenkernel/intern/unit.c
M source/blender/blenlib/BLI_compiler_typecheck.h
M source/blender/blenlib/BLI_utildefines_variadic.h
M source/blender/blenlib/intern/fnmatch.c
M source/blender/blenlib/intern/sort.c
M source/blender/bmesh/intern/bmesh_opdefines.c
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/editors/space_text/text_format_lua.c
M source/blender/editors/space_text/text_format_osl.c
M source/blender/editors/space_text/text_format_pov.c
M source/blender/editors/space_text/text_format_pov_ini.c
M source/blender/editors/space_text/text_format_py.c
M source/blender/nodes/NOD_static_types.h
M tests/gtests/blenlib/BLI_ressource_strings.h
M tests/gtests/blenlib/BLI_string_utf8_test.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c
index 42864fa8350..5e37f586a2a 100644
--- a/source/blender/blenkernel/intern/idcode.c
+++ b/source/blender/blenkernel/intern/idcode.c
@@ -44,6 +44,8 @@ typedef struct {
#define IDTYPE_FLAGS_ISLINKABLE (1 << 0)
} IDType;
+/* Keep alignment for readability. */
+/* clang-format off */
/**
* When editing enusre that:
* - Plural need to match rna_main.c's #MainCollectionDef.
@@ -93,6 +95,7 @@ static IDType idtypes[] = {
/** Keep last, not an ID exactly, only include for completeness */
{ID_LINK_PLACEHOLDER, "Link Placeholder", "link_placeholders", BLT_I18NCONTEXT_ID_ID, 0}, /* plural is fake */
};
+/* clang-format on */
/* -1 for ID_LINK_PLACEHOLDER */
BLI_STATIC_ASSERT((ARRAY_SIZE(idtypes) - 1 == MAX_LIBARRAY), "Missing IDType");
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index 2d2db5fea1e..25f3a57791e 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -39,6 +39,9 @@
/* no BKE or DNA includes! */
+/* Keep alignment. */
+/* clang-format off */
+
#define TEMP_STR_SIZE 256
#define SEP_CHR '#'
@@ -77,6 +80,8 @@
#define UN_SC_LB 0.45359237f
#define UN_SC_OZ 0.028349523125f
+/* clang-format on */
+
/* define a single unit */
typedef struct bUnitDef {
const char *name;
diff --git a/source/blender/blenlib/BLI_compiler_typecheck.h b/source/blender/blenlib/BLI_compiler_typecheck.h
index 4503848d6ea..c816e422c81 100644
--- a/source/blender/blenlib/BLI_compiler_typecheck.h
+++ b/source/blender/blenlib/BLI_compiler_typecheck.h
@@ -85,7 +85,8 @@
* \endcode
*/
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
-
+/* Over wrapped args. */
+/* clang-format off */
#define _VA_CHECK_TYPE_ANY2(v, a0) \
((void)_Generic((v), a0: 0))
#define _VA_CHECK_TYPE_ANY3(v, a0, b0) \
@@ -373,6 +374,7 @@
t1: 0, u1: 0, v1: 0, w1: 0, x1: 0, y1: 0, z1: 0, a2: 0, b2: 0, c2: 0, d2: 0, e2: 0, f2: 0, g2: 0, h2: 0, i2: 0, \
j2: 0, k2: 0))
# define CHECK_TYPE_ANY(...) VA_NARGS_CALL_OVERLOAD(_VA_CHECK_TYPE_ANY, __VA_ARGS__)
+/* clang-format on */
#else
# define CHECK_TYPE_ANY(...) (void)0
#endif
@@ -396,6 +398,8 @@
* print(" %s: r " % (": r, ".join(args)))
* \endcode
*/
+/* Over wrapped args. */
+/* clang-format off */
#define _VA_GENERIC_TYPE_ANY2(r, a0) \
a0: r
#define _VA_GENERIC_TYPE_ANY3(r, a0, b0) \
@@ -673,6 +677,7 @@
q0: r, r0: r, s0: r, t0: r, u0: r, v0: r, w0: r, x0: r, y0: r, z0: r, a1: r, b1: r, c1: r, d1: r, e1: r, f1: r, \
g1: r, h1: r, i1: r, j1: r, k1: r, l1: r, m1: r, n1: r, o1: r, p1: r, q1: r, r1: r, s1: r, t1: r, u1: r, v1: r, \
w1: r, x1: r, y1: r, z1: r, a2: r, b2: r, c2: r, d2: r, e2: r, f2: r, g2: r, h2: r, i2: r, j2: r, k2: r
+/* clang-format on */
# define GENERIC_TYPE_ANY(...) VA_NARGS_CALL_OVERLOAD(_VA_GENERIC_TYPE_ANY, __VA_ARGS__)
diff --git a/source/blender/blenlib/BLI_utildefines_variadic.h b/source/blender/blenlib/BLI_utildefines_variadic.h
index 3048b814383..658733c80dc 100644
--- a/source/blender/blenlib/BLI_utildefines_variadic.h
+++ b/source/blender/blenlib/BLI_utildefines_variadic.h
@@ -21,6 +21,9 @@
* \ingroup bli
*/
+/* Over wrapped args. */
+/* clang-format off */
+
/* --- internal helpers --- */
#define _VA_NARGS_GLUE(x, y) x y
#define _VA_NARGS_RETURN_COUNT(\
@@ -43,4 +46,6 @@
#define VA_NARGS_CALL_OVERLOAD(name, ...) \
_VA_NARGS_GLUE(_VA_NARGS_OVERLOAD_MACRO(name, VA_NARGS_COUNT(__VA_ARGS__)), (__VA_ARGS__))
+/* clang-format on */
+
#endif /* __BLI_UTILDEFINES_VARIADIC_H__ */
diff --git a/source/blender/blenlib/intern/fnmatch.c b/source/blender/blenlib/intern/fnmatch.c
index 9ba2cdbf2e6..c0675e8c4d6 100644
--- a/source/blender/blenlib/intern/fnmatch.c
+++ b/source/blender/blenlib/intern/fnmatch.c
@@ -19,6 +19,10 @@
#ifdef WIN32
+
+/* Maintained by GLIBC. */
+/* clang-format off */
+
/* Enable GNU extensions in fnmatch.h. */
#ifndef _GNU_SOURCE
# define _GNU_SOURCE 1
@@ -237,6 +241,8 @@ fnmatch (const char *pattern, const char *string, int flags)
#endif /* _LIBC or not __GNU_LIBRARY__. */
+/* clang-format on */
+
#else
/* intentionally empty for UNIX */
diff --git a/source/blender/blenlib/intern/sort.c b/source/blender/blenlib/intern/sort.c
index 921eec5ddc4..07c85e6ba7b 100644
--- a/source/blender/blenlib/intern/sort.c
+++ b/source/blender/blenlib/intern/sort.c
@@ -35,6 +35,9 @@
# undef min
#endif
+/* Maintained by FreeBSD. */
+/* clang-format off */
+
/**
* qsort, copied from FreeBSD source.
* with only very minor edits, see:
@@ -177,4 +180,6 @@ loop:
}
}
+/* clang-format on */
+
#endif /* __GLIBC__ */
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c
index 0ed1338e62f..4ca8e02e94d 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -90,6 +90,9 @@
* note that '//' comments are ignored.
*/
+/* Keep struct definition from wrapping. */
+/* clang-format off */
+
/* enums shared between multiple operators */
static BMO_FlagSet bmo_enum_axis_xyz[] = {
@@ -2067,6 +2070,8 @@ static BMOpDefine bmo_symmetrize_def = {
BMO_OPTYPE_FLAG_SELECT_VALIDATE),
};
+/* clang-format on */
+
const BMOpDefine *bmo_opdefines[] = {
&bmo_automerge_def,
&bmo_average_vert_facedata_def,
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index 66e45430e18..5f073d45dfb 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -59,6 +59,8 @@ extern struct DrawEngineType draw_engine_eevee_type;
# define SHADER_IRRADIANCE "#define IRRADIANCE_HL2\n"
#endif
+/* Macro causes over indentation. */
+/* clang-format off */
#define SHADER_DEFINES \
"#define EEVEE_ENGINE\n" \
"#define MAX_PROBE " STRINGIFY(MAX_PROBE) "\n" \
@@ -70,6 +72,7 @@ extern struct DrawEngineType draw_engine_eevee_type;
"#define MAX_SHADOW_CASCADE " STRINGIFY(MAX_SHADOW_CASCADE) "\n" \
"#define MAX_CASCADE_NUM " STRINGIFY(MAX_CASCADE_NUM) "\n" \
SHADER_IRRADIANCE
+/* clang-format on */
#define SWAP_DOUBLE_BUFFERS() { \
if (effects->swap_double_buffer) { \
diff --git a/source/blender/editors/space_text/text_format_lua.c b/source/blender/editors/space_text/text_format_lua.c
index 4b25c5d39a7..30080d2395b 100644
--- a/source/blender/editors/space_text/text_format_lua.c
+++ b/source/blender/editors/space_text/text_format_lua.c
@@ -45,6 +45,9 @@ static int txtfmt_lua_find_keyword(const char *string)
{
int i, len;
+ /* Keep aligned args for readability. */
+ /* clang-format off */
+
if (STR_LITERAL_STARTSWITH(string, "and", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "break", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "do", len)) i = len;
@@ -65,6 +68,8 @@ static int txtfmt_lua_find_keyword(const char *string)
else if (STR_LITERAL_STARTSWITH(string, "while", len)) i = len;
else i = 0;
+ /* clang-format on */
+
/* If next source char is an identifier (eg. 'i' in "definite") no match */
if (i == 0 || text_check_identifier(string[i]))
return -1;
@@ -86,6 +91,9 @@ static int txtfmt_lua_find_specialvar(const char *string)
{
int i, len;
+ /* Keep aligned args for readability. */
+ /* clang-format off */
+
if (STR_LITERAL_STARTSWITH(string, "assert", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "collectgarbage", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "dofile", len)) i = len;
@@ -116,6 +124,8 @@ static int txtfmt_lua_find_specialvar(const char *string)
else if (STR_LITERAL_STARTSWITH(string, "xpcall", len)) i = len;
else i = 0;
+ /* clang-format on */
+
/* If next source char is an identifier (eg. 'i' in "definite") no match */
if (i == 0 || text_check_identifier(string[i]))
return -1;
@@ -131,6 +141,8 @@ static int txtfmt_lua_find_bool(const char *string)
else if (STR_LITERAL_STARTSWITH(string, "false", len)) i = len;
else i = 0;
+ /* clang-format on */
+
/* If next source char is an identifier (eg. 'i' in "Nonetheless") no match */
if (i == 0 || text_check_identifier(string[i]))
return -1;
@@ -140,9 +152,16 @@ static int txtfmt_lua_find_bool(const char *string)
static char txtfmt_lua_format_identifier(const char *str)
{
char fmt;
+
+ /* Keep aligned args for readability. */
+ /* clang-format off */
+
if ((txtfmt_lua_find_specialvar(str)) != -1) fmt = FMT_TYPE_SPECIAL;
else if ((txtfmt_lua_find_keyword(str)) != -1) fmt = FMT_TYPE_KEYWORD;
else fmt = FMT_TYPE_DEFAULT;
+
+ /* clang-format on */
+
return fmt;
}
@@ -265,11 +284,16 @@ static void txtfmt_lua_format_line(SpaceText *st, TextLine *line, const bool do_
}
/* Not ws, a digit, punct, or continuing text. Must be new, check for special words */
else {
+ /* Keep aligned args for readability. */
+ /* clang-format off */
+
/* Special vars(v) or built-in keywords(b) */
/* keep in sync with 'txtfmt_osl_format_identifier()' */
if ((i = txtfmt_lua_find_specialvar(str)) != -1) prev = FMT_TYPE_SPECIAL;
else if ((i = txtfmt_lua_find_keyword(str)) != -1) prev = FMT_TYPE_KEYWORD;
+ /* clang-format on */
+
if (i > 0) {
text_format_fill_ascii(&str, &fmt, prev, i);
}
diff --git a/source/blender/editors/space_text/text_format_osl.c b/source/blender/editors/space_text/text_format_osl.c
index 08cae0d978d..66980b30c4d 100644
--- a/source/blender/editors/space_text/text_format_osl.c
+++ b/source/blender/editors/space_text/text_format_osl.c
@@ -33,6 +33,10 @@
static int txtfmt_osl_find_builtinfunc(const char *string)
{
int i, len;
+
+ /* Keep aligned args for readability. */
+ /* clang-format off */
+
/* list is from
* https://github.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list