From da846e6bd9e75c0728c1aa5191ce7139fad6fbc6 Mon Sep 17 00:00:00 2001 From: peter klausler Date: Thu, 3 May 2018 16:47:00 -0700 Subject: [PATCH] [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 --- flang/lib/parser/prescan.cc | 3 +-- flang/tools/f18/f18.cc | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/flang/lib/parser/prescan.cc b/flang/lib/parser/prescan.cc index e34a080..0b50999 100644 --- 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 29bb8f8..7478cd1 100644 --- 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); -- 2.7.4