diff options
3 files changed, 25 insertions, 15 deletions
diff --git a/clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp index 9849b65c673..c690e797e0e 100644 --- a/clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp +++ b/clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp @@ -25,19 +25,14 @@ ArgumentCommentCheck::ArgumentCommentCheck(StringRef Name, : ClangTidyCheck(Name, Context), StrictMode(Options.getLocalOrGlobal("StrictMode", 0) != 0), IgnoreSingleArgument(Options.get("IgnoreSingleArgument", 0) != 0), - CommentBoolLiterals(Options.getLocalOrGlobal("CommentBoolLiterals", 0) != - 0), - CommentIntegerLiterals( - Options.getLocalOrGlobal("CommentIntegerLiterals", 0) != 0), - CommentFloatLiterals( - Options.getLocalOrGlobal("CommentFloatLiterals", 0) != 0), - CommentStringLiterals( - Options.getLocalOrGlobal("CommentStringLiterals", 0) != 0), - CommentUserDefinedLiterals( - Options.getLocalOrGlobal("CommentUserDefinedLiterals", 0) != 0), - CommentCharacterLiterals( - Options.getLocalOrGlobal("CommentCharacterLiterals", 0) != 0), - CommentNullPtrs(Options.getLocalOrGlobal("CommentNullPtrs", 0) != 0), + CommentBoolLiterals(Options.get("CommentBoolLiterals", 0) != 0), + CommentIntegerLiterals(Options.get("CommentIntegerLiterals", 0) != 0), + CommentFloatLiterals(Options.get("CommentFloatLiterals", 0) != 0), + CommentStringLiterals(Options.get("CommentStringLiterals", 0) != 0), + CommentUserDefinedLiterals(Options.get("CommentUserDefinedLiterals", 0) != + 0), + CommentCharacterLiterals(Options.get("CommentCharacterLiterals", 0) != 0), + CommentNullPtrs(Options.get("CommentNullPtrs", 0) != 0), IdentRE("^(/\\* *)([_A-Za-z][_A-Za-z0-9]*)( *= *\\*/)$") {} void ArgumentCommentCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) { diff --git a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp b/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp index 077723e882e..ea726563596 100644 --- a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp +++ b/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp @@ -1,5 +1,13 @@ // RUN: %check_clang_tidy %s bugprone-argument-comment %t -- \ -// RUN: -config="{CheckOptions: [{key: bugprone-argument-comment.IgnoreSingleArgument, value: 1}, {key: CommentBoolLiterals, value: 1},{key: CommentIntegerLiterals, value: 1}, {key: CommentFloatLiterals, value: 1}, {key: CommentUserDefinedLiterals, value: 1}, {key: CommentStringLiterals, value: 1}, {key: CommentNullPtrs, value: 1}, {key: CommentCharacterLiterals, value: 1}]}" -- +// RUN: -config="{CheckOptions: [ \ +// RUN: {key: bugprone-argument-comment.IgnoreSingleArgument, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentBoolLiterals, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentIntegerLiterals, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentFloatLiterals, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentUserDefinedLiterals, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentStringLiterals, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentNullPtrs, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentCharacterLiterals, value: 1}]}" -- struct A { void foo(bool abc); diff --git a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-literals.cpp b/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-literals.cpp index ac2cdc8f563..5642960ee9b 100644 --- a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-literals.cpp +++ b/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-literals.cpp @@ -1,5 +1,12 @@ // RUN: %check_clang_tidy %s bugprone-argument-comment %t -- \ -// RUN: -config="{CheckOptions: [{key: CommentBoolLiterals, value: 1},{key: CommentIntegerLiterals, value: 1}, {key: CommentFloatLiterals, value: 1}, {key: CommentUserDefinedLiterals, value: 1}, {key: CommentStringLiterals, value: 1}, {key: CommentNullPtrs, value: 1}, {key: CommentCharacterLiterals, value: 1}]}" -- +// RUN: -config="{CheckOptions: [ \ +// RUN: {key: bugprone-argument-comment.CommentBoolLiterals, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentIntegerLiterals, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentFloatLiterals, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentUserDefinedLiterals, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentStringLiterals, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentNullPtrs, value: 1}, \ +// RUN: {key: bugprone-argument-comment.CommentCharacterLiterals, value: 1}]}" -- struct A { void foo(bool abc); |
