[flang] reformatting

Original-commit: flang-compiler/f18@d9bfa6f48e92ac5d305ee896db4d35ab64c0df7f
Reviewed-on: https://github.com/flang-compiler/f18/pull/406
Tree-same-pre-rewrite: false

diff --git a/flang/lib/semantics/resolve-names.cc b/flang/lib/semantics/resolve-names.cc
index aaf603e..3e6e141 100644 (file)
--- a/flang/lib/semantics/resolve-names.cc
+++ b/flang/lib/semantics/resolve-names.cc
@@ -21,8 +21,8 @@
 #include "scope.h"
 #include "semantics.h"
 #include "symbol.h"
-#include "type.h"
 #include "tools.h"
+#include "type.h"
 #include "../common/Fortran.h"
 #include "../common/default-kinds.h"
 #include "../common/indirection.h"
@@ -4606,7 +4606,7 @@ bool ResolveNamesVisitor::Pre(const parser::PointerAssignmentStmt &x) {
   ResolveDataRef(dataRef);
   Walk(bounds);
   // Resolve unrestricted specific intrinsic procedures as in "p => cos".
-  if (const parser::Name *name{GetSimpleName(expr)}) {
+  if (const parser::Name * name{GetSimpleName(expr)}) {
     if (NameIsKnownOrIntrinsic(*name)) {
       return false;
     }

diff --git a/flang/lib/semantics/tools.cc b/flang/lib/semantics/tools.cc
index d1b76f6..f5a508f 100644 (file)
--- a/flang/lib/semantics/tools.cc
+++ b/flang/lib/semantics/tools.cc
@@ -264,20 +264,6 @@ bool ExprHasTypeCategory(const evaluate::GenericExprWrapper &expr,
   return dynamicType.has_value() && dynamicType->category == type;
 }
 
-void CheckScalarLogicalExpr(
-    const parser::Expr &expr, parser::Messages &messages) {
-  // TODO: should be asserting that typedExpr is not null
-  if (expr.typedExpr == nullptr) {
-    return;
-  }
-  if (expr.typedExpr->v.Rank() > 0) {
-    messages.Say(expr.source, "Expected a scalar LOGICAL expression"_err_en_US);
-  } else if (!ExprHasTypeCategory(
-                 *expr.typedExpr, common::TypeCategory::Logical)) {
-    messages.Say(expr.source, "Expected a LOGICAL expression"_err_en_US);
-  }
-}
-
 static parser::Name *GetSimpleName(
     common::Indirection<parser::Designator> *designator) {
   if (designator) {

diff --git a/flang/lib/semantics/tools.h b/flang/lib/semantics/tools.h
index 7f30524..d434350 100644 (file)
--- a/flang/lib/semantics/tools.h
+++ b/flang/lib/semantics/tools.h
@@ -97,8 +97,6 @@ const Symbol *FindExternallyVisibleObject(
 
 bool ExprHasTypeCategory(
     const evaluate::GenericExprWrapper &expr, const common::TypeCategory &type);
-void CheckScalarLogicalExpr(
-    const parser::Expr &expr, parser::Messages &messages);
 
 // If this Expr or Variable represents a simple Name, return it.
 parser::Name *GetSimpleName(parser::Expr &);