[flang] Never emit :: when /-bracketed initializers appear on a type declaration stmt.
Original-commit: flang-compiler/f18@2ed327a4f8c881a78f0a75e437cc6010046a03c3
Reviewed-on: https://github.com/flang-compiler/f18/pull/26
Tree-same-pre-rewrite: false
diff --git a/flang/lib/parser/unparse.cc b/flang/lib/parser/unparse.cc
index feb1148a..73fb8e6 100644
--- a/flang/lib/parser/unparse.cc
+++ b/flang/lib/parser/unparse.cc
@@ -434,11 +434,14 @@
const auto &decls = std::get<std::list<EntityDecl>>(x.t);
Walk(dts), Walk(", ", attrs, ", ");
if (!std::holds_alternative<DeclarationTypeSpec::Record>(dts.u) &&
- (!attrs.empty() ||
- !std::holds_alternative<IntrinsicTypeSpec>(dts.u) ||
- std::any_of(decls.begin(), decls.end(), [](const EntityDecl &d) {
- return std::get<std::optional<Initialization>>(d.t).has_value();
- }))) {
+ std::none_of(decls.begin(), decls.end(),
+ [](const EntityDecl &d) {
+ return std::get<std::optional<Initialization>>(d.t).has_value();
+ }) &&
+ (!attrs.empty() || !std::holds_alternative<IntrinsicTypeSpec>(dts.u) ||
+ std::any_of(decls.begin(), decls.end(), [](const EntityDecl &d) {
+ return std::get<std::optional<Initialization>>(d.t).has_value();
+ }))) {
Put(" ::"); // N.B. don't emit some needless ::, pgf90 can crash on them
}
Put(' '), Walk(std::get<std::list<EntityDecl>>(x.t), ", ");
@@ -687,9 +690,7 @@
bool Pre(const ImportStmt &x) { // R867
Word("IMPORT");
switch (x.kind) {
- case ImportStmt::Kind::Default:
- Walk(" :: ", x.names, ", ");
- break;
+ case ImportStmt::Kind::Default: Walk(" :: ", x.names, ", "); break;
case ImportStmt::Kind::Only:
Put(", "), Word("ONLY: ");
Walk(x.names, ", ");
