[flang] reformat for merge

Original-commit: flang-compiler/f18@ccf265dad58fd4f69f555cdd12f562dc2d085fd5
Reviewed-on: https://github.com/flang-compiler/f18/pull/81
Tree-same-pre-rewrite: false

diff --git a/flang/lib/parser/prescan.cc b/flang/lib/parser/prescan.cc
index e34a080ba8a10da208518c6b809724acc7c8a7b7..0b509992c1024c952964ca658fc7af8dc4728ab0 100644 (file)
--- a/flang/lib/parser/prescan.cc
+++ b/flang/lib/parser/prescan.cc
@@ -268,8 +268,7 @@ void Prescanner::NextChar() {
       BeginSourceLineAndAdvance();
     }
   } else {
-    if (inFixedForm_ && column_ > fixedFormColumnLimit_ &&
-        !tabInCurrentLine_) {
+    if (inFixedForm_ && column_ > fixedFormColumnLimit_ && !tabInCurrentLine_) {
       SkipToEndOfLine();
     } else if (*at_ == '!' && !inCharLiteral_) {
       SkipToEndOfLine();

diff --git a/flang/tools/f18/f18.cc b/flang/tools/f18/f18.cc
index 29bb8f8ae4cab1ddd53eb4de965b95f48c321bd1..7478cd183b5e7fea158a6c434ffa217c90d322a0 100644 (file)
--- a/flang/tools/f18/f18.cc
+++ b/flang/tools/f18/f18.cc
@@ -184,8 +184,8 @@ std::string CompileFortran(
   parsing.ClearLog();
   parsing.messages().Emit(std::cerr, parsing.cooked());
   if (!parsing.consumedWholeFile()) {
-    parsing.EmitMessage(std::cerr, parsing.finalRestingPlace(),
-                        "parser FAIL (final position)");
+    parsing.EmitMessage(
+        std::cerr, parsing.finalRestingPlace(), "parser FAIL (final position)");
     exitStatus = EXIT_FAILURE;
     return {};
   }
@@ -305,8 +305,8 @@ int main(int argc, char *const argv[]) {
         if (suffix == "f" || suffix == "F" || suffix == "ff" ||
             suffix == "f90" || suffix == "F90" || suffix == "ff90" ||
             suffix == "f95" || suffix == "F95" || suffix == "ff95" ||
-            suffix == "cuf" || suffix == "CUF" ||
-            suffix == "f18" || suffix == "F18" || suffix == "ff18") {
+            suffix == "cuf" || suffix == "CUF" || suffix == "f18" ||
+            suffix == "F18" || suffix == "ff18") {
           fortranSources.push_back(arg);
         } else if (suffix == "o" || suffix == "a") {
           relocatables.push_back(arg);