Repository: trafficserver Updated Branches: refs/heads/master 4d8e09ec4 -> 97035208b
Update clang-format config with laste llvm trunk, this still does not fully comply with our style though Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/97035208 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/97035208 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/97035208 Branch: refs/heads/master Commit: 97035208b3e78327ee01ef6f8ee3f30be5b96905 Parents: 4d8e09e Author: Leif Hedstrom <[email protected]> Authored: Tue Oct 7 08:44:11 2014 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Tue Oct 7 08:44:13 2014 -0600 ---------------------------------------------------------------------- .clang-format | 56 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/97035208/.clang-format ---------------------------------------------------------------------- diff --git a/.clang-format b/.clang-format index df89c8d..15eec01 100644 --- a/.clang-format +++ b/.clang-format @@ -1,25 +1,61 @@ +--- +Language: Cpp # BasedOnStyle: LLVM AccessModifierOffset: -2 -AlignEscapedNewlinesLeft: true +ConstructorInitializerIndentWidth: 4 +AlignEscapedNewlinesLeft: false +AlignTrailingComments: true AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false AllowShortIfStatementsOnASingleLine: false AllowShortLoopsOnASingleLine: false +AllowShortFunctionsOnASingleLine: All +AlwaysBreakAfterDefinitionReturnType: false AlwaysBreakTemplateDeclarations: false +AlwaysBreakBeforeMultilineStrings: false +BreakBeforeBinaryOperators: None +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false BinPackParameters: true ColumnLimit: 120 -ConstructorInitializerAllOnOneLineOrOnePerLine: true -DerivePointerBinding: false +ConstructorInitializerAllOnOneLineOrOnePerLine: false +DerivePointerAlignment: false +ExperimentalAutoDetectBinPacking: false IndentCaseLabels: false +IndentWrappedFunctionNames: false +IndentFunctionDeclarationAfterType: false MaxEmptyLinesToKeep: 2 +KeepEmptyLinesAtTheStartOfBlocks: false +NamespaceIndentation: None +ObjCSpaceAfterProperty: false ObjCSpaceBeforeProtocolList: true -PenaltyBreakComment: 45 +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 PenaltyBreakString: 1000 +PenaltyBreakFirstLessLess: 120 PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 0 -PointerBindsToType: true -SpacesBeforeTrailingComments: 4 -SpacesInBracedLists: true -Standard: C++03 +PenaltyReturnTypeOnItsOwnLine: 60 +PointerAlignment: Left +SpacesBeforeTrailingComments: 1 +Cpp11BracedListStyle: false +Standard: Cpp11 IndentWidth: 2 -UseTab: false +TabWidth: 8 +UseTab: Never BreakBeforeBraces: Linux +SpacesInParentheses: false +SpacesInSquareBrackets: false +SpacesInAngles: false +SpaceInEmptyParentheses: false +SpacesInCStyleCastParentheses: false +SpaceAfterCStyleCast: false +SpacesInContainerLiterals: true +SpaceBeforeAssignmentOperators: true +ContinuationIndentWidth: 2 +CommentPragmas: '^ IWYU pragma:' +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] +SpaceBeforeParens: ControlStatements +DisableFormat: false +... +
