Skip to content

Codify grouping and order of includes #6620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 1, 2022
Merged

Codify grouping and order of includes #6620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7965ba2
Use github.com Linux kernel mirror in integration test
tautschnig Feb 1, 2022
3b7b19a
Codify grouping and order of includes
tautschnig Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,18 @@ NamespaceIndentation: None
PenaltyBreakString: 10000
PointerAlignment: Right
ReflowComments: 'false'
SortIncludes: 'true'
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '<util/'
Priority: 1
- Regex: '<goto-programs/'
Priority: 2
- Regex: '<.+/.+>'
Priority: 3
- Regex: '^"[^/]+"$'
Priority: 4
- Regex: '<[^/]+>'
Priority: 5
SpaceAfterCStyleCast: 'false'
SpaceBeforeAssignmentOperators: 'true'
SpaceBeforeParens: Never
Expand Down
2 changes: 1 addition & 1 deletion CODING_STANDARD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Formatting is enforced using clang-format. For more information about this, see
- The corresponding header for a given source file should always be the *first*
include in the source file. For example, given `foo.h` and `foo.cpp`, the
line `#include "foo.h"` should precede all other include statements in
`foo.cpp`.
`foo.cpp`. clang-format will enforce this.
- Use the C++ versions of C headers (e.g. `cmath` instead of `math.h`).
Some of the C headers use macros instead of functions which can have
unexpected consequences.
Expand Down
2 changes: 1 addition & 1 deletion integration/linux/compile_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ make -C src CXX='ccache /usr/bin/g++' cbmc.dir goto-cc.dir goto-diff.dir -j$(npr
[ -d one-line-scan ] || git clone https://github.com/awslabs/one-line-scan.git one-line-scan

# Get Linux v5.10, if we do not have it already
[ -d linux_5_10 ] || git clone -b v5.10 --depth=1 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux_5_10
[ -d linux_5_10 ] || git clone -b v5.10 --depth=1 https://github.com/torvalds/linux/ linux_5_10

# Prepare compile a part of the kernel with CBMC via one-line-scan
ln -s goto-cc src/goto-cc/goto-ld
Expand Down