[PATCH] D65194: [Format] Make getFormattingLangOpts clear LS_Auto uses LS_Cpp11 lexing rule

[Fangrui Song via Phabricator via cfe-commits]

MaskRay created this revision.
MaskRay added reviewers: modocache, sammccall.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Suggested by sammccall in post-commit review of D65183 
<https://reviews.llvm.org/D65183>


Repository:
  rC Clang

https://reviews.llvm.org/D65194

Files:
  lib/Format/Format.cpp


Index: lib/Format/Format.cpp
===================================================================
--- lib/Format/Format.cpp
+++ lib/Format/Format.cpp
@@ -2365,11 +2365,14 @@
 
 LangOptions getFormattingLangOpts(const FormatStyle &Style) {
   LangOptions LangOpts;
+  FormatStyle::LanguageStandard LexingStd =
+      Style.Standard == FormatStyle::LS_Auto ? FormatStyle::LS_Cpp11
+                                             : Style.Standard;
   LangOpts.CPlusPlus = 1;
-  LangOpts.CPlusPlus11 = Style.Standard >= FormatStyle::LS_Cpp11;
-  LangOpts.CPlusPlus14 = Style.Standard >= FormatStyle::LS_Cpp11;
-  LangOpts.CPlusPlus17 = Style.Standard >= FormatStyle::LS_Cpp11;
-  LangOpts.CPlusPlus2a = Style.Standard >= FormatStyle::LS_Cpp11;
+  LangOpts.CPlusPlus11 = LexingStd >= FormatStyle::LS_Cpp11;
+  LangOpts.CPlusPlus14 = LexingStd >= FormatStyle::LS_Cpp11;
+  LangOpts.CPlusPlus17 = LexingStd >= FormatStyle::LS_Cpp11;
+  LangOpts.CPlusPlus2a = LexingStd >= FormatStyle::LS_Cpp11;
   LangOpts.LineComment = 1;
   bool AlternativeOperators = Style.isCpp();
   LangOpts.CXXOperatorNames = AlternativeOperators ? 1 : 0;



Index: lib/Format/Format.cpp
===================================================================
--- lib/Format/Format.cpp
+++ lib/Format/Format.cpp
@@ -2365,11 +2365,14 @@
 
 LangOptions getFormattingLangOpts(const FormatStyle &Style) {
   LangOptions LangOpts;
+  FormatStyle::LanguageStandard LexingStd =
+      Style.Standard == FormatStyle::LS_Auto ? FormatStyle::LS_Cpp11
+                                             : Style.Standard;
   LangOpts.CPlusPlus = 1;
-  LangOpts.CPlusPlus11 = Style.Standard >= FormatStyle::LS_Cpp11;
-  LangOpts.CPlusPlus14 = Style.Standard >= FormatStyle::LS_Cpp11;
-  LangOpts.CPlusPlus17 = Style.Standard >= FormatStyle::LS_Cpp11;
-  LangOpts.CPlusPlus2a = Style.Standard >= FormatStyle::LS_Cpp11;
+  LangOpts.CPlusPlus11 = LexingStd >= FormatStyle::LS_Cpp11;
+  LangOpts.CPlusPlus14 = LexingStd >= FormatStyle::LS_Cpp11;
+  LangOpts.CPlusPlus17 = LexingStd >= FormatStyle::LS_Cpp11;
+  LangOpts.CPlusPlus2a = LexingStd >= FormatStyle::LS_Cpp11;
   LangOpts.LineComment = 1;
   bool AlternativeOperators = Style.isCpp();
   LangOpts.CXXOperatorNames = AlternativeOperators ? 1 : 0;

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits