aboutsummaryrefslogtreecommitdiff
path: root/flang/lib/Common
diff options
context:
space:
mode:
authorTim Keith <tkeith@nvidia.com>2020-03-28 21:00:16 -0700
committerTim Keith <tkeith@nvidia.com>2020-03-28 21:00:16 -0700
commit1f8790050b0e99e7b46cc69518aa84f46f50738e (patch)
tree4c635d7122bb81422fdb24f3b21f05b73b298e5f /flang/lib/Common
parent10b1addcefef8193cee86876fdd669ff647c284c (diff)
downloadllvm-1f8790050b0e99e7b46cc69518aa84f46f50738e.zip
llvm-1f8790050b0e99e7b46cc69518aa84f46f50738e.tar.gz
llvm-1f8790050b0e99e7b46cc69518aa84f46f50738e.tar.bz2
[flang] Reformat with latest clang-format and .clang-format
Original-commit: flang-compiler/f18@9fe84f45d7fd685051004678d6b5775dcc4c6f8f Reviewed-on: https://github.com/flang-compiler/f18/pull/1094
Diffstat (limited to 'flang/lib/Common')
-rw-r--r--flang/lib/Common/Fortran-features.cpp32
-rw-r--r--flang/lib/Common/Fortran.cpp50
-rw-r--r--flang/lib/Common/default-kinds.cpp18
-rw-r--r--flang/lib/Common/idioms.cpp2
4 files changed, 68 insertions, 34 deletions
diff --git a/flang/lib/Common/Fortran-features.cpp b/flang/lib/Common/Fortran-features.cpp
index a9e0339..25a9488 100644
--- a/flang/lib/Common/Fortran-features.cpp
+++ b/flang/lib/Common/Fortran-features.cpp
@@ -22,15 +22,22 @@ std::vector<const char *> LanguageFeatureControl::GetNames(
if (IsEnabled(LanguageFeature::LogicalAbbreviations)) {
switch (opr) {
SWITCH_COVERS_ALL_CASES
- case LogicalOperator::And: result.push_back(".a."); break;
- case LogicalOperator::Or: result.push_back(".o."); break;
- case LogicalOperator::Not: result.push_back(".n."); break;
+ case LogicalOperator::And:
+ result.push_back(".a.");
+ break;
+ case LogicalOperator::Or:
+ result.push_back(".o.");
+ break;
+ case LogicalOperator::Not:
+ result.push_back(".n.");
+ break;
case LogicalOperator::Neqv:
if (IsEnabled(LanguageFeature::XOROperator)) {
result.push_back(".x.");
}
break;
- case LogicalOperator::Eqv: break;
+ case LogicalOperator::Eqv:
+ break;
}
}
return result;
@@ -40,11 +47,16 @@ std::vector<const char *> LanguageFeatureControl::GetNames(
RelationalOperator opr) const {
switch (opr) {
SWITCH_COVERS_ALL_CASES
- case RelationalOperator::LT: return {".lt.", "<"};
- case RelationalOperator::LE: return {".le.", "<="};
- case RelationalOperator::EQ: return {".eq.", "=="};
- case RelationalOperator::GE: return {".ge.", ">="};
- case RelationalOperator::GT: return {".gt.", ">"};
+ case RelationalOperator::LT:
+ return {".lt.", "<"};
+ case RelationalOperator::LE:
+ return {".le.", "<="};
+ case RelationalOperator::EQ:
+ return {".eq.", "=="};
+ case RelationalOperator::GE:
+ return {".ge.", ">="};
+ case RelationalOperator::GT:
+ return {".gt.", ">"};
case RelationalOperator::NE:
if (IsEnabled(LanguageFeature::AlternativeNE)) {
return {".ne.", "/=", "<>"};
@@ -54,4 +66,4 @@ std::vector<const char *> LanguageFeatureControl::GetNames(
}
}
-}
+} // namespace Fortran::common
diff --git a/flang/lib/Common/Fortran.cpp b/flang/lib/Common/Fortran.cpp
index d65a17e..45a0614 100644
--- a/flang/lib/Common/Fortran.cpp
+++ b/flang/lib/Common/Fortran.cpp
@@ -13,35 +13,51 @@ namespace Fortran::common {
const char *AsFortran(NumericOperator opr) {
switch (opr) {
SWITCH_COVERS_ALL_CASES
- case NumericOperator::Power: return "**";
- case NumericOperator::Multiply: return "*";
- case NumericOperator::Divide: return "/";
- case NumericOperator::Add: return "+";
- case NumericOperator::Subtract: return "-";
+ case NumericOperator::Power:
+ return "**";
+ case NumericOperator::Multiply:
+ return "*";
+ case NumericOperator::Divide:
+ return "/";
+ case NumericOperator::Add:
+ return "+";
+ case NumericOperator::Subtract:
+ return "-";
}
}
const char *AsFortran(LogicalOperator opr) {
switch (opr) {
SWITCH_COVERS_ALL_CASES
- case LogicalOperator::And: return ".and.";
- case LogicalOperator::Or: return ".or.";
- case LogicalOperator::Eqv: return ".eqv.";
- case LogicalOperator::Neqv: return ".neqv.";
- case LogicalOperator::Not: return ".not.";
+ case LogicalOperator::And:
+ return ".and.";
+ case LogicalOperator::Or:
+ return ".or.";
+ case LogicalOperator::Eqv:
+ return ".eqv.";
+ case LogicalOperator::Neqv:
+ return ".neqv.";
+ case LogicalOperator::Not:
+ return ".not.";
}
}
const char *AsFortran(RelationalOperator opr) {
switch (opr) {
SWITCH_COVERS_ALL_CASES
- case RelationalOperator::LT: return "<";
- case RelationalOperator::LE: return "<=";
- case RelationalOperator::EQ: return "==";
- case RelationalOperator::NE: return "/=";
- case RelationalOperator::GE: return ">=";
- case RelationalOperator::GT: return ">";
+ case RelationalOperator::LT:
+ return "<";
+ case RelationalOperator::LE:
+ return "<=";
+ case RelationalOperator::EQ:
+ return "==";
+ case RelationalOperator::NE:
+ return "/=";
+ case RelationalOperator::GE:
+ return ">=";
+ case RelationalOperator::GT:
+ return ">";
}
}
-}
+} // namespace Fortran::common
diff --git a/flang/lib/Common/default-kinds.cpp b/flang/lib/Common/default-kinds.cpp
index 8470cfc..0c708fc 100644
--- a/flang/lib/Common/default-kinds.cpp
+++ b/flang/lib/Common/default-kinds.cpp
@@ -67,12 +67,18 @@ IntrinsicTypeDefaultKinds &IntrinsicTypeDefaultKinds::set_defaultLogicalKind(
int IntrinsicTypeDefaultKinds::GetDefaultKind(TypeCategory category) const {
switch (category) {
- case TypeCategory::Integer: return defaultIntegerKind_;
+ case TypeCategory::Integer:
+ return defaultIntegerKind_;
case TypeCategory::Real:
- case TypeCategory::Complex: return defaultRealKind_;
- case TypeCategory::Character: return defaultCharacterKind_;
- case TypeCategory::Logical: return defaultLogicalKind_;
- default: CRASH_NO_CASE; return 0;
+ case TypeCategory::Complex:
+ return defaultRealKind_;
+ case TypeCategory::Character:
+ return defaultCharacterKind_;
+ case TypeCategory::Logical:
+ return defaultLogicalKind_;
+ default:
+ CRASH_NO_CASE;
+ return 0;
}
}
-}
+} // namespace Fortran::common
diff --git a/flang/lib/Common/idioms.cpp b/flang/lib/Common/idioms.cpp
index 229e1c0..cf6ff87 100644
--- a/flang/lib/Common/idioms.cpp
+++ b/flang/lib/Common/idioms.cpp
@@ -40,4 +40,4 @@ std::string EnumIndexToString(int index, const char *enumNames) {
}
return std::string(p, q - p);
}
-}
+} // namespace Fortran::common