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

[flang] Rename two member functions 

Original-commit: flang-compiler/f18@c953185c9f
Reviewed-on: https://github.com/flang-compiler/f18/pull/193
Tree-same-pre-rewrite: false
This commit is contained in:
Eric Schweitz 2018-09-21 10:51:06 -07:00
parent 8b45686de6
commit d14c38fbe7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flang/lib/semantics/canonicalize-do.cc
View File

@ -27,7 +27,7 @@ public:
const auto &endIter{executionPart.v.end()}; const auto &endIter{executionPart.v.end()};
currentList_ = &executionPart.v; currentList_ = &executionPart.v;
for (auto iter{executionPart.v.begin()}; iter != endIter; ++iter) { for (auto iter{executionPart.v.begin()}; iter != endIter; ++iter) {
iter = CheckStatement(iter); iter = ConvertLabelDoToStructuredDo(iter);
} }
return false; return false;
} }
@ -51,7 +51,7 @@ public:
} }
private: private:
parser::Block SpliceBlock( parser::Block ExtractBlock(
parser::Block::iterator beginLoop, parser::Block::iterator endLoop) { parser::Block::iterator beginLoop, parser::Block::iterator endLoop) {
parser::Block block; parser::Block block;
block.splice(block.begin(), *currentList_, ++beginLoop, ++endLoop); block.splice(block.begin(), *currentList_, ++beginLoop, ++endLoop);
@ -82,12 +82,13 @@ private:
parser::NonLabelDoStmt{ parser::NonLabelDoStmt{
std::make_tuple(std::optional<parser::Name>{}, std::make_tuple(std::optional<parser::Name>{},
ExtractLoopControl(startLoop))}}, ExtractLoopControl(startLoop))}},
SpliceBlock(startLoop, endLoop), ExtractBlock(startLoop, endLoop),
parser::Statement<parser::EndDoStmt>{std::optional<parser::Label>{}, parser::Statement<parser::EndDoStmt>{std::optional<parser::Label>{},
parser::EndDoStmt{std::optional<parser::Name>{}}})}; parser::EndDoStmt{std::optional<parser::Name>{}}})};
return startLoop; return startLoop;
} }
parser::Block::iterator CheckStatement(const parser::Block::iterator &iter) { parser::Block::iterator ConvertLabelDoToStructuredDo(
const parser::Block::iterator &iter) {
currentIter_ = iter; currentIter_ = iter;
parser::ExecutionPartConstruct &executionPartConstruct{*iter}; parser::ExecutionPartConstruct &executionPartConstruct{*iter};
if (auto *executableConstruct = std::get_if<parser::ExecutableConstruct>( if (auto *executableConstruct = std::get_if<parser::ExecutableConstruct>(