maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang] clang-format 

Original-commit: flang-compiler/f18@faa7ccf905
This commit is contained in:
Eric Schweitz 2019-04-09 09:35:52 -07:00
parent 0b7fa133ae
commit ff9123927c
2 changed files with 62 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
flang/lib/FIR/afforestation.cc
View File

@ -137,18 +137,19 @@ static std::vector<SwitchRankStmt::ValueType> populateSwitchValues(
auto &rank{std::get<parser::SelectRankCaseStmt::Rank>(
std::get<parser::Statement<parser::SelectRankCaseStmt>>(v.t)
.statement.t)};
std::visit(common::visitors{
[&](const parser::ScalarIntConstantExpr &exp) {
const auto &e{exp.thing.thing.thing.value()};
result.emplace_back(SwitchRankStmt::Exactly{ExprRef(e)});
},
[&](const parser::Star &) {
result.emplace_back(SwitchRankStmt::AssumedSize{});
},
[&](const parser::Default &) {
result.emplace_back(SwitchRankStmt::Default{});
},
},
std::visit(
common::visitors{
[&](const parser::ScalarIntConstantExpr &exp) {
const auto &e{exp.thing.thing.thing.value()};
result.emplace_back(SwitchRankStmt::Exactly{ExprRef(e)});
},
[&](const parser::Star &) {
result.emplace_back(SwitchRankStmt::AssumedSize{});
},
[&](const parser::Default &) {
result.emplace_back(SwitchRankStmt::Default{});
},
},
rank.u);
}
return result;
@ -160,19 +161,19 @@ static std::vector<SwitchTypeStmt::ValueType> populateSwitchValues(
for (auto &v : list) {
auto &guard{std::get<parser::TypeGuardStmt::Guard>(
std::get<parser::Statement<parser::TypeGuardStmt>>(v.t).statement.t)};
std::visit(common::visitors{
[&](const parser::TypeSpec &spec) {
result.emplace_back(
SwitchTypeStmt::TypeSpec{spec.declTypeSpec});
},
[&](const parser::DerivedTypeSpec &spec) {
result.emplace_back(
SwitchTypeStmt::DerivedTypeSpec{nullptr /* FIXME */});
},
[&](const parser::Default &) {
result.emplace_back(SwitchTypeStmt::Default{});
},
},
std::visit(
common::visitors{
[&](const parser::TypeSpec &spec) {
result.emplace_back(SwitchTypeStmt::TypeSpec{spec.declTypeSpec});
},
[&](const parser::DerivedTypeSpec &spec) {
result.emplace_back(
SwitchTypeStmt::DerivedTypeSpec{nullptr /* FIXME */});
},
[&](const parser::Default &) {
result.emplace_back(SwitchTypeStmt::Default{});
},
},
guard.u);
}
return result;
@ -469,14 +470,15 @@ public:
template<typename STMTTYPE, typename CT>
Statement *GetSwitchSelector(const CT *selectConstruct) {
return std::visit(common::visitors{
[&](const parser::Expr &e) {
return builder_->CreateExpr(ExprRef(e));
},
[&](const parser::Variable &v) {
return builder_->CreateExpr(ToExpression(v));
},
},
return std::visit(
common::visitors{
[&](const parser::Expr &e) {
return builder_->CreateExpr(ExprRef(e));
},
[&](const parser::Variable &v) {
return builder_->CreateExpr(ToExpression(v));
},
},
std::get<parser::Selector>(
std::get<parser::Statement<STMTTYPE>>(selectConstruct->t)
.statement.t)
@ -594,26 +596,27 @@ public:
// extract options from list -> opts
AllocOpts opts;
for (auto &allocOpt : std::get<std::list<parser::AllocOpt>>(stmt.t)) {
std::visit(common::visitors{
[&](const parser::AllocOpt::Mold &m) {
opts.mold = *ExprRef(m.v);
},
[&](const parser::AllocOpt::Source &s) {
opts.source = *ExprRef(s.v);
},
[&](const parser::StatOrErrmsg &var) {
std::visit(
common::visitors{
[&](const parser::StatVariable &sv) {
opts.stat = ToExpression(sv.v.thing.thing);
},
[&](const parser::MsgVariable &mv) {
opts.errmsg = ToExpression(mv.v.thing.thing);
},
},
var.u);
},
},
std::visit(
common::visitors{
[&](const parser::AllocOpt::Mold &m) {
opts.mold = *ExprRef(m.v);
},
[&](const parser::AllocOpt::Source &s) {
opts.source = *ExprRef(s.v);
},
[&](const parser::StatOrErrmsg &var) {
std::visit(
common::visitors{
[&](const parser::StatVariable &sv) {
opts.stat = ToExpression(sv.v.thing.thing);
},
[&](const parser::MsgVariable &mv) {
opts.errmsg = ToExpression(mv.v.thing.thing);
},
},
var.u);
},
},
allocOpt.u);
}
// process the list of allocations

11
flang/lib/FIR/statements.cc
View File

@ -107,11 +107,12 @@ BasicBlock *SwitchRankStmt::defaultSucc() const {
// check LoadInsn constraints
static void CheckLoadInsn(const Value &v) {
std::visit(common::visitors{
[](DataObject *) { /* ok */ },
[](Statement *s) { CHECK(GetAddressable(s)); },
[](auto) { CHECK(!"invalid load input"); },
},
std::visit(
common::visitors{
[](DataObject *) { /* ok */ },
[](Statement *s) { CHECK(GetAddressable(s)); },
[](auto) { CHECK(!"invalid load input"); },
},
v.u);
}
LoadInsn::LoadInsn(const Value &addr) : address_{addr} {