diff --git a/.clang-format b/.clang-format deleted file mode 100644 index b20f8731..00000000 --- a/.clang-format +++ /dev/null @@ -1,203 +0,0 @@ ---- -Language: Cpp -# BasedOnStyle: Google -AccessModifierOffset: -1 -AlignAfterOpenBracket: Align -AlignConsecutiveMacros: None -AlignConsecutiveAssignments: None -AlignConsecutiveBitFields: None -AlignConsecutiveDeclarations: None -AlignEscapedNewlines: Left -AlignOperands: Align -AlignTrailingComments: true -AllowAllArgumentsOnNextLine: true -AllowAllConstructorInitializersOnNextLine: true -AllowAllParametersOfDeclarationOnNextLine: true -AllowShortEnumsOnASingleLine: true -AllowShortBlocksOnASingleLine: Never -AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: All -AllowShortLambdasOnASingleLine: All -AllowShortIfStatementsOnASingleLine: WithoutElse -AllowShortLoopsOnASingleLine: true -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: true -AlwaysBreakTemplateDeclarations: Yes -AttributeMacros: - - __capability -BinPackArguments: true -BinPackParameters: true -BraceWrapping: - AfterCaseLabel: false - AfterClass: false - AfterControlStatement: Never - AfterEnum: false - AfterFunction: false - AfterNamespace: false - AfterObjCDeclaration: false - AfterStruct: false - AfterUnion: false - AfterExternBlock: false - BeforeCatch: false - BeforeElse: false - BeforeLambdaBody: false - BeforeWhile: false - IndentBraces: false - SplitEmptyFunction: true - SplitEmptyRecord: true - SplitEmptyNamespace: true -BreakBeforeBinaryOperators: None -BreakBeforeConceptDeclarations: true -BreakBeforeBraces: Attach -BreakBeforeInheritanceComma: false -BreakInheritanceList: BeforeColon -BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: false -BreakConstructorInitializers: BeforeColon -BreakAfterJavaFieldAnnotations: false -BreakStringLiterals: true -ColumnLimit: 80 -CommentPragmas: '^ IWYU pragma:' -CompactNamespaces: false -ConstructorInitializerAllOnOneLineOrOnePerLine: true -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 4 -Cpp11BracedListStyle: true -DeriveLineEnding: true -DerivePointerAlignment: true -DisableFormat: false -EmptyLineBeforeAccessModifier: LogicalBlock -ExperimentalAutoDetectBinPacking: false -FixNamespaceComments: true -ForEachMacros: - - foreach - - Q_FOREACH - - BOOST_FOREACH -StatementAttributeLikeMacros: - - Q_EMIT -IncludeBlocks: Regroup -IncludeCategories: - - Regex: '^' - Priority: 1 - SortPriority: 0 - CaseSensitive: false - - Regex: '^' - Priority: 3 - SortPriority: 0 - CaseSensitive: false - - Regex: '^<.*\.h>' - Priority: 2 - SortPriority: 0 - CaseSensitive: false - - Regex: '^<.*' - Priority: 3 - SortPriority: 0 - CaseSensitive: false - - Regex: '.*' - Priority: 4 - SortPriority: 0 - CaseSensitive: false -IncludeIsMainRegex: '([-_](test|unittest))?$' -IncludeIsMainSourceRegex: '' -IndentCaseLabels: true -IndentCaseBlocks: false -IndentGotoLabels: true -IndentPPDirectives: None -IndentExternBlock: AfterExternBlock -IndentRequires: false -IndentWidth: 2 -IndentWrappedFunctionNames: false -InsertTrailingCommas: None -JavaScriptQuotes: Leave -JavaScriptWrapImports: true -KeepEmptyLinesAtTheStartOfBlocks: false -MacroBlockBegin: '' -MacroBlockEnd: '' -MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -ObjCBinPackProtocolList: Never -ObjCBlockIndentWidth: 2 -ObjCBreakBeforeNestedBlockParam: true -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: true -PenaltyBreakAssignment: 2 -PenaltyBreakBeforeFirstCallParameter: 1 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakString: 1000 -PenaltyBreakTemplateDeclaration: 10 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 200 -PenaltyIndentedWhitespace: 0 -PointerAlignment: Left -RawStringFormats: - - Language: Cpp - Delimiters: - - cc - - CC - - cpp - - Cpp - - CPP - - 'c++' - - 'C++' - CanonicalDelimiter: '' - BasedOnStyle: google - - Language: TextProto - Delimiters: - - pb - - PB - - proto - - PROTO - EnclosingFunctions: - - EqualsProto - - EquivToProto - - PARSE_PARTIAL_TEXT_PROTO - - PARSE_TEST_PROTO - - PARSE_TEXT_PROTO - - ParseTextOrDie - - ParseTextProtoOrDie - - ParseTestProto - - ParsePartialTestProto - CanonicalDelimiter: '' - BasedOnStyle: google -ReflowComments: true -SortIncludes: true -SortJavaStaticImport: Before -SortUsingDeclarations: true -SpaceAfterCStyleCast: false -SpaceAfterLogicalNot: false -SpaceAfterTemplateKeyword: true -SpaceBeforeAssignmentOperators: true -SpaceBeforeCaseColon: false -SpaceBeforeCpp11BracedList: false -SpaceBeforeCtorInitializerColon: true -SpaceBeforeInheritanceColon: true -SpaceBeforeParens: ControlStatements -SpaceAroundPointerQualifiers: Default -SpaceBeforeRangeBasedForLoopColon: true -SpaceInEmptyBlock: false -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 2 -SpacesInAngles: false -SpacesInConditionalStatement: false -SpacesInContainerLiterals: true -SpacesInCStyleCastParentheses: false -SpacesInParentheses: false -SpacesInSquareBrackets: false -SpaceBeforeSquareBrackets: false -BitFieldColonSpacing: Both -Standard: Auto -StatementMacros: - - Q_UNUSED - - QT_REQUIRE_VERSION -TabWidth: 8 -UseCRLF: false -UseTab: Never -WhitespaceSensitiveMacros: - - STRINGIZE - - PP_STRINGIZE - - BOOST_PP_STRINGIZE - - NS_SWIFT_NAME - - CF_SWIFT_NAME -... diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 00000000..047193ec --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,21 @@ +repos: +- repo: https://github.com/pre-commit/mirrors-clang-format + rev: v13.0.1 + hooks: + - id: clang-format + args: [-i, --style=Google] +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.1.0 + hooks: + - id: trailing-whitespace + - id: check-added-large-files + - id: check-ast + - id: check-merge-conflict + - id: check-symlinks + - id: check-toml + - id: check-yaml + - id: debug-statements + - id: detect-private-key + - id: end-of-file-fixer + - id: mixed-line-ending + - id: trailing-whitespace diff --git a/NEWS b/NEWS index 45e6f135..dcc42e1f 100644 --- a/NEWS +++ b/NEWS @@ -129,4 +129,3 @@ stasse (3): Reinforce the dependant->dependent policy. Merge the florent branch. Makes the test_depend.cpp test works. Reinforce the dependant->dependent policy. Adding documentation to cmdPlug. - diff --git a/cmake b/cmake index 9078d521..332976cc 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9078d521dc23fabae72e3fe8d7c0068c68364eef +Subproject commit 332976cc4d5305256c79a479e55ad7ab2ecc42f1 diff --git a/doc/Doxyfile.extra.in b/doc/Doxyfile.extra.in index bd125c64..f082906a 100644 --- a/doc/Doxyfile.extra.in +++ b/doc/Doxyfile.extra.in @@ -293,7 +293,7 @@ WARN_LOGFILE = @CMAKE_BINARY_DIR@/doc/doxygen.log INPUT = @CMAKE_SOURCE_DIR@/include \ @CMAKE_SOURCE_DIR@/doc/additionalDoc - + # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. @@ -672,4 +672,4 @@ MATHJAX_FORMAT = SVG ALIASES += "cheatsheet=\xrefitem cheatsheet \"Remarkable identity\" \"Cheat sheet\"" -CITE_BIB_FILES += @CMAKE_SOURCE_DIR@/doc/sot.bib \ No newline at end of file +CITE_BIB_FILES += @CMAKE_SOURCE_DIR@/doc/sot.bib diff --git a/doc/pictures/entity.svg b/doc/pictures/entity.svg index 7840311a..5fc8995f 100644 --- a/doc/pictures/entity.svg +++ b/doc/pictures/entity.svg @@ -9,7 +9,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - + id="svg2" version="1.1" inkscape:version="0.47 r22583" diff --git a/include/dynamic-graph/command-bind.h b/include/dynamic-graph/command-bind.h index 629445c7..351dc1cb 100644 --- a/include/dynamic-graph/command-bind.h +++ b/include/dynamic-graph/command-bind.h @@ -283,8 +283,8 @@ struct CommandVoid4 : public Command { CommandVoid4(E &entity, function_t function, const std::string &docString) : Command(entity, boost::assign::list_of(ValueHelper::TypeID)( - ValueHelper::TypeID)( - ValueHelper::TypeID)(ValueHelper::TypeID), + ValueHelper::TypeID)(ValueHelper::TypeID)( + ValueHelper::TypeID), docString), fptr(function) {} @@ -357,13 +357,11 @@ struct CommandVoid5 : public Command { const T4 &, const T5 &); CommandVoid5(E &entity, function_t function, const std::string &docString) - : Command( - entity, - boost::assign::list_of(ValueHelper::TypeID)( - ValueHelper::TypeID)( - ValueHelper::TypeID)(ValueHelper::TypeID)(ValueHelper< - T5>::TypeID), - docString), + : Command(entity, + boost::assign::list_of(ValueHelper::TypeID)( + ValueHelper::TypeID)(ValueHelper::TypeID)( + ValueHelper::TypeID)(ValueHelper::TypeID), + docString), fptr(function) {} protected: @@ -444,15 +442,12 @@ struct CommandVoid6 : public Command { const T4 &, const T5 &, const T6 &); CommandVoid6(E &entity, function_t function, const std::string &docString) - : Command( - entity, - boost::assign::list_of(ValueHelper::TypeID)( - ValueHelper::TypeID)( - ValueHelper::TypeID)(ValueHelper< - T4>::TypeID)(ValueHelper:: - TypeID)(ValueHelper< - T6>::TypeID), - docString), + : Command(entity, + boost::assign::list_of(ValueHelper::TypeID)( + ValueHelper::TypeID)(ValueHelper::TypeID)( + ValueHelper::TypeID)(ValueHelper::TypeID)( + ValueHelper::TypeID), + docString), fptr(function) {} protected: @@ -536,17 +531,12 @@ struct CommandVoid7 : public Command { const T7 &); CommandVoid7(E &entity, function_t function, const std::string &docString) - : Command( - entity, - boost::assign::list_of(ValueHelper::TypeID)( - ValueHelper::TypeID)( - ValueHelper:: - TypeID)(ValueHelper< - T4>::TypeID)(ValueHelper:: - TypeID)(ValueHelper:: - TypeID)(ValueHelper< - T7>::TypeID), - docString), + : Command(entity, + boost::assign::list_of(ValueHelper::TypeID)( + ValueHelper::TypeID)(ValueHelper::TypeID)( + ValueHelper::TypeID)(ValueHelper::TypeID)( + ValueHelper::TypeID)(ValueHelper::TypeID), + docString), fptr(function) {} protected: @@ -633,20 +623,13 @@ struct CommandVoid8 : public Command { const T7 &, const T8 &); CommandVoid8(E &entity, function_t function, const std::string &docString) - : Command( - entity, - boost::assign::list_of(ValueHelper::TypeID)( - ValueHelper::TypeID)( - ValueHelper:: - TypeID)(ValueHelper:: - TypeID)(ValueHelper:: - TypeID)(ValueHelper:: - TypeID)(ValueHelper< - T7>:: - TypeID)(ValueHelper< - T8>:: - TypeID), - docString), + : Command(entity, + boost::assign::list_of(ValueHelper::TypeID)( + ValueHelper::TypeID)(ValueHelper::TypeID)( + ValueHelper::TypeID)(ValueHelper::TypeID)( + ValueHelper::TypeID)(ValueHelper::TypeID)( + ValueHelper::TypeID), + docString), fptr(function) {} protected: diff --git a/js/view_sot_dg.html b/js/view_sot_dg.html index 231fcae4..d153e95e 100644 --- a/js/view_sot_dg.html +++ b/js/view_sot_dg.html @@ -6,7 +6,7 @@ - +