[flang] Update CMakefiles and #include paths.

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

diff --git a/flang/lib/parser/parse-tree.h b/flang/lib/parser/parse-tree.h
index 4486a39..6f2dd4b 100644 (file)
--- a/flang/lib/parser/parse-tree.h
+++ b/flang/lib/parser/parse-tree.h
@@ -54,24 +54,9 @@ CLASS_TRAIT(WrapperTrait);
 CLASS_TRAIT(UnionTrait);
 CLASS_TRAIT(TupleTrait);
 
-//
-// An empty class to attach semantic information to each class in
-// the parse-tree. In practice, each parser-tree 'classname' shall
-// implement a member:
-//
-//    Semantic<classname> * s = nullptr;
-//
-// The actual implementation of each Sema<classname> will be provided
-// later thus allowing the parser to be build without an dependency
-// with the Sema library
-//
-
 namespace Fortran {
 namespace semantics {
 class Symbol;
-template<typename T> struct Semantic {
-  Semantic(T *) {}
-};
 }  // namespace semantics
 }  // namespace Fortran
 
@@ -82,8 +67,7 @@ template<typename T> struct Semantic {
   classname(classname &&) = default; \
   classname &operator=(classname &&) = default; \
   classname(const classname &) = delete; \
-  classname &operator=(const classname &) = delete; \
-  Fortran::semantics::Semantic<classname> *s = nullptr
+  classname &operator=(const classname &) = delete
 
 // Almost all classes in this file have no default constructor.
 #define BOILERPLATE(classname) \
@@ -100,7 +84,6 @@ template<typename T> struct Semantic {
     classname &operator=(const classname &) { return *this; }; \
     classname &operator=(classname &&) { return *this; }; \
     using EmptyTrait = std::true_type; \
-    Fortran::semantics::Semantic<classname> *s = nullptr; \
   }
 
 // Many classes below simply wrap a std::variant<> discriminated union,
@@ -1111,7 +1094,6 @@ struct DerivedTypeDef {
       std::list<Statement<ComponentDefStmt>>,
       std::optional<TypeBoundProcedurePart>, Statement<EndTypeStmt>>
       t;
-  enum { STMT, PARAMS, SPEC, COMP, PROC, END };
 };
 
 // R758 component-data-source -> expr | data-target | proc-target
@@ -2163,14 +2145,12 @@ struct LoopControl {
 struct LabelDoStmt {
   TUPLE_CLASS_BOILERPLATE(LabelDoStmt);
   std::tuple<std::optional<Name>, Label, std::optional<LoopControl>> t;
-  enum { NAME, LABEL, CONTROL };
 };
 
 // R1122 nonlabel-do-stmt -> [do-construct-name :] DO [loop-control]
 struct NonLabelDoStmt {
   TUPLE_CLASS_BOILERPLATE(NonLabelDoStmt);
   std::tuple<std::optional<Name>, std::optional<LoopControl>> t;
-  enum { NAME, CONTROL };
 };
 
 // R1132 end-do-stmt -> END DO [do-construct-name]
@@ -2756,7 +2736,6 @@ struct MainProgram {
       ExecutionPart, std::optional<InternalSubprogramPart>,
       Statement<EndProgramStmt>>
       t;
-  enum { PROG, SPEC, EXEC, INTERNAL, END };
 };
 
 // R1405 module-stmt -> MODULE module-name
@@ -2789,7 +2768,6 @@ struct Module {
   std::tuple<Statement<ModuleStmt>, SpecificationPart,
       std::optional<ModuleSubprogramPart>, Statement<EndModuleStmt>>
       t;
-  enum { MOD, SPEC, INTERNAL, END };
 };
 
 // R1411 rename ->
@@ -3086,7 +3064,6 @@ struct FunctionSubprogram {
   std::tuple<Statement<FunctionStmt>, SpecificationPart, ExecutionPart,
       std::optional<InternalSubprogramPart>, Statement<EndFunctionStmt>>
       t;
-  enum { FUNC, SPEC, EXEC, INTERNAL, END };
 };
 
 // R1534 subroutine-subprogram ->
@@ -3097,7 +3074,6 @@ struct SubroutineSubprogram {
   std::tuple<Statement<SubroutineStmt>, SpecificationPart, ExecutionPart,
       std::optional<InternalSubprogramPart>, Statement<EndSubroutineStmt>>
       t;
-  enum { SUBR, SPEC, EXEC, INTERNAL, END };
 };
 
 // R1539 mp-subprogram-stmt -> MODULE PROCEDURE procedure-name

diff --git a/flang/lib/semantics/CMakeLists.txt b/flang/lib/semantics/CMakeLists.txt
index 804d12f..6d8e49b 100644 (file)
--- a/flang/lib/semantics/CMakeLists.txt
+++ b/flang/lib/semantics/CMakeLists.txt
@@ -15,12 +15,10 @@
 
 add_library(FlangSemantics
   attr.cc
+  dump-parse-tree.cc
   resolve-names.cc
   rewrite-parse-tree.cc
   scope.cc
   symbol.cc
   type.cc
-  ParseTreeDump.cc
-  StatementMap.cc
-  pass1.cc
 )

diff --git a/flang/lib/semantics/dump-parse-tree.cc b/flang/lib/semantics/dump-parse-tree.cc
index c258743..60040d5 100644 (file)
--- a/flang/lib/semantics/dump-parse-tree.cc
+++ b/flang/lib/semantics/dump-parse-tree.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ParseTreeDump.h"
+#include "dump-parse-tree.h"
 
 #include <string>
 #include <cstring>

diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt
index 45fe0dd..8c151c8 100644 (file)
--- a/flang/tools/f18/CMakeLists.txt
+++ b/flang/tools/f18/CMakeLists.txt
@@ -22,15 +22,3 @@ target_link_libraries( f18
   FortranParser
   FlangSemantics
 )
-
-######## test-sema ##########
-
-add_executable( test-sema  
-  test-sema.cc
-)
-
-target_link_libraries( test-sema
-  FortranParser
-  FlangSemantics
-)
-

diff --git a/flang/tools/f18/f18.cc b/flang/tools/f18/f18.cc
index d49d82a..add50fb 100644 (file)
--- a/flang/tools/f18/f18.cc
+++ b/flang/tools/f18/f18.cc
@@ -21,7 +21,7 @@
 #include "../../lib/parser/parsing.h"
 #include "../../lib/parser/provenance.h"
 #include "../../lib/parser/unparse.h"
-#include "../../lib/semantics/ParseTreeDump.h"
+#include "../../lib/semantics/dump-parse-tree.h"
 #include "../../lib/semantics/resolve-names.h"
 #include <cerrno>
 #include <cstdio>