From: peter klausler Date: Thu, 28 Feb 2019 18:48:41 +0000 (-0800) Subject: [flang] Rename to Fortran.h, update style guide, run clang-format X-Git-Tag: llvmorg-12-init~9537^2~1701 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab74d1ac0c1d2b2ad064da8b42045b15f7584996;p=platform%2Fupstream%2Fllvm.git [flang] Rename to Fortran.h, update style guide, run clang-format Original-commit: flang-compiler/f18@aa2907d2260c34085360917e7fab43d8ee79b6e4 Reviewed-on: https://github.com/flang-compiler/f18/pull/308 Tree-same-pre-rewrite: false --- diff --git a/flang/documentation/C++style.md b/flang/documentation/C++style.md index c3d0a85..a95c8a50 100644 --- a/flang/documentation/C++style.md +++ b/flang/documentation/C++style.md @@ -1,5 +1,5 @@ ## In brief: @@ -37,9 +37,10 @@ headers, also alphabetically; then C and system headers. 1. Don't use `#include `. If you need it for temporary debugging, remove the inclusion before committing. ### Naming -1. C++ names that correspond to STL names should look like those STL names -(e.g., `clear()` and `size()` member functions in a class that implements -a container). +1. C++ names that correspond to well-known interfaces from the STL and LLVM +can and should look like their models when the reader can safely assume that +they mean the same thing -- e.g., `clear()` and `size()` member functions +in a class that implements an STL-ish container. 1. Non-public data members should be named with leading miniscule (lower-case) letters, internal camelCase capitalization, and a trailing underscore, e.g. `DoubleEntryBookkeepingSystem myLedger_;`. POD structures with diff --git a/flang/lib/FIR/afforestation.cc b/flang/lib/FIR/afforestation.cc index a47dedd..1934673 100644 --- a/flang/lib/FIR/afforestation.cc +++ b/flang/lib/FIR/afforestation.cc @@ -498,14 +498,15 @@ template Evaluation GetSwitchSelector(const CT *selectConstruct) { const auto &selector{std::get( std::get>(selectConstruct->t).statement.t)}; - return std::visit(common::visitors{ - [](const parser::Expr &expression) { - return Evaluation{expression.typedExpr.get()}; - }, - [](const parser::Variable &variable) { - return Evaluation{&variable}; - }, - }, + return std::visit( + common::visitors{ + [](const parser::Expr &expression) { + return Evaluation{expression.typedExpr.get()}; + }, + [](const parser::Variable &variable) { + return Evaluation{&variable}; + }, + }, selector.u); } Evaluation GetSwitchRankSelector( @@ -914,18 +915,19 @@ static std::vector populateSwitchValues( auto &rank{std::get( std::get>(v.t) .statement.t)}; - std::visit(common::visitors{ - [&](const parser::ScalarIntConstantExpr &expression) { - result.emplace_back(SwitchRankStmt::Exactly{ - expression.thing.thing.thing->typedExpr.get()}); - }, - [&](const parser::Star &) { - result.emplace_back(SwitchRankStmt::AssumedSize{}); - }, - [&](const parser::Default &) { - result.emplace_back(SwitchRankStmt::Default{}); - }, - }, + std::visit( + common::visitors{ + [&](const parser::ScalarIntConstantExpr &expression) { + result.emplace_back(SwitchRankStmt::Exactly{ + expression.thing.thing.thing->typedExpr.get()}); + }, + [&](const parser::Star &) { + result.emplace_back(SwitchRankStmt::AssumedSize{}); + }, + [&](const parser::Default &) { + result.emplace_back(SwitchRankStmt::Default{}); + }, + }, rank.u); } return result; @@ -936,19 +938,20 @@ static std::vector populateSwitchValues( for (auto &v : list) { auto &guard{std::get( std::get>(v.t).statement.t)}; - std::visit(common::visitors{ - [&](const parser::TypeSpec &typeSpec) { - result.emplace_back( - SwitchTypeStmt::TypeSpec{typeSpec.declTypeSpec}); - }, - [&](const parser::DerivedTypeSpec &derivedTypeSpec) { - result.emplace_back( - SwitchTypeStmt::DerivedTypeSpec{nullptr /*FIXME*/}); - }, - [&](const parser::Default &) { - result.emplace_back(SwitchTypeStmt::Default{}); - }, - }, + std::visit( + common::visitors{ + [&](const parser::TypeSpec &typeSpec) { + result.emplace_back( + SwitchTypeStmt::TypeSpec{typeSpec.declTypeSpec}); + }, + [&](const parser::DerivedTypeSpec &derivedTypeSpec) { + result.emplace_back( + SwitchTypeStmt::DerivedTypeSpec{nullptr /*FIXME*/}); + }, + [&](const parser::Default &) { + result.emplace_back(SwitchTypeStmt::Default{}); + }, + }, guard.u); } return result; @@ -1003,21 +1006,22 @@ static void buildMultiwayDefaultNext(SwitchArguments &result) { } static SwitchArguments ComposeSwitchArgs(const LinearSwitch &op) { SwitchArguments result{nullptr, unspecifiedLabel, {}, op.refs}; - std::visit(common::visitors{ - [](const auto *) { WRONG_PATH(); }, - [&](const parser::ComputedGotoStmt *c) { - result.exp = std::get(c->t) - .thing.thing->typedExpr.get(); - buildMultiwayDefaultNext(result); - }, - [&](const parser::ArithmeticIfStmt *c) { - result.exp = std::get(c->t).typedExpr.get(); - }, - [&](const parser::CallStmt *c) { - result.exp = nullptr; // fixme - result of call - buildMultiwayDefaultNext(result); - }, - }, + std::visit( + common::visitors{ + [](const auto *) { WRONG_PATH(); }, + [&](const parser::ComputedGotoStmt *c) { + result.exp = std::get(c->t) + .thing.thing->typedExpr.get(); + buildMultiwayDefaultNext(result); + }, + [&](const parser::ArithmeticIfStmt *c) { + result.exp = std::get(c->t).typedExpr.get(); + }, + [&](const parser::CallStmt *c) { + result.exp = nullptr; // fixme - result of call + buildMultiwayDefaultNext(result); + }, + }, op.u); return result; } @@ -1108,9 +1112,8 @@ static Expression *BuildLoopLatchExpression( return AlwaysTrueExpression(); } -static void CreateSwitchHelper(FIRBuilder *builder, - const Evaluation &condition, BasicBlock *defaultCase, - const SwitchStmt::ValueSuccPairListType &rest) { +static void CreateSwitchHelper(FIRBuilder *builder, const Evaluation &condition, + BasicBlock *defaultCase, const SwitchStmt::ValueSuccPairListType &rest) { builder->CreateSwitch(condition, defaultCase, rest); } static void CreateSwitchCaseHelper(FIRBuilder *builder, @@ -1169,8 +1172,7 @@ struct FortranIRLowering { void ProcessRoutine(const T &here, const std::string &name) { CHECK(!fir_->containsProcedure(name)); auto *subp{fir_->getOrInsertProcedure(name, nullptr, {})}; - builder_ = new FIRBuilder( - *CreateBlock(subp->getLastRegion())); + builder_ = new FIRBuilder(*CreateBlock(subp->getLastRegion())); AnalysisData ad; ControlFlowAnalyzer linearize{linearOperations_, ad}; Walk(here, linearize); @@ -1565,27 +1567,27 @@ struct FortranIRLowering { }, [&](const LinearReturn &linearReturn) { CheckInsertionPoint(); - std::visit(common::visitors{ - [&](const parser::FailImageStmt *s) { - builder_->CreateRuntimeCall( - RuntimeCallFailImage, - CreateFailImageArguments(*s)); - builder_->CreateUnreachable(); - }, - [&](const parser::ReturnStmt *s) { - if (s->v) { - builder_->CreateReturn( - s->v->thing.thing->typedExpr.get()); - } else { - builder_->CreateRetVoid(); - } - }, - [&](const parser::StopStmt *s) { - builder_->CreateRuntimeCall( - RuntimeCallStop, CreateStopArguments(*s)); - builder_->CreateUnreachable(); - }, - }, + std::visit( + common::visitors{ + [&](const parser::FailImageStmt *s) { + builder_->CreateRuntimeCall(RuntimeCallFailImage, + CreateFailImageArguments(*s)); + builder_->CreateUnreachable(); + }, + [&](const parser::ReturnStmt *s) { + if (s->v) { + builder_->CreateReturn( + s->v->thing.thing->typedExpr.get()); + } else { + builder_->CreateRetVoid(); + } + }, + [&](const parser::StopStmt *s) { + builder_->CreateRuntimeCall( + RuntimeCallStop, CreateStopArguments(*s)); + builder_->CreateUnreachable(); + }, + }, linearReturn.u); builder_->ClearInsertionPoint(); }, @@ -1647,37 +1649,37 @@ struct FortranIRLowering { }, [&](const LinearSwitch &linearSwitch) { CheckInsertionPoint(); - std::visit(common::visitors{ - [&](auto) { - auto args{ComposeSwitchArgs(linearSwitch)}; - AddOrQueueSwitch(args.exp, - args.defLab, args.values, args.labels, - CreateSwitchHelper); - }, - [&](const parser::CaseConstruct *caseConstruct) { - auto args{ComposeSwitchCaseArguments( - caseConstruct, linearSwitch.refs)}; - AddOrQueueSwitch(args.exp, - args.defLab, args.ranges, args.labels, - CreateSwitchCaseHelper); - }, - [&](const parser::SelectRankConstruct - *selectRankConstruct) { - auto args{ComposeSwitchRankArguments( - selectRankConstruct, linearSwitch.refs)}; - AddOrQueueSwitch(args.exp, - args.defLab, args.ranks, args.labels, - CreateSwitchRankHelper); - }, - [&](const parser::SelectTypeConstruct - *selectTypeConstruct) { - auto args{ComposeSwitchTypeArguments( - selectTypeConstruct, linearSwitch.refs)}; - AddOrQueueSwitch(args.exp, - args.defLab, args.types, args.labels, - CreateSwitchTypeHelper); - }, - }, + std::visit( + common::visitors{ + [&](auto) { + auto args{ComposeSwitchArgs(linearSwitch)}; + AddOrQueueSwitch(args.exp, args.defLab, + args.values, args.labels, CreateSwitchHelper); + }, + [&](const parser::CaseConstruct *caseConstruct) { + auto args{ComposeSwitchCaseArguments( + caseConstruct, linearSwitch.refs)}; + AddOrQueueSwitch(args.exp, + args.defLab, args.ranges, args.labels, + CreateSwitchCaseHelper); + }, + [&](const parser::SelectRankConstruct + *selectRankConstruct) { + auto args{ComposeSwitchRankArguments( + selectRankConstruct, linearSwitch.refs)}; + AddOrQueueSwitch(args.exp, + args.defLab, args.ranks, args.labels, + CreateSwitchRankHelper); + }, + [&](const parser::SelectTypeConstruct + *selectTypeConstruct) { + auto args{ComposeSwitchTypeArguments( + selectTypeConstruct, linearSwitch.refs)}; + AddOrQueueSwitch(args.exp, + args.defLab, args.types, args.labels, + CreateSwitchTypeHelper); + }, + }, linearSwitch.u); builder_->ClearInsertionPoint(); }, @@ -1762,14 +1764,15 @@ struct FortranIRLowering { linearConstruct.u); auto next{iter}; const auto &nextOp{*(++next)}; - std::visit(common::visitors{ - [](const auto &) {}, - [&](const LinearLabel &linearLabel) { - blockMap_.insert({linearLabel.get(), - builder_->GetInsertionPoint()}); - ++iter; - }, - }, + std::visit( + common::visitors{ + [](const auto &) {}, + [&](const LinearLabel &linearLabel) { + blockMap_.insert({linearLabel.get(), + builder_->GetInsertionPoint()}); + ++iter; + }, + }, nextOp.u); }, [&](const LinearEndConstruct &linearConstruct) { @@ -1818,8 +1821,8 @@ struct FortranIRLowering { } else { using namespace std::placeholders; controlFlowEdgesToAdd_.emplace_back(std::bind( - [](FIRBuilder *builder, BasicBlock *block, - LinearLabelRef dest, const LabelMapType &map) { + [](FIRBuilder *builder, BasicBlock *block, LinearLabelRef dest, + const LabelMapType &map) { builder->SetInsertionPoint(block); CHECK(map.find(dest) != map.end()); builder->CreateBranch(map.find(dest)->second); @@ -1837,9 +1840,9 @@ struct FortranIRLowering { } else { using namespace std::placeholders; controlFlowEdgesToAdd_.emplace_back(std::bind( - [](FIRBuilder *builder, BasicBlock *block, - Expression *expr, LinearLabelRef trueDest, - LinearLabelRef falseDest, const LabelMapType &map) { + [](FIRBuilder *builder, BasicBlock *block, Expression *expr, + LinearLabelRef trueDest, LinearLabelRef falseDest, + const LabelMapType &map) { builder->SetInsertionPoint(block); CHECK(map.find(trueDest) != map.end()); CHECK(map.find(falseDest) != map.end()); @@ -1876,8 +1879,8 @@ struct FortranIRLowering { if (defer) { using namespace std::placeholders; controlFlowEdgesToAdd_.emplace_back(std::bind( - [](FIRBuilder *builder, BasicBlock *block, - const Evaluation &expr, LinearLabelRef defaultDest, + [](FIRBuilder *builder, BasicBlock *block, const Evaluation &expr, + LinearLabelRef defaultDest, const std::vector &values, const std::vector &labels, F function, const LabelMapType &map) { @@ -1916,8 +1919,8 @@ struct FortranIRLowering { if (defer) { using namespace std::placeholders; controlFlowEdgesToAdd_.emplace_back(std::bind( - [](FIRBuilder *builder, BasicBlock *block, - Variable *variable, const std::vector &fixme, + [](FIRBuilder *builder, BasicBlock *block, Variable *variable, + const std::vector &fixme, const LabelMapType &map) { builder->SetInsertionPoint(block); builder->CreateIndirectBr(variable, {}); // FIXME diff --git a/flang/lib/FIR/basicblock.cc b/flang/lib/FIR/basicblock.cc index 3ea2126..3c8989a 100644 --- a/flang/lib/FIR/basicblock.cc +++ b/flang/lib/FIR/basicblock.cc @@ -53,5 +53,4 @@ const Statement *BasicBlock::getTerminator() const { }, lastStmt.u); } - } diff --git a/flang/lib/FIR/basicblock.h b/flang/lib/FIR/basicblock.h index 4175bf9..72335edc 100644 --- a/flang/lib/FIR/basicblock.h +++ b/flang/lib/FIR/basicblock.h @@ -65,10 +65,8 @@ private: }; inline std::list pred_list(BasicBlock &block) { - return std::list{ - block.preds().begin(), block.preds().end()}; + return std::list{block.preds().begin(), block.preds().end()}; } - } #endif diff --git a/flang/lib/FIR/builder.cc b/flang/lib/FIR/builder.cc index e8025402..036ad87 100644 --- a/flang/lib/FIR/builder.cc +++ b/flang/lib/FIR/builder.cc @@ -17,8 +17,5 @@ namespace Fortran::FIR { -void FIRBuilder::dump() const { - std::cerr << "builder state:\n"; -} - +void FIRBuilder::dump() const { std::cerr << "builder state:\n"; } } diff --git a/flang/lib/FIR/builder.h b/flang/lib/FIR/builder.h index 990a613..fc653df 100644 --- a/flang/lib/FIR/builder.h +++ b/flang/lib/FIR/builder.h @@ -133,7 +133,6 @@ private: BasicBlock *cursorBlock_; std::vector blockStack_; }; - } #endif diff --git a/flang/lib/FIR/graph-writer.cc b/flang/lib/FIR/graph-writer.cc index 4c1be22..013eb58 100644 --- a/flang/lib/FIR/graph-writer.cc +++ b/flang/lib/FIR/graph-writer.cc @@ -118,5 +118,4 @@ void GraphWriter::dumpInternalEdges(BasicBlock &block, } } } - } diff --git a/flang/lib/FIR/graph-writer.h b/flang/lib/FIR/graph-writer.h index 9607a4b..bf380f9 100644 --- a/flang/lib/FIR/graph-writer.h +++ b/flang/lib/FIR/graph-writer.h @@ -87,7 +87,6 @@ private: std::map blockIds_; static std::optional defaultOutput_; }; - } #endif diff --git a/flang/lib/FIR/mixin.h b/flang/lib/FIR/mixin.h index ce6044a..763bd33 100644 --- a/flang/lib/FIR/mixin.h +++ b/flang/lib/FIR/mixin.h @@ -108,7 +108,6 @@ template B &Unzip(B &out, A first, A last) { [](auto &&a) -> decltype(a.second) { return a.second; }); return out; } - } #endif // FORTRAN_FIR_COMMON_H_ diff --git a/flang/lib/FIR/procedure.cc b/flang/lib/FIR/procedure.cc index 44bd44a..84ebdb0 100644 --- a/flang/lib/FIR/procedure.cc +++ b/flang/lib/FIR/procedure.cc @@ -65,14 +65,13 @@ void Procedure::FlattenRegions() { if (!region->IsOutermost()) { for (auto *succ : succ_list(block)) { auto *succRegion{succ->GetRegion()}; - if (succRegion != region && - DistinctScopes(succRegion, region)) { + if (succRegion != region && DistinctScopes(succRegion, region)) { if (IsAncestor(region, succRegion)) { - AddEnterScopes(RegionDepth(region, succRegion), - succ->SplitEdge(&block)); + AddEnterScopes( + RegionDepth(region, succRegion), succ->SplitEdge(&block)); } else if (IsAncestor(succRegion, region)) { - AddExitScopes(RegionDepth(succRegion, region), - block.SplitEdge(succ)); + AddExitScopes( + RegionDepth(succRegion, region), block.SplitEdge(succ)); } else { // TODO: edge to a cousin region CHECK(false); @@ -82,5 +81,4 @@ void Procedure::FlattenRegions() { } } } - } diff --git a/flang/lib/FIR/procedure.h b/flang/lib/FIR/procedure.h index 37a1da1..750573c 100644 --- a/flang/lib/FIR/procedure.h +++ b/flang/lib/FIR/procedure.h @@ -75,7 +75,6 @@ private: unsigned addrSpace, const llvm::Twine &n, Procedure *before); Region *insertBefore(Region *region, Region *before = nullptr); }; - } #endif diff --git a/flang/lib/FIR/program.cc b/flang/lib/FIR/program.cc index 87fc7c8..abe7237 100644 --- a/flang/lib/FIR/program.cc +++ b/flang/lib/FIR/program.cc @@ -43,5 +43,4 @@ Procedure *Program::getOrInsertProcedure( } return subp; } - } diff --git a/flang/lib/FIR/program.h b/flang/lib/FIR/program.h index cf2be11..b9022f3 100644 --- a/flang/lib/FIR/program.h +++ b/flang/lib/FIR/program.h @@ -49,7 +49,6 @@ private: ProcedureMapType procedureMap_; const std::string name_; }; - } #endif diff --git a/flang/lib/FIR/region.cc b/flang/lib/FIR/region.cc index 495862b..0a3e497 100644 --- a/flang/lib/FIR/region.cc +++ b/flang/lib/FIR/region.cc @@ -47,5 +47,4 @@ std::vector Region::getBlocks() { } return result; } - } diff --git a/flang/lib/FIR/region.h b/flang/lib/FIR/region.h index 6b506a4..73e77d0 100644 --- a/flang/lib/FIR/region.h +++ b/flang/lib/FIR/region.h @@ -86,7 +86,6 @@ inline unsigned RegionDepth(const Region *fromRegion, const Region *toRegion) { } return result; } - } #endif diff --git a/flang/lib/FIR/statements.cc b/flang/lib/FIR/statements.cc index 4868493..afc3816 100644 --- a/flang/lib/FIR/statements.cc +++ b/flang/lib/FIR/statements.cc @@ -238,5 +238,4 @@ std::string Statement::dump() const { }, u); } - } diff --git a/flang/lib/FIR/statements.h b/flang/lib/FIR/statements.h index 157b737..01f6f19 100644 --- a/flang/lib/FIR/statements.h +++ b/flang/lib/FIR/statements.h @@ -464,7 +464,6 @@ private: std::vector inputs_; }; - } #endif diff --git a/flang/lib/FIR/stmt.h b/flang/lib/FIR/stmt.h index 8f29180..7ba99fa 100644 --- a/flang/lib/FIR/stmt.h +++ b/flang/lib/FIR/stmt.h @@ -44,7 +44,6 @@ inline std::list succ_list(BasicBlock &block) { // CHECK(false && "block does not have terminator"); return {}; } - } #endif diff --git a/flang/lib/common/fortran.h b/flang/lib/common/Fortran.h similarity index 100% rename from flang/lib/common/fortran.h rename to flang/lib/common/Fortran.h diff --git a/flang/lib/common/default-kinds.h b/flang/lib/common/default-kinds.h index 96aa7bd..7d757d0 100644 --- a/flang/lib/common/default-kinds.h +++ b/flang/lib/common/default-kinds.h @@ -15,7 +15,7 @@ #ifndef FORTRAN_COMMON_DEFAULT_KINDS_H_ #define FORTRAN_COMMON_DEFAULT_KINDS_H_ -#include "../common/fortran.h" +#include "../common/Fortran.h" // Represent the default values of the kind parameters of the // various intrinsic types. These can be configured by means of diff --git a/flang/lib/evaluate/characteristics.h b/flang/lib/evaluate/characteristics.h index 0f309d89..846617a 100644 --- a/flang/lib/evaluate/characteristics.h +++ b/flang/lib/evaluate/characteristics.h @@ -21,8 +21,8 @@ #include "expression.h" #include "type.h" +#include "../common/Fortran.h" #include "../common/enum-set.h" -#include "../common/fortran.h" #include "../common/idioms.h" #include "../common/indirection.h" #include diff --git a/flang/lib/evaluate/common.h b/flang/lib/evaluate/common.h index bd42d17..3587869 100644 --- a/flang/lib/evaluate/common.h +++ b/flang/lib/evaluate/common.h @@ -15,8 +15,8 @@ #ifndef FORTRAN_EVALUATE_COMMON_H_ #define FORTRAN_EVALUATE_COMMON_H_ +#include "../common/Fortran.h" #include "../common/enum-set.h" -#include "../common/fortran.h" #include "../common/idioms.h" #include "../common/indirection.h" #include "../common/restorer.h" diff --git a/flang/lib/evaluate/expression.h b/flang/lib/evaluate/expression.h index 26316ef..235fde2 100644 --- a/flang/lib/evaluate/expression.h +++ b/flang/lib/evaluate/expression.h @@ -26,7 +26,7 @@ #include "constant.h" #include "type.h" #include "variable.h" -#include "../lib/common/fortran.h" +#include "../lib/common/Fortran.h" #include "../lib/common/idioms.h" #include "../lib/common/template.h" #include "../lib/parser/char-block.h" diff --git a/flang/lib/evaluate/intrinsics.cc b/flang/lib/evaluate/intrinsics.cc index 7d7351e..14de420 100644 --- a/flang/lib/evaluate/intrinsics.cc +++ b/flang/lib/evaluate/intrinsics.cc @@ -17,8 +17,8 @@ #include "fold.h" #include "tools.h" #include "type.h" +#include "../common/Fortran.h" #include "../common/enum-set.h" -#include "../common/fortran.h" #include "../common/idioms.h" #include #include diff --git a/flang/lib/evaluate/type.h b/flang/lib/evaluate/type.h index f9dbb5b..fa83538 100644 --- a/flang/lib/evaluate/type.h +++ b/flang/lib/evaluate/type.h @@ -27,7 +27,7 @@ #include "integer.h" #include "logical.h" #include "real.h" -#include "../common/fortran.h" +#include "../common/Fortran.h" #include "../common/idioms.h" #include "../common/template.h" #include diff --git a/flang/lib/parser/parse-tree.h b/flang/lib/parser/parse-tree.h index eabc7bb..2c25c82 100644 --- a/flang/lib/parser/parse-tree.h +++ b/flang/lib/parser/parse-tree.h @@ -28,7 +28,7 @@ #include "format-specification.h" #include "message.h" #include "provenance.h" -#include "../common/fortran.h" +#include "../common/Fortran.h" #include "../common/idioms.h" #include "../common/indirection.h" #include diff --git a/flang/lib/parser/unparse.cc b/flang/lib/parser/unparse.cc index d9785e4..805cf48 100644 --- a/flang/lib/parser/unparse.cc +++ b/flang/lib/parser/unparse.cc @@ -19,7 +19,7 @@ #include "characters.h" #include "parse-tree-visitor.h" #include "parse-tree.h" -#include "../common/fortran.h" +#include "../common/Fortran.h" #include "../common/idioms.h" #include "../common/indirection.h" #include diff --git a/flang/lib/semantics/expression.h b/flang/lib/semantics/expression.h index bc95071..ad61948 100644 --- a/flang/lib/semantics/expression.h +++ b/flang/lib/semantics/expression.h @@ -16,7 +16,7 @@ #define FORTRAN_SEMANTICS_EXPRESSION_H_ #include "semantics.h" -#include "../common/fortran.h" +#include "../common/Fortran.h" #include "../common/indirection.h" #include "../evaluate/expression.h" #include "../evaluate/tools.h" diff --git a/flang/lib/semantics/resolve-names.cc b/flang/lib/semantics/resolve-names.cc index 15b5ca3..27a5f16 100644 --- a/flang/lib/semantics/resolve-names.cc +++ b/flang/lib/semantics/resolve-names.cc @@ -21,8 +21,8 @@ #include "semantics.h" #include "symbol.h" #include "type.h" +#include "../common/Fortran.h" #include "../common/default-kinds.h" -#include "../common/fortran.h" #include "../common/indirection.h" #include "../common/restorer.h" #include "../evaluate/common.h" diff --git a/flang/lib/semantics/scope.h b/flang/lib/semantics/scope.h index c1fd911..a04c9b2 100644 --- a/flang/lib/semantics/scope.h +++ b/flang/lib/semantics/scope.h @@ -17,7 +17,7 @@ #include "attr.h" #include "symbol.h" -#include "../common/fortran.h" +#include "../common/Fortran.h" #include "../common/idioms.h" #include "../parser/message.h" #include diff --git a/flang/lib/semantics/symbol.h b/flang/lib/semantics/symbol.h index e88deef..079ec6d 100644 --- a/flang/lib/semantics/symbol.h +++ b/flang/lib/semantics/symbol.h @@ -16,8 +16,8 @@ #define FORTRAN_SEMANTICS_SYMBOL_H_ #include "type.h" +#include "../common/Fortran.h" #include "../common/enum-set.h" -#include "../common/fortran.h" #include #include #include diff --git a/flang/lib/semantics/type.h b/flang/lib/semantics/type.h index c7f4fcc..2ded0c4 100644 --- a/flang/lib/semantics/type.h +++ b/flang/lib/semantics/type.h @@ -16,7 +16,7 @@ #define FORTRAN_SEMANTICS_TYPE_H_ #include "attr.h" -#include "../common/fortran.h" +#include "../common/Fortran.h" #include "../common/idioms.h" #include "../common/indirection.h" #include "../evaluate/expression.h"