From bcd18f8ec236dc3351af466d89a0ec520b58fd36 Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Thu, 9 Apr 2026 11:57:10 -0600 Subject: [PATCH 1/7] don't enforce column limit on main --- tests/.config/.clang-format | 94 ---------------------- tests/.config/base.clang-format | 5 ++ tests/.config/dev.clang-format | 5 ++ tests/Makefile | 5 -- tests/scripts/do_format.sh | 5 -- tests/scripts/grep_clangformat_cppcheck.sh | 2 +- tests/scripts/update_main.sh | 3 +- 7 files changed, 13 insertions(+), 106 deletions(-) delete mode 100644 tests/.config/.clang-format create mode 100644 tests/.config/base.clang-format create mode 100644 tests/.config/dev.clang-format delete mode 100755 tests/scripts/do_format.sh diff --git a/tests/.config/.clang-format b/tests/.config/.clang-format deleted file mode 100644 index ed27099e2..000000000 --- a/tests/.config/.clang-format +++ /dev/null @@ -1,94 +0,0 @@ ---- -Language: Cpp -BasedOnStyle: Google -AccessModifierOffset: -2 -AlignAfterOpenBracket: DontAlign -AlignConsecutiveAssignments: false -AlignConsecutiveBitFields: None -AlignConsecutiveDeclarations: None -AlignConsecutiveMacros: None -AlignOperands: DontAlign -AlignTrailingComments: false -AllowShortBlocksOnASingleLine: Always -AllowShortCaseLabelsOnASingleLine: true -AllowShortEnumsOnASingleLine: true -AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: AllIfsAndElse -AllowShortLambdasOnASingleLine: All -AllowShortLoopsOnASingleLine: true -AlwaysBreakAfterReturnType: None -# AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: MultiLine -AttributeMacros: [] -BinPackArguments: true -BinPackParameters: true -BitFieldColonSpacing: Both -BreakBeforeBinaryOperators: None -BreakBeforeBraces: Attach -BreakBeforeConceptDeclarations: false -BreakBeforeTernaryOperators: true -BreakConstructorInitializers: AfterColon -BreakInheritanceList: AfterColon -BreakStringLiterals: false -ColumnLimit: 59 -CompactNamespaces: true -ConstructorInitializerAllOnOneLineOrOnePerLine: false -ConstructorInitializerIndentWidth: 2 -ContinuationIndentWidth: 2 -Cpp11BracedListStyle: true -DerivePointerAlignment: true -EmptyLineAfterAccessModifier: Never -EmptyLineBeforeAccessModifier: Never -FixNamespaceComments: false -ForEachMacros: [] -IncludeBlocks: Preserve -IndentCaseBlocks: false -IndentCaseLabels: false -IndentGotoLabels: false -IndentWidth: 2 -IndentWrappedFunctionNames: false -InsertTrailingCommas: None -# LambdaBodyIndentation: OuterScope -KeepEmptyLinesAtTheStartOfBlocks: false -MaxEmptyLinesToKeep: 0 -NamespaceIndentation: None -PackConstructorInitializers: BinPack -PenaltyBreakAssignment: 1 -PenaltyBreakBeforeFirstCallParameter: 1 -# PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 1 -PenaltyBreakOpenParenthesis: 1 -# PenaltyBreakString: 1000 -PenaltyExcessCharacter: 1000000 -# PenaltyIndentedWhitespace: 1000 -PenaltyReturnTypeOnItsOwnLine: 200 -PointerAlignment: Left -# QualifierAlignment: Left -# ReflowComments: false -ReferenceAlignment: Left -RemoveBracesLLVM: true -SeparateDefinitionBlocks: Never -SortIncludes: false -SortUsingDeclarations: false -SpaceAfterCStyleCast: false -SpaceAfterLogicalNot: false -SpaceAfterTemplateKeyword: false -SpaceAroundPointerQualifiers: Default -SpaceBeforeAssignmentOperators: true -SpaceBeforeCaseColon: false -SpaceBeforeCpp11BracedList: false -SpaceBeforeCtorInitializerColon: false -SpaceBeforeInheritanceColon: false -SpaceBeforeParens: ControlStatementsExceptControlMacros -SpaceBeforeRangeBasedForLoopColon: true -SpaceBeforeSquareBrackets: false -SpaceInEmptyBlock: false -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 1 -SpacesInAngles: false -SpacesInCStyleCastParentheses: false -SpacesInContainerLiterals: false -SpacesInParentheses: false -SpacesInSquareBrackets: false -Standard: c++20 -... diff --git a/tests/.config/base.clang-format b/tests/.config/base.clang-format new file mode 100644 index 000000000..81302a4fc --- /dev/null +++ b/tests/.config/base.clang-format @@ -0,0 +1,5 @@ +--- +Language: Cpp +BasedOnStyle: file:base.clang-format +ColumnLimit: 0 +... diff --git a/tests/.config/dev.clang-format b/tests/.config/dev.clang-format new file mode 100644 index 000000000..f985f0fa1 --- /dev/null +++ b/tests/.config/dev.clang-format @@ -0,0 +1,5 @@ +--- +Language: Cpp +BasedOnStyle: file:base.clang-format +ColumnLimit: 59 +... diff --git a/tests/Makefile b/tests/Makefile index 41fcb579a..a83429382 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -7,8 +7,6 @@ help: @echo " |" @echo "make grep_clangformat_cppcheck | various greps to catch certain things, clang-format, cppcheck" @echo " |" - @echo "make do_format | format with clang-format" - @echo " |" @echo "make clangtidy | runs clang-tidy (mainly to verify snake_case)" @echo " |" @echo "make build_pdf | build build_pdf.pdf from .tex file" @@ -32,9 +30,6 @@ compile_clang: grep_clangformat_cppcheck: ./scripts/grep_clangformat_cppcheck.sh -do_format: - ./scripts/do_format.sh - clangtidy: ./scripts/clangtidy.sh diff --git a/tests/scripts/do_format.sh b/tests/scripts/do_format.sh deleted file mode 100755 index 7a41729a2..000000000 --- a/tests/scripts/do_format.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -# ** glob now searches any number of levels -shopt -s globstar - -clang-format-19 -i --style=file:.config/.clang-format ../**/*.hpp ../**/*.cpp diff --git a/tests/scripts/grep_clangformat_cppcheck.sh b/tests/scripts/grep_clangformat_cppcheck.sh index 9c39c6d74..8c2b4851f 100755 --- a/tests/scripts/grep_clangformat_cppcheck.sh +++ b/tests/scripts/grep_clangformat_cppcheck.sh @@ -43,7 +43,7 @@ find ../library/ library_checker_aizu_tests/ -name "*[A-Z]*" -or -name "*-*" | grep --invert-match "README" && exit 1 -clang-format-19 --dry-run --Werror --style=file:.config/.clang-format library_checker_aizu_tests/**/*.hpp library_checker_aizu_tests/**/*.test.cpp ../library/**/*.hpp ../library/**/*.cpp || exit 1 +clang-format-19 --dry-run --Werror --style=file:.config/dev.clang-format library_checker_aizu_tests/**/*.hpp library_checker_aizu_tests/**/*.test.cpp ../library/**/*.hpp ../library/**/*.cpp || exit 1 git submodule init git submodule update diff --git a/tests/scripts/update_main.sh b/tests/scripts/update_main.sh index fdaae0ba8..a43f1637a 100755 --- a/tests/scripts/update_main.sh +++ b/tests/scripts/update_main.sh @@ -25,5 +25,6 @@ done # the cpp preprocessor sometimes leaves blank empty lines sed --in-place '/^[[:space:]]*$/d' ../**/*.hpp + # cpp command messes up formatting -make do_format +clang-format-19 -i --style=file:.config/main.clang-format ../**/*.hpp ../**/*.cpp From 542d4bbf155d69d828eb764573b602b5bfc99e90 Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Thu, 9 Apr 2026 11:58:47 -0600 Subject: [PATCH 2/7] fixes --- tests/.config/base.clang-format | 92 ++++++++++++++++++++++++++++++++- tests/.config/main.clang-format | 5 ++ 2 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 tests/.config/main.clang-format diff --git a/tests/.config/base.clang-format b/tests/.config/base.clang-format index 81302a4fc..04d3fe025 100644 --- a/tests/.config/base.clang-format +++ b/tests/.config/base.clang-format @@ -1,5 +1,93 @@ --- Language: Cpp -BasedOnStyle: file:base.clang-format -ColumnLimit: 0 +BasedOnStyle: Google +AccessModifierOffset: -2 +AlignAfterOpenBracket: DontAlign +AlignConsecutiveAssignments: false +AlignConsecutiveBitFields: None +AlignConsecutiveDeclarations: None +AlignConsecutiveMacros: None +AlignOperands: DontAlign +AlignTrailingComments: false +AllowShortBlocksOnASingleLine: Always +AllowShortCaseLabelsOnASingleLine: true +AllowShortEnumsOnASingleLine: true +AllowShortFunctionsOnASingleLine: All +AllowShortIfStatementsOnASingleLine: AllIfsAndElse +AllowShortLambdasOnASingleLine: All +AllowShortLoopsOnASingleLine: true +AlwaysBreakAfterReturnType: None +# AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: MultiLine +AttributeMacros: [] +BinPackArguments: true +BinPackParameters: true +BitFieldColonSpacing: Both +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Attach +BreakBeforeConceptDeclarations: false +BreakBeforeTernaryOperators: true +BreakConstructorInitializers: AfterColon +BreakInheritanceList: AfterColon +BreakStringLiterals: false +CompactNamespaces: true +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 2 +ContinuationIndentWidth: 2 +Cpp11BracedListStyle: true +DerivePointerAlignment: true +EmptyLineAfterAccessModifier: Never +EmptyLineBeforeAccessModifier: Never +FixNamespaceComments: false +ForEachMacros: [] +IncludeBlocks: Preserve +IndentCaseBlocks: false +IndentCaseLabels: false +IndentGotoLabels: false +IndentWidth: 2 +IndentWrappedFunctionNames: false +InsertTrailingCommas: None +# LambdaBodyIndentation: OuterScope +KeepEmptyLinesAtTheStartOfBlocks: false +MaxEmptyLinesToKeep: 0 +NamespaceIndentation: None +PackConstructorInitializers: BinPack +PenaltyBreakAssignment: 1 +PenaltyBreakBeforeFirstCallParameter: 1 +# PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 1 +PenaltyBreakOpenParenthesis: 1 +# PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +# PenaltyIndentedWhitespace: 1000 +PenaltyReturnTypeOnItsOwnLine: 200 +PointerAlignment: Left +# QualifierAlignment: Left +# ReflowComments: false +ReferenceAlignment: Left +RemoveBracesLLVM: true +SeparateDefinitionBlocks: Never +SortIncludes: false +SortUsingDeclarations: false +SpaceAfterCStyleCast: false +SpaceAfterLogicalNot: false +SpaceAfterTemplateKeyword: false +SpaceAroundPointerQualifiers: Default +SpaceBeforeAssignmentOperators: true +SpaceBeforeCaseColon: false +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: false +SpaceBeforeInheritanceColon: false +SpaceBeforeParens: ControlStatementsExceptControlMacros +SpaceBeforeRangeBasedForLoopColon: true +SpaceBeforeSquareBrackets: false +SpaceInEmptyBlock: false +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInCStyleCastParentheses: false +SpacesInContainerLiterals: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: c++20 ... diff --git a/tests/.config/main.clang-format b/tests/.config/main.clang-format new file mode 100644 index 000000000..81302a4fc --- /dev/null +++ b/tests/.config/main.clang-format @@ -0,0 +1,5 @@ +--- +Language: Cpp +BasedOnStyle: file:base.clang-format +ColumnLimit: 0 +... From 292941967891eef56f5ce6417ac772a16f540721 Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Thu, 9 Apr 2026 12:01:51 -0600 Subject: [PATCH 3/7] fixes --- tests/.config/dev.clang-format | 2 +- tests/.config/main.clang-format | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/.config/dev.clang-format b/tests/.config/dev.clang-format index f985f0fa1..29ace3191 100644 --- a/tests/.config/dev.clang-format +++ b/tests/.config/dev.clang-format @@ -1,5 +1,5 @@ --- Language: Cpp -BasedOnStyle: file:base.clang-format +BasedOnStyle: file:./base.clang-format ColumnLimit: 59 ... diff --git a/tests/.config/main.clang-format b/tests/.config/main.clang-format index 81302a4fc..388a2d445 100644 --- a/tests/.config/main.clang-format +++ b/tests/.config/main.clang-format @@ -1,5 +1,5 @@ --- Language: Cpp -BasedOnStyle: file:base.clang-format +BasedOnStyle: file:./base.clang-format ColumnLimit: 0 ... From 5f6bf65a83adcf044c603f3dc883832f62b7ce78 Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Thu, 9 Apr 2026 12:03:53 -0600 Subject: [PATCH 4/7] trying this --- tests/.config/base.clang-format | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/.config/base.clang-format b/tests/.config/base.clang-format index 04d3fe025..7d3712ab9 100644 --- a/tests/.config/base.clang-format +++ b/tests/.config/base.clang-format @@ -1,4 +1,3 @@ ---- Language: Cpp BasedOnStyle: Google AccessModifierOffset: -2 @@ -90,4 +89,3 @@ SpacesInContainerLiterals: false SpacesInParentheses: false SpacesInSquareBrackets: false Standard: c++20 -... From c2b81aec747f873fcfe0764b613370b88f6a51fd Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Thu, 9 Apr 2026 12:06:00 -0600 Subject: [PATCH 5/7] fix --- tests/.config/base.clang-format | 1 - tests/.config/dev.clang-format | 2 +- tests/.config/main.clang-format | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/.config/base.clang-format b/tests/.config/base.clang-format index 7d3712ab9..81fa923de 100644 --- a/tests/.config/base.clang-format +++ b/tests/.config/base.clang-format @@ -1,5 +1,4 @@ Language: Cpp -BasedOnStyle: Google AccessModifierOffset: -2 AlignAfterOpenBracket: DontAlign AlignConsecutiveAssignments: false diff --git a/tests/.config/dev.clang-format b/tests/.config/dev.clang-format index 29ace3191..f985f0fa1 100644 --- a/tests/.config/dev.clang-format +++ b/tests/.config/dev.clang-format @@ -1,5 +1,5 @@ --- Language: Cpp -BasedOnStyle: file:./base.clang-format +BasedOnStyle: file:base.clang-format ColumnLimit: 59 ... diff --git a/tests/.config/main.clang-format b/tests/.config/main.clang-format index 388a2d445..81302a4fc 100644 --- a/tests/.config/main.clang-format +++ b/tests/.config/main.clang-format @@ -1,5 +1,5 @@ --- Language: Cpp -BasedOnStyle: file:./base.clang-format +BasedOnStyle: file:base.clang-format ColumnLimit: 0 ... From a160dbfe133f7915e2a7e3a73b9c92c86625e63c Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Thu, 9 Apr 2026 12:10:28 -0600 Subject: [PATCH 6/7] changes --- tests/{.config/base.clang-format => .clang-format} | 0 tests/.config/dev.clang-format | 2 +- tests/.config/main.clang-format | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename tests/{.config/base.clang-format => .clang-format} (100%) diff --git a/tests/.config/base.clang-format b/tests/.clang-format similarity index 100% rename from tests/.config/base.clang-format rename to tests/.clang-format diff --git a/tests/.config/dev.clang-format b/tests/.config/dev.clang-format index f985f0fa1..eef5326b3 100644 --- a/tests/.config/dev.clang-format +++ b/tests/.config/dev.clang-format @@ -1,5 +1,5 @@ --- Language: Cpp -BasedOnStyle: file:base.clang-format +BasedOnStyle: InheritParentConfig ColumnLimit: 59 ... diff --git a/tests/.config/main.clang-format b/tests/.config/main.clang-format index 81302a4fc..58211c6f7 100644 --- a/tests/.config/main.clang-format +++ b/tests/.config/main.clang-format @@ -1,5 +1,5 @@ --- Language: Cpp -BasedOnStyle: file:base.clang-format +BasedOnStyle: InheritParentConfig ColumnLimit: 0 ... From 53bcfcbab9c1c199e7153a1c238d112abf0d84a6 Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Thu, 9 Apr 2026 12:18:46 -0600 Subject: [PATCH 7/7] fix --- tests/{ => .config}/.clang-format | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{ => .config}/.clang-format (100%) diff --git a/tests/.clang-format b/tests/.config/.clang-format similarity index 100% rename from tests/.clang-format rename to tests/.config/.clang-format