Update to be in alphabetical order

Author: JDPailleux

flang/examples/FeatureList/FeatureList.cpp

@@ -348,9 +348,9 @@ struct NodeVisitor {
   READ_FEATURE(TeamValue)
   READ_FEATURE(ImageSelector)
   READ_FEATURE(ImageSelectorSpec)
+  READ_FEATURE(ImageSelectorSpec::Notify)
   READ_FEATURE(ImageSelectorSpec::Stat)
   READ_FEATURE(ImageSelectorSpec::Team_Number)
-  READ_FEATURE(ImageSelectorSpec::Notify)
   READ_FEATURE(ImplicitPart)
   READ_FEATURE(ImplicitPartStmt)
   READ_FEATURE(ImplicitSpec)

flang/include/flang/Evaluate/traverse.h

@@ -146,7 +146,7 @@ class Traverse {
     return Combine(x.base(), x.subscript());
   }
   Result operator()(const CoarrayRef &x) const {
-    return Combine(x.base(), x.cosubscript(), x.stat(), x.team(), x.notify());
+    return Combine(x.base(), x.cosubscript(), x.notify(), x.stat(), x.team());
   }
   Result operator()(const DataRef &x) const { return visitor_(x.u); }
   Result operator()(const Substring &x) const {

flang/include/flang/Evaluate/variable.h

@@ -275,9 +275,9 @@ class CoarrayRef {
 private:
   common::CopyableIndirection<DataRef> base_;
   std::vector<Expr<SubscriptInteger>> cosubscript_;
+  std::optional<common::CopyableIndirection<Expr<SomeType>>> notify_;
   std::optional<common::CopyableIndirection<Expr<SomeInteger>>> stat_;
   std::optional<common::CopyableIndirection<Expr<SomeType>>> team_;
-  std::optional<common::CopyableIndirection<Expr<SomeType>>> notify_;
 };
 
 // R911 data-ref is defined syntactically as a series of part-refs, which

flang/include/flang/Parser/dump-parse-tree.h

@@ -384,9 +384,9 @@ class ParseTreeDumper {
   NODE(parser, TeamValue)
   NODE(parser, ImageSelector)
   NODE(parser, ImageSelectorSpec)
+  NODE(ImageSelectorSpec, Notify)
   NODE(ImageSelectorSpec, Stat)
   NODE(ImageSelectorSpec, Team_Number)
-  NODE(ImageSelectorSpec, Notify)
   NODE(parser, ImplicitPart)
   NODE(parser, ImplicitPartStmt)
   NODE(parser, ImplicitSpec)

flang/include/flang/Parser/parse-tree.h

@@ -1690,7 +1690,7 @@ struct ImageSelectorSpec {
   WRAPPER_CLASS(Team_Number, ScalarIntExpr);
   WRAPPER_CLASS(Notify, Scalar<common::Indirection<Variable>>);
   UNION_CLASS_BOILERPLATE(ImageSelectorSpec);
-  std::variant<Stat, TeamValue, Team_Number, Notify> u;
+  std::variant<Notify, Stat, TeamValue, Team_Number> u;
 };
 
 // R924 image-selector ->

flang/lib/Semantics/dump-expr.cpp

@@ -23,9 +23,9 @@ void DumpEvaluateExpr::Show(const evaluate::CoarrayRef &x) {
   Indent("coarray ref");
   Show(x.base());
   Show(x.cosubscript());
+  Show(x.notify());
   Show(x.stat());
   Show(x.team());
-  Show(x.notify());
   Outdent();
 }
 

flang/lib/Semantics/expression.cpp

@@ -1579,6 +1579,19 @@ MaybeExpr ExpressionAnalyzer::Analyze(const parser::CoindexedNamedObject &x) {
         std::get<std::list<parser::ImageSelectorSpec>>(x.imageSelector.t)) {
       common::visit(
           common::visitors{
+              [&](const parser::ImageSelectorSpec::Notify &x) {
+                Analyze(x.v);
+                if (const auto *expr{GetExpr(context_, x.v)}) {
+                  if (coarrayRef.notify()) {
+                    Say("coindexed reference has multiple NOTIFY= specifiers"_err_en_US);
+                  } else if (auto dyType{expr->GetType()};
+                      dyType && IsNotifyType(GetDerivedTypeSpec(*dyType))) {
+                    coarrayRef.set_notify(Expr<SomeType>{*expr});
+                  } else {
+                    Say("NOTIFY= specifier must have type NOTIFY_TYPE from ISO_FORTRAN_ENV"_err_en_US);
+                  }
+                }
+              },
               [&](const parser::ImageSelectorSpec::Stat &x) {
                 Analyze(x.v);
                 if (const auto *expr{GetExpr(context_, x.v)}) {
@@ -1614,19 +1627,6 @@ MaybeExpr ExpressionAnalyzer::Analyze(const parser::CoindexedNamedObject &x) {
                     coarrayRef.set_team(Expr<SomeType>{*expr});
                   }
                 }
-              },
-              [&](const parser::ImageSelectorSpec::Notify &x) {
-                Analyze(x.v);
-                if (const auto *expr{GetExpr(context_, x.v)}) {
-                  if (coarrayRef.notify()) {
-                    Say("coindexed reference has multiple NOTIFY= specifiers"_err_en_US);
-                  } else if (auto dyType{expr->GetType()};
-                      dyType && IsNotifyType(GetDerivedTypeSpec(*dyType))) {
-                    coarrayRef.set_notify(Expr<SomeType>{*expr});
-                  } else {
-                    Say("NOTIFY= specifier must have type NOTIFY_TYPE from ISO_FORTRAN_ENV"_err_en_US);
-                  }
-                }
               }},
           imageSelSpec.u);
     }