Skip to content

Commit 484392c

Browse files
zbeekmanzbeekman
authored
Merge pull request #790 from sourceryinstitute/vehre/add-clang-format
Add clang-formating for c sources and headers.
2 parents 4c24262 + a2d8ee7 commit 484392c

File tree

6 files changed

+2228
-1943
lines changed

6 files changed

+2228
-1943
lines changed

‎.clang-format‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#
2+
3+
---
4+
BasedOnStyle: Microsoft
5+
Language: Cpp
6+
7+
AlignAfterOpenBracket: Align
8+
AlignOperands: Align
9+
AlwaysBreakAfterReturnType: TopLevel
10+
BraceWrapping:
11+
AfterCaseLabel: true
12+
BreakBeforeBinaryOperators: true
13+
ColumnLimit: 80
14+
IndentCaseBlocks: true
15+
IndentCaseLabels: true
16+
IndentWidth: 2
17+
PointerAlignment: Right

‎CMakeLists.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,19 @@ function(check_script_style script_full_path)
629629
endif()
630630
endfunction()
631631

632+
#------------------------------------------------------------
633+
# Setup clang-format if present for testing/linting c sources
634+
#------------------------------------------------------------
635+
find_program(CLANGFORMAT_EXE clang-format
636+
DOC "Path to clang-format executable for linting c sources/headers"
637+
)
638+
if (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER})
639+
if(NOT CLANGFORMAT_EXE)
640+
message( AUTHOR_WARNING "OpenCoarrays developers should install clang-format to test/lint all C sources and headers.
641+
See https://releases.llvm.org/download.html for info on obtaining clang-format as part of clang.")
642+
endif()
643+
endif()
644+
632645
#------------------------------------------------------------------------------
633646
# Add custom properties on targets for controling number of images during tests
634647
#------------------------------------------------------------------------------

‎developer-scripts/git-hooks/pre-commit‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ for f in $(git diff-index --name-status --cached $against | grep -v ^D | cut -c3
9393
status=1
9494
fi
9595
fi
96+
if [[ "$f" =~ ([.](h|c))$ ]] ; then
97+
if ! clang-format --dry-run --Werror "$f" >&/dev/null; then
98+
echo "Format violation of file: $f"
99+
echo "Use clang-format to fix it."
100+
echo ""
101+
status=1
102+
fi
103+
fi
96104
done
97105

98106
# If there are whitespace errors, print the offending file names and fail.

‎src/application-binary-interface/libcaf-gfortran-descriptor.h‎

Lines changed: 73 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
3333
/* GNU Fortran's array descriptor. Keep in sync with libgfortran.h. */
3434

3535
enum
36-
{ BT_UNKNOWN = 0, BT_INTEGER, BT_LOGICAL, BT_REAL, BT_COMPLEX,
37-
BT_DERIVED, BT_CHARACTER, BT_CLASS, BT_PROCEDURE, BT_HOLLERITH, BT_VOID,
36+
{
37+
BT_UNKNOWN = 0,
38+
BT_INTEGER,
39+
BT_LOGICAL,
40+
BT_REAL,
41+
BT_COMPLEX,
42+
BT_DERIVED,
43+
BT_CHARACTER,
44+
BT_CLASS,
45+
BT_PROCEDURE,
46+
BT_HOLLERITH,
47+
BT_VOID,
3848
BT_ASSUMED
3949
};
4050

@@ -43,22 +53,21 @@ typedef struct descriptor_dimension
4353
ptrdiff_t _stride;
4454
ptrdiff_t lower_bound;
4555
ptrdiff_t _ubound;
46-
}
47-
descriptor_dimension;
56+
} descriptor_dimension;
4857

4958
#ifdef GCC_GE_8
50-
typedef struct dtype_type
51-
{
52-
size_t elem_len;
53-
int version;
54-
signed char rank;
55-
signed char type;
56-
signed short attribute;
57-
}
58-
dtype_type;
59+
typedef struct dtype_type
60+
{
61+
size_t elem_len;
62+
int version;
63+
signed char rank;
64+
signed char type;
65+
signed short attribute;
66+
} dtype_type;
5967
#endif
6068

61-
typedef struct gfc_descriptor_t {
69+
typedef struct gfc_descriptor_t
70+
{
6271
void *base_addr;
6372
size_t offset;
6473
#ifdef GCC_GE_8
@@ -81,8 +90,10 @@ typedef struct gfc_descriptor_t {
8190
#define GFC_DESCRIPTOR_RANK(desc) (desc)->dtype.rank
8291
#define GFC_DESCRIPTOR_TYPE(desc) (desc)->dtype.type
8392
#define GFC_DESCRIPTOR_SIZE(desc) (desc)->dtype.elem_len
84-
#define GFC_DTYPE_TYPE_SIZE(desc) (( ((desc)->dtype.type << GFC_DTYPE_TYPE_SHIFT) \
85-
| ((desc)->dtype.elem_len << GFC_DTYPE_SIZE_SHIFT) ) & GFC_DTYPE_TYPE_SIZE_MASK)
93+
#define GFC_DTYPE_TYPE_SIZE(desc) \
94+
((((desc)->dtype.type << GFC_DTYPE_TYPE_SHIFT) \
95+
| ((desc)->dtype.elem_len << GFC_DTYPE_SIZE_SHIFT)) \
96+
& GFC_DTYPE_TYPE_SIZE_MASK)
8697

8798
#else
8899

@@ -93,87 +104,102 @@ typedef struct gfc_descriptor_t {
93104
#define GFC_DTYPE_SIZE_SHIFT 6
94105

95106
#define GFC_DESCRIPTOR_RANK(desc) ((desc)->dtype & GFC_DTYPE_RANK_MASK)
96-
#define GFC_DESCRIPTOR_TYPE(desc) (((desc)->dtype & GFC_DTYPE_TYPE_MASK) \
97-
>> GFC_DTYPE_TYPE_SHIFT)
107+
#define GFC_DESCRIPTOR_TYPE(desc) \
108+
(((desc)->dtype & GFC_DTYPE_TYPE_MASK) >> GFC_DTYPE_TYPE_SHIFT)
98109
#define GFC_DESCRIPTOR_SIZE(desc) ((desc)->dtype >> GFC_DTYPE_SIZE_SHIFT)
99110
#define GFC_DTYPE_TYPE_SIZE(desc) ((desc)->dtype & GFC_DTYPE_TYPE_SIZE_MASK)
100111

101112
#endif
102113

103-
#define GFC_DTYPE_SIZE_MASK \
104-
( ~((ptrdiff_t)(1 << GFC_DTYPE_SIZE_SHIFT) - 1)) // least significant bits to 0
114+
#define GFC_DTYPE_SIZE_MASK \
115+
(~((ptrdiff_t)(1 << GFC_DTYPE_SIZE_SHIFT) - 1)) // least significant bits to 0
105116
#define GFC_DTYPE_TYPE_SIZE_MASK (GFC_DTYPE_SIZE_MASK | GFC_DTYPE_TYPE_MASK)
106117

107-
#define GFC_DTYPE_INTEGER_1 ((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
118+
#define GFC_DTYPE_INTEGER_1 \
119+
((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
108120
| (sizeof(int8_t) << GFC_DTYPE_SIZE_SHIFT))
109-
#define GFC_DTYPE_INTEGER_2 ((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
121+
#define GFC_DTYPE_INTEGER_2 \
122+
((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
110123
| (sizeof(int16_t) << GFC_DTYPE_SIZE_SHIFT))
111-
#define GFC_DTYPE_INTEGER_4 ((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
124+
#define GFC_DTYPE_INTEGER_4 \
125+
((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
112126
| (sizeof(int32_t) << GFC_DTYPE_SIZE_SHIFT))
113-
#define GFC_DTYPE_INTEGER_8 ((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
127+
#define GFC_DTYPE_INTEGER_8 \
128+
((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
114129
| (sizeof(int64_t) << GFC_DTYPE_SIZE_SHIFT))
115130
#if HAVE_INT128_T
116-
#define GFC_DTYPE_INTEGER_16 ((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
131+
#define GFC_DTYPE_INTEGER_16 \
132+
((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
117133
| (sizeof(__int128_t) << GFC_DTYPE_SIZE_SHIFT))
118134
#endif
119135

120-
#define GFC_DTYPE_LOGICAL_4 ((BT_LOGICAL << GFC_DTYPE_TYPE_SHIFT) \
121-
| (sizeof(int) << GFC_DTYPE_SIZE_SHIFT))
136+
#define GFC_DTYPE_LOGICAL_4 \
137+
((BT_LOGICAL << GFC_DTYPE_TYPE_SHIFT) | (sizeof(int) << GFC_DTYPE_SIZE_SHIFT))
122138

123139
#if 0
124-
#define GFC_DTYPE_LOGICAL_1 ((BT_LOGICAL << GFC_DTYPE_TYPE_SHIFT) \
140+
#define GFC_DTYPE_LOGICAL_1 \
141+
((BT_LOGICAL << GFC_DTYPE_TYPE_SHIFT) \
125142
| (sizeof(GFC_LOGICAL_1) << GFC_DTYPE_SIZE_SHIFT))
126-
#define GFC_DTYPE_LOGICAL_2 ((BT_LOGICAL << GFC_DTYPE_TYPE_SHIFT) \
143+
#define GFC_DTYPE_LOGICAL_2 \
144+
((BT_LOGICAL << GFC_DTYPE_TYPE_SHIFT) \
127145
| (sizeof(GFC_LOGICAL_2) << GFC_DTYPE_SIZE_SHIFT))
128-
#define GFC_DTYPE_LOGICAL_8 ((BT_LOGICAL << GFC_DTYPE_TYPE_SHIFT) \
146+
#define GFC_DTYPE_LOGICAL_8 \
147+
((BT_LOGICAL << GFC_DTYPE_TYPE_SHIFT) \
129148
| (sizeof(double) << GFC_DTYPE_SIZE_SHIFT))
130-
#define GFC_DTYPE_LOGICAL_16 ((BT_LOGICAL << GFC_DTYPE_TYPE_SHIFT)\
149+
#define GFC_DTYPE_LOGICAL_16 \
150+
((BT_LOGICAL << GFC_DTYPE_TYPE_SHIFT) \
131151
| (sizeof(GFC_LOGICAL_16) << GFC_DTYPE_SIZE_SHIFT))
132152
#endif
133153

134-
#define GFC_DTYPE_REAL_4 ((BT_REAL << GFC_DTYPE_TYPE_SHIFT) \
135-
| (sizeof(float) << GFC_DTYPE_SIZE_SHIFT))
136-
#define GFC_DTYPE_REAL_8 ((BT_REAL << GFC_DTYPE_TYPE_SHIFT) \
137-
| (sizeof(double) << GFC_DTYPE_SIZE_SHIFT))
154+
#define GFC_DTYPE_REAL_4 \
155+
((BT_REAL << GFC_DTYPE_TYPE_SHIFT) | (sizeof(float) << GFC_DTYPE_SIZE_SHIFT))
156+
#define GFC_DTYPE_REAL_8 \
157+
((BT_REAL << GFC_DTYPE_TYPE_SHIFT) | (sizeof(double) << GFC_DTYPE_SIZE_SHIFT))
138158
#if 0
139159
#ifdef HAVE_GFC_REAL_10
140-
#define GFC_DTYPE_REAL_10 ((BT_REAL << GFC_DTYPE_TYPE_SHIFT) \
160+
#define GFC_DTYPE_REAL_10 \
161+
((BT_REAL << GFC_DTYPE_TYPE_SHIFT) \
141162
| (sizeof(GFC_REAL_10) << GFC_DTYPE_SIZE_SHIFT))
142163
#endif
143164
#ifdef HAVE_GFC_REAL_16
144-
#define GFC_DTYPE_REAL_16 ((BT_REAL << GFC_DTYPE_TYPE_SHIFT) \
165+
#define GFC_DTYPE_REAL_16 \
166+
((BT_REAL << GFC_DTYPE_TYPE_SHIFT) \
145167
| (sizeof(GFC_REAL_16) << GFC_DTYPE_SIZE_SHIFT))
146168
#endif
147169
#endif
148170

149-
#define GFC_DTYPE_COMPLEX_4 ((BT_COMPLEX << GFC_DTYPE_TYPE_SHIFT) \
171+
#define GFC_DTYPE_COMPLEX_4 \
172+
((BT_COMPLEX << GFC_DTYPE_TYPE_SHIFT) \
150173
| (sizeof(_Complex float) << GFC_DTYPE_SIZE_SHIFT))
151-
#define GFC_DTYPE_COMPLEX_8 ((BT_COMPLEX << GFC_DTYPE_TYPE_SHIFT) \
174+
#define GFC_DTYPE_COMPLEX_8 \
175+
((BT_COMPLEX << GFC_DTYPE_TYPE_SHIFT) \
152176
| (sizeof(_Complex double) << GFC_DTYPE_SIZE_SHIFT))
153177
#if 0
154178
#ifdef HAVE_GFC_COMPLEX_10
155-
#define GFC_DTYPE_COMPLEX_10 ((BT_COMPLEX << GFC_DTYPE_TYPE_SHIFT) \
179+
#define GFC_DTYPE_COMPLEX_10 \
180+
((BT_COMPLEX << GFC_DTYPE_TYPE_SHIFT) \
156181
| (sizeof(GFC_COMPLEX_10) << GFC_DTYPE_SIZE_SHIFT))
157182
#endif
158183
#ifdef HAVE_GFC_COMPLEX_16
159-
#define GFC_DTYPE_COMPLEX_16 ((BT_COMPLEX << GFC_DTYPE_TYPE_SHIFT) \
184+
#define GFC_DTYPE_COMPLEX_16 \
185+
((BT_COMPLEX << GFC_DTYPE_TYPE_SHIFT) \
160186
| (sizeof(GFC_COMPLEX_16) << GFC_DTYPE_SIZE_SHIFT))
161187
#endif
162188
#endif
163189

164-
/* FIXME: Hardwiring these values to what the mpi_caf.c macro GFC_DTYPE_TYPE_SIZE(desc)
165-
receives in the dtype component its gf_descriptor_t argument for character(kind=c_char)
166-
and logical(kind=c_bool) data:
190+
/* FIXME: Hardwiring these values to what the mpi_caf.c macro
191+
GFC_DTYPE_TYPE_SIZE(desc) receives in the dtype component its gf_descriptor_t
192+
argument for character(kind=c_char) and logical(kind=c_bool) data:
167193
*/
168194

169195
#ifdef GCC_GE_8
170196

171-
#define GFC_DTYPE_CHARACTER ((BT_CHARACTER << GFC_DTYPE_TYPE_SHIFT) \
197+
#define GFC_DTYPE_CHARACTER \
198+
((BT_CHARACTER << GFC_DTYPE_TYPE_SHIFT) \
172199
| (sizeof(char) << GFC_DTYPE_SIZE_SHIFT))
173200

174201
#else
175202
#define GFC_DTYPE_CHARACTER 48
176203
#endif
177204

178-
179-
#endif /* LIBCAF_GFORTRAN_DESCRIPTOR_H. */
205+
#endif /* LIBCAF_GFORTRAN_DESCRIPTOR_H. */

0 commit comments

Comments
 (0)