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

[flang] Address review comments 

Original-commit: flang-compiler/f18@c3597a1984
Reviewed-on: https://github.com/flang-compiler/f18/pull/218
This commit is contained in:
Tim Keith 2018-10-26 11:57:08 -07:00
parent 507121f63f
commit b78109e22e
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flang/lib/semantics/resolve-names.cc
View File

@ -263,7 +263,7 @@ public:
protected:
void PushScope();
void PopScope();
void ClearScopes() { implicitRules_.reset(nullptr); }
void ClearScopes() { implicitRules_.reset(); }
private:
// implicit rules in effect for current scope
@ -1636,7 +1636,7 @@ bool InterfaceVisitor::Pre(const parser::GenericSpec &x) {
EraseSymbol(*genericName);
genericSymbol_ = &MakeSymbol(*genericName);
genericSymbol_->set_details(details);
} else if (!genericSymbol_->isSubprogram()) {
} else if (!genericSymbol_->IsSubprogram()) {
SayAlreadyDeclared(*genericName, *genericSymbol_);
EraseSymbol(*genericName);
genericSymbol_ = nullptr;
@ -1862,7 +1862,7 @@ bool SubprogramVisitor::Pre(const parser::Suffix &suffix) {
}
bool HasModulePrefix(const std::list<parser::PrefixSpec> &prefixes) {
for (auto &prefix : prefixes) {
for (const auto &prefix : prefixes) {
if (std::holds_alternative<parser::PrefixSpec::Module>(prefix.u)) {
return true;
}
@ -1902,7 +1902,8 @@ void SubprogramVisitor::Post(const parser::FunctionSubprogram &) {
bool SubprogramVisitor::Pre(const parser::InterfaceBody::Subroutine &x) {
const auto &name{std::get<parser::Name>(
std::get<parser::Statement<parser::SubroutineStmt>>(x.t).statement.t)};
return BeginSubprogram(name, Symbol::Flag::Subroutine, false, std::nullopt);
return BeginSubprogram(
name, Symbol::Flag::Subroutine, /*hasModulePrefix*/ false, std::nullopt);
}
void SubprogramVisitor::Post(const parser::InterfaceBody::Subroutine &) {
EndSubprogram();
@ -1910,7 +1911,8 @@ void SubprogramVisitor::Post(const parser::InterfaceBody::Subroutine &) {
bool SubprogramVisitor::Pre(const parser::InterfaceBody::Function &x) {
const auto &name{std::get<parser::Name>(
std::get<parser::Statement<parser::FunctionStmt>>(x.t).statement.t)};
return BeginSubprogram(name, Symbol::Flag::Function, false, std::nullopt);
return BeginSubprogram(
name, Symbol::Flag::Function, /*hasModulePrefix*/ false, std::nullopt);
}
void SubprogramVisitor::Post(const parser::InterfaceBody::Function &) {
EndSubprogram();
@ -1984,7 +1986,7 @@ bool SubprogramVisitor::BeginSubprogram(const parser::Name &name,
}
if (hasModulePrefix && !inInterfaceBlock()) {
auto *symbol{FindSymbol(name.source)};
if (!symbol || !symbol->IsSeparateMp()) {
if (!symbol || !symbol->IsSeparateModuleProc()) {
Say(name.source,
"'%s' was not declared a separate module procedure"_err_en_US);
return false;
@ -2016,7 +2018,8 @@ bool SubprogramVisitor::Pre(const parser::SeparateModuleSubprogram &x) {
std::get<parser::Statement<parser::MpSubprogramStmt>>(x.t).statement.v};
const auto &subpPart{
std::get<std::optional<parser::InternalSubprogramPart>>(x.t)};
return BeginSubprogram(name, Symbol::Flag::Subroutine, true, subpPart);
return BeginSubprogram(
name, Symbol::Flag::Subroutine, /*hasModulePrefix*/ true, subpPart);
}
void SubprogramVisitor::Post(const parser::SeparateModuleSubprogram &) {

6
flang/lib/semantics/symbol.cc
View File

@ -222,13 +222,13 @@ void Symbol::SetType(const DeclTypeSpec &type) {
details_);
}
bool Symbol::isSubprogram() const {
bool Symbol::IsSubprogram() const {
return std::visit(
common::visitors{
[](const SubprogramDetails &) { return true; },
[](const SubprogramNameDetails &) { return true; },
[](const GenericDetails &) { return true; },
[](const UseDetails &x) { return x.symbol().isSubprogram(); },
[](const UseDetails &x) { return x.symbol().IsSubprogram(); },
[](const auto &) { return false; },
},
details_);
@ -246,7 +246,7 @@ bool Symbol::HasExplicitInterface() const {
details_);
}
bool Symbol::IsSeparateMp() const {
bool Symbol::IsSeparateModuleProc() const {
if (attrs().test(Attr::MODULE)) {
if (auto *details{detailsIf<SubprogramDetails>()}) {
return details->isInterface();

4
flang/lib/semantics/symbol.h
View File

@ -362,9 +362,9 @@ public:
const DeclTypeSpec *GetType() const;
void SetType(const DeclTypeSpec &);
bool isSubprogram() const;
bool IsSubprogram() const;
bool HasExplicitInterface() const;
bool IsSeparateMp() const;
bool IsSeparateModuleProc() const;
bool operator==(const Symbol &that) const { return this == &that; }
bool operator!=(const Symbol &that) const { return this != &that; }