[flang] Use forward declarations to reduce includes

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

diff --git a/flang/lib/semantics/expression.cc b/flang/lib/semantics/expression.cc
index 540368a..9dbd3c8 100644 (file)
--- a/flang/lib/semantics/expression.cc
+++ b/flang/lib/semantics/expression.cc
@@ -19,6 +19,7 @@
 #include "../common/idioms.h"
 #include "../evaluate/common.h"
 #include "../evaluate/fold.h"
+#include "../evaluate/intrinsics.h"
 #include "../evaluate/tools.h"
 #include "../parser/parse-tree-visitor.h"
 #include "../parser/parse-tree.h"

diff --git a/flang/lib/semantics/expression.h b/flang/lib/semantics/expression.h
index 692357e..5e1d18c 100644 (file)
--- a/flang/lib/semantics/expression.h
+++ b/flang/lib/semantics/expression.h
@@ -15,13 +15,15 @@
 #ifndef FORTRAN_SEMANTICS_EXPRESSION_H_
 #define FORTRAN_SEMANTICS_EXPRESSION_H_
 
-#include "default-kinds.h"
 #include "../evaluate/expression.h"
-#include "../evaluate/intrinsics.h"
 #include "../evaluate/type.h"
-#include "../parser/parse-tree.h"
 #include <optional>
 
+namespace Fortran::parser {
+class Expr;
+class Program;
+}
+
 namespace Fortran::semantics {
 
 class SemanticsContext;