From a828fb463ed9f6085849bb3a4f225b3c84e7cf29 Mon Sep 17 00:00:00 2001 From: Jan Svoboda Date: Mon, 21 Dec 2020 16:35:32 +0100 Subject: [clang][cli] Port a CommaJoined option to the marshalling infrastructure Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D93698 --- clang/lib/Frontend/CompilerInvocation.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'clang/lib/Frontend/CompilerInvocation.cpp') diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 962f729..da4213e 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -328,8 +328,20 @@ static void denormalizeStringVector(SmallVectorImpl &Args, Option::OptionClass OptClass, unsigned TableIndex, const std::vector &Values) { - for (const std::string &Value : Values) { - denormalizeString(Args, Spelling, SA, OptClass, TableIndex, Value); + if (OptClass == Option::OptionClass::CommaJoinedClass) { + std::string CommaJoinedValue; + if (!Values.empty()) { + CommaJoinedValue.append(Values.front()); + for (const std::string &Value : llvm::drop_begin(Values, 1)) { + CommaJoinedValue.append(","); + CommaJoinedValue.append(Value); + } + } + denormalizeString(Args, Spelling, SA, Option::OptionClass::JoinedClass, + TableIndex, CommaJoinedValue); + } else if (OptClass == Option::OptionClass::JoinedClass) { + for (const std::string &Value : Values) + denormalizeString(Args, Spelling, SA, OptClass, TableIndex, Value); } } @@ -785,7 +797,6 @@ static void parseAnalyzerConfigs(AnalyzerOptions &AnOpts, } static void ParseCommentArgs(CommentOptions &Opts, ArgList &Args) { - Opts.BlockCommandNames = Args.getAllArgValues(OPT_fcomment_block_commands); Opts.ParseAllComments = Args.hasArg(OPT_fparse_all_comments); } -- cgit v1.1