[flang] Tweaked .clang-format, then ran it.

Original-commit: flang-compiler/f18@e10e43b6914e91414e4f8253c249c61df4a5ac32
Reviewed-on: https://github.com/flang-compiler/f18/pull/4

diff --git a/flang/.clang-format b/flang/.clang-format
index 6304c64..1a7f13d 100644 (file)
--- a/flang/.clang-format
+++ b/flang/.clang-format
@@ -12,7 +12,6 @@ AlignTrailingComments: false
 ConstructorInitializerIndentWidth: 2
 SpaceAfterTemplateKeyword: false
 SpacesBeforeTrailingComments: 2
-Standard: Cpp17
 ...
 
 # vim:set filetype=yaml:

diff --git a/flang/lib/parser/preprocessor.cc b/flang/lib/parser/preprocessor.cc
index 3481a3f..ebf5f65 100644 (file)
--- a/flang/lib/parser/preprocessor.cc
+++ b/flang/lib/parser/preprocessor.cc
@@ -617,8 +617,7 @@ bool Preprocessor::SkipDisabledConditionalCode(
         ifStack_.push(CanDeadElseAppear::No);
         return true;
       }
-      if (dn == "elif" &&
-          IsIfPredicateTrue(*line, rest, line->size() - rest)) {
+      if (dn == "elif" && IsIfPredicateTrue(*line, rest, line->size() - rest)) {
         ifStack_.push(CanDeadElseAppear::Yes);
         return true;
       }

diff --git a/flang/tools/f18/f18.cc b/flang/tools/f18/f18.cc
index 82aea20..b9dfdef 100644 (file)
--- a/flang/tools/f18/f18.cc
+++ b/flang/tools/f18/f18.cc
@@ -142,8 +142,8 @@ int main(int argc, char *const argv[]) {
   state.set_userState(&ustate);
 
   if (dumpCookedChars) {
-    while (std::optional<char>
-        och{Fortran::parser::cookedNextChar.Parse(&state)}) {
+    while (std::optional<char> och{
+        Fortran::parser::cookedNextChar.Parse(&state)}) {
       std::cout << *och;
     }
     return 0;