[flang] Rename flang-features to Fortran-features; update the guard macro.

Original-commit: flang-compiler/f18@1a7f5596ecab5eb954130713c5b9e4f6a16c5ab7
Reviewed-on: https://github.com/flang-compiler/f18/pull/826

diff --git a/flang/lib/common/CMakeLists.txt b/flang/lib/common/CMakeLists.txt
index facefc3..95fd82e 100644 (file)
--- a/flang/lib/common/CMakeLists.txt
+++ b/flang/lib/common/CMakeLists.txt
@@ -14,8 +14,8 @@
 
 add_library(FortranCommon
   Fortran.cc
+  Fortran-features.cc
   default-kinds.cc
-  flang-features.cc
   idioms.cc
 )
 

diff --git a/flang/lib/common/flang-features.cc b/flang/lib/common/Fortran-features.cc
similarity index 98%
rename from flang/lib/common/flang-features.cc
rename to flang/lib/common/Fortran-features.cc
index 99c158f..5b045ec 100644 (file)
--- a/flang/lib/common/flang-features.cc
+++ b/flang/lib/common/Fortran-features.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "flang-features.h"
+#include "Fortran-features.h"
 #include "Fortran.h"
 #include "idioms.h"
 

diff --git a/flang/lib/common/flang-features.h b/flang/lib/common/Fortran-features.h
similarity index 95%
rename from flang/lib/common/flang-features.h
rename to flang/lib/common/Fortran-features.h
index b412b5d..066df78 100644 (file)
--- a/flang/lib/common/flang-features.h
+++ b/flang/lib/common/Fortran-features.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FORTRAN_COMMON_FEATURES_H_
-#define FORTRAN_COMMON_FEATURES_H_
+#ifndef FORTRAN_COMMON_FORTRAN_FEATURES_H_
+#define FORTRAN_COMMON_FORTRAN_FEATURES_H_
 
 #include "Fortran.h"
 #include "enum-set.h"
@@ -67,4 +67,4 @@ private:
   bool warnAll_{false};
 };
 }
-#endif  // FORTRAN_COMMON_FEATURES_H_
+#endif  // FORTRAN_COMMON_FORTRAN_FEATURES_H_

diff --git a/flang/lib/parser/basic-parsers.h b/flang/lib/parser/basic-parsers.h
index 6c73afb..839b553 100644 (file)
--- a/flang/lib/parser/basic-parsers.h
+++ b/flang/lib/parser/basic-parsers.h
@@ -33,7 +33,7 @@
 #include "parse-state.h"
 #include "provenance.h"
 #include "user-state.h"
-#include "../common/flang-features.h"
+#include "../common/Fortran-features.h"
 #include "../common/idioms.h"
 #include "../common/indirection.h"
 #include <cstring>

diff --git a/flang/lib/parser/parse-state.h b/flang/lib/parser/parse-state.h
index d7acadb..7bf27be 100644 (file)
--- a/flang/lib/parser/parse-state.h
+++ b/flang/lib/parser/parse-state.h
@@ -25,7 +25,7 @@
 #include "message.h"
 #include "provenance.h"
 #include "user-state.h"
-#include "../common/flang-features.h"
+#include "../common/Fortran-features.h"
 #include "../common/idioms.h"
 #include <cstddef>
 #include <cstring>

diff --git a/flang/lib/parser/parsing.h b/flang/lib/parser/parsing.h
index 903f133..0399e9a 100644 (file)
--- a/flang/lib/parser/parsing.h
+++ b/flang/lib/parser/parsing.h
@@ -20,7 +20,7 @@
 #include "message.h"
 #include "parse-tree.h"
 #include "provenance.h"
-#include "../common/flang-features.h"
+#include "../common/Fortran-features.h"
 #include <optional>
 #include <ostream>
 #include <string>

diff --git a/flang/lib/parser/prescan.h b/flang/lib/parser/prescan.h
index 44080d9..675576d 100644 (file)
--- a/flang/lib/parser/prescan.h
+++ b/flang/lib/parser/prescan.h
@@ -26,7 +26,7 @@
 #include "message.h"
 #include "provenance.h"
 #include "token-sequence.h"
-#include "../common/flang-features.h"
+#include "../common/Fortran-features.h"
 #include <bitset>
 #include <optional>
 #include <string>

diff --git a/flang/lib/parser/user-state.h b/flang/lib/parser/user-state.h
index e3d03e2..59b286c 100644 (file)
--- a/flang/lib/parser/user-state.h
+++ b/flang/lib/parser/user-state.h
@@ -22,7 +22,7 @@
 
 #include "char-block.h"
 #include "parse-tree.h"
-#include "../common/flang-features.h"
+#include "../common/Fortran-features.h"
 #include "../common/idioms.h"
 #include <cinttypes>
 #include <optional>

diff --git a/flang/lib/semantics/resolve-names-utils.cc b/flang/lib/semantics/resolve-names-utils.cc
index 1038e1e..f63f509 100644 (file)
--- a/flang/lib/semantics/resolve-names-utils.cc
+++ b/flang/lib/semantics/resolve-names-utils.cc
@@ -16,7 +16,7 @@
 #include "expression.h"
 #include "semantics.h"
 #include "tools.h"
-#include "../common/flang-features.h"
+#include "../common/Fortran-features.h"
 #include "../common/idioms.h"
 #include "../common/indirection.h"
 #include "../evaluate/fold.h"

diff --git a/flang/lib/semantics/semantics.h b/flang/lib/semantics/semantics.h
index e793206..e4e2a75 100644 (file)
--- a/flang/lib/semantics/semantics.h
+++ b/flang/lib/semantics/semantics.h
@@ -16,7 +16,7 @@
 #define FORTRAN_SEMANTICS_SEMANTICS_H_
 
 #include "scope.h"
-#include "../common/flang-features.h"
+#include "../common/Fortran-features.h"
 #include "../evaluate/common.h"
 #include "../evaluate/intrinsics.h"
 #include "../parser/message.h"

diff --git a/flang/tools/f18/f18-parse-demo.cc b/flang/tools/f18/f18-parse-demo.cc
index bc950f2..dfe4b5b 100644 (file)
--- a/flang/tools/f18/f18-parse-demo.cc
+++ b/flang/tools/f18/f18-parse-demo.cc
@@ -27,8 +27,8 @@
 // scaffolding compiler driver that can test some semantic passes of the
 // F18 compiler under development.
 
+#include "../../lib/common/Fortran-features.h"
 #include "../../lib/common/default-kinds.h"
-#include "../../lib/common/flang-features.h"
 #include "../../lib/parser/characters.h"
 #include "../../lib/parser/dump-parse-tree.h"
 #include "../../lib/parser/message.h"

diff --git a/flang/tools/f18/f18.cc b/flang/tools/f18/f18.cc
index 4849acf..7c60d84 100644 (file)
--- a/flang/tools/f18/f18.cc
+++ b/flang/tools/f18/f18.cc
@@ -14,8 +14,8 @@
 
 // Temporary Fortran front end driver main program for development scaffolding.
 
+#include "../../lib/common/Fortran-features.h"
 #include "../../lib/common/default-kinds.h"
-#include "../../lib/common/flang-features.h"
 #include "../../lib/evaluate/expression.h"
 #include "../../lib/parser/characters.h"
 #include "../../lib/parser/dump-parse-tree.h"