[flang] Moved public headers to include/flang (flang-compiler/f18#943)
authorDavid Truby <david.truby@arm.com>
Mon, 27 Jan 2020 20:57:59 +0000 (20:57 +0000)
committerSteve Scalpone <sscalpone@nvidia.com>
Mon, 27 Jan 2020 20:57:59 +0000 (12:57 -0800)
Original-commit: flang-compiler/f18@21adbc7e05b2454ba3fc725b4697748f98599471
Reviewed-on: https://github.com/flang-compiler/f18/pull/943

203 files changed:
flang/.clang-format
flang/include/flang/common/Fortran-features.h [moved from flang/lib/common/Fortran-features.h with 94% similarity]
flang/include/flang/common/Fortran.h [moved from flang/lib/common/Fortran.h with 97% similarity]
flang/include/flang/common/bit-population-count.h [moved from flang/lib/common/bit-population-count.h with 98% similarity]
flang/include/flang/common/constexpr-bitset.h [moved from flang/lib/common/constexpr-bitset.h with 98% similarity]
flang/include/flang/common/default-kinds.h [moved from flang/lib/common/default-kinds.h with 96% similarity]
flang/include/flang/common/enum-set.h [moved from flang/lib/common/enum-set.h with 99% similarity]
flang/include/flang/common/format.h [moved from flang/lib/common/format.h with 99% similarity]
flang/include/flang/common/idioms.h [moved from flang/lib/common/idioms.h with 98% similarity]
flang/include/flang/common/indirection.h [moved from flang/lib/common/indirection.h with 98% similarity]
flang/include/flang/common/interval.h [moved from flang/lib/common/interval.h with 98% similarity]
flang/include/flang/common/leading-zero-bit-count.h [moved from flang/lib/common/leading-zero-bit-count.h with 98% similarity]
flang/include/flang/common/reference-counted.h [moved from flang/lib/common/reference-counted.h with 96% similarity]
flang/include/flang/common/reference.h [moved from flang/lib/common/reference.h with 96% similarity]
flang/include/flang/common/restorer.h [moved from flang/lib/common/restorer.h with 95% similarity]
flang/include/flang/common/template.h [moved from flang/lib/common/template.h with 99% similarity]
flang/include/flang/common/uint128.h [moved from flang/lib/common/uint128.h with 99% similarity]
flang/include/flang/common/unsigned-const-division.h [moved from flang/lib/common/unsigned-const-division.h with 97% similarity]
flang/include/flang/common/unwrap.h [moved from flang/lib/common/unwrap.h with 98% similarity]
flang/include/flang/decimal/binary-floating-point.h [moved from flang/lib/decimal/binary-floating-point.h with 97% similarity]
flang/include/flang/decimal/decimal.h [moved from flang/lib/decimal/decimal.h with 98% similarity]
flang/include/flang/evaluate/call.h [moved from flang/lib/evaluate/call.h with 97% similarity]
flang/include/flang/evaluate/characteristics.h [moved from flang/lib/evaluate/characteristics.h with 97% similarity]
flang/include/flang/evaluate/check-expression.h [moved from flang/lib/evaluate/check-expression.h with 97% similarity]
flang/include/flang/evaluate/common.h [moved from flang/lib/evaluate/common.h with 96% similarity]
flang/include/flang/evaluate/complex.h [moved from flang/lib/evaluate/complex.h with 98% similarity]
flang/include/flang/evaluate/constant.h [moved from flang/lib/evaluate/constant.h with 98% similarity]
flang/include/flang/evaluate/expression.h [moved from flang/lib/evaluate/expression.h with 99% similarity]
flang/include/flang/evaluate/fold.h [moved from flang/lib/evaluate/fold.h with 97% similarity]
flang/include/flang/evaluate/formatting.h [moved from flang/lib/evaluate/formatting.h with 94% similarity]
flang/include/flang/evaluate/integer.h [moved from flang/lib/evaluate/integer.h with 99% similarity]
flang/include/flang/evaluate/intrinsics-library.h [moved from flang/lib/evaluate/intrinsics-library.h with 98% similarity]
flang/include/flang/evaluate/intrinsics.h [moved from flang/lib/evaluate/intrinsics.h with 93% similarity]
flang/include/flang/evaluate/logical.h [moved from flang/lib/evaluate/logical.h with 97% similarity]
flang/include/flang/evaluate/real.h [moved from flang/lib/evaluate/real.h with 99% similarity]
flang/include/flang/evaluate/rounding-bits.h [moved from flang/lib/evaluate/rounding-bits.h with 97% similarity]
flang/include/flang/evaluate/shape.h [moved from flang/lib/evaluate/shape.h with 97% similarity]
flang/include/flang/evaluate/static-data.h [moved from flang/lib/evaluate/static-data.h with 95% similarity]
flang/include/flang/evaluate/tools.h [moved from flang/lib/evaluate/tools.h with 98% similarity]
flang/include/flang/evaluate/traverse.h [moved from flang/lib/evaluate/traverse.h with 98% similarity]
flang/include/flang/evaluate/type.h [moved from flang/lib/evaluate/type.h with 99% similarity]
flang/include/flang/evaluate/variable.h [moved from flang/lib/evaluate/variable.h with 98% similarity]
flang/include/flang/parser/char-block.h [moved from flang/lib/parser/char-block.h with 98% similarity]
flang/include/flang/parser/char-buffer.h [moved from flang/lib/parser/char-buffer.h with 97% similarity]
flang/include/flang/parser/char-set.h [moved from flang/lib/parser/char-set.h with 97% similarity]
flang/include/flang/parser/characters.h [moved from flang/lib/parser/characters.h with 99% similarity]
flang/include/flang/parser/dump-parse-tree.h [moved from flang/lib/parser/dump-parse-tree.h with 99% similarity]
flang/include/flang/parser/format-specification.h [moved from flang/lib/parser/format-specification.h with 98% similarity]
flang/include/flang/parser/instrumented-parser.h [moved from flang/lib/parser/instrumented-parser.h with 94% similarity]
flang/include/flang/parser/message.h [moved from flang/lib/parser/message.h with 98% similarity]
flang/include/flang/parser/parse-state.h [moved from flang/lib/parser/parse-state.h with 96% similarity]
flang/include/flang/parser/parse-tree-visitor.h [moved from flang/lib/parser/parse-tree-visitor.h with 99% similarity]
flang/include/flang/parser/parse-tree.h [moved from flang/lib/parser/parse-tree.h with 99% similarity]
flang/include/flang/parser/parsing.h [moved from flang/lib/parser/parsing.h with 95% similarity]
flang/include/flang/parser/provenance.h [moved from flang/lib/parser/provenance.h with 98% similarity]
flang/include/flang/parser/source.h [moved from flang/lib/parser/source.h with 97% similarity]
flang/include/flang/parser/tools.h [moved from flang/lib/parser/tools.h with 97% similarity]
flang/include/flang/parser/unparse.h [moved from flang/lib/parser/unparse.h with 95% similarity]
flang/include/flang/parser/user-state.h [moved from flang/lib/parser/user-state.h with 94% similarity]
flang/include/flang/semantics/attr.h [moved from flang/lib/semantics/attr.h with 92% similarity]
flang/include/flang/semantics/expression.h [moved from flang/lib/semantics/expression.h with 97% similarity]
flang/include/flang/semantics/scope.h [moved from flang/lib/semantics/scope.h with 97% similarity]
flang/include/flang/semantics/semantics.h [moved from flang/lib/semantics/semantics.h with 97% similarity]
flang/include/flang/semantics/symbol.h [moved from flang/lib/semantics/symbol.h with 99% similarity]
flang/include/flang/semantics/tools.h [moved from flang/lib/semantics/tools.h with 98% similarity]
flang/include/flang/semantics/type.h [moved from flang/lib/semantics/type.h with 98% similarity]
flang/include/flang/semantics/unparse-with-symbols.h [moved from flang/lib/semantics/unparse-with-symbols.h with 87% similarity]
flang/lib/common/Fortran-features.cc
flang/lib/common/Fortran.cc
flang/lib/common/default-kinds.cc
flang/lib/common/idioms.cc
flang/lib/decimal/big-radix-floating-point.h
flang/lib/decimal/binary-to-decimal.cc
flang/lib/decimal/decimal-to-binary.cc
flang/lib/evaluate/call.cc
flang/lib/evaluate/character.h
flang/lib/evaluate/characteristics.cc
flang/lib/evaluate/check-expression.cc
flang/lib/evaluate/common.cc
flang/lib/evaluate/complex.cc
flang/lib/evaluate/constant.cc
flang/lib/evaluate/expression.cc
flang/lib/evaluate/fold-implementation.h
flang/lib/evaluate/fold-logical.cc
flang/lib/evaluate/fold.cc
flang/lib/evaluate/formatting.cc
flang/lib/evaluate/host.cc
flang/lib/evaluate/host.h
flang/lib/evaluate/int-power.h
flang/lib/evaluate/integer.cc
flang/lib/evaluate/intrinsics-library-templates.h
flang/lib/evaluate/intrinsics.cc
flang/lib/evaluate/logical.cc
flang/lib/evaluate/real.cc
flang/lib/evaluate/shape.cc
flang/lib/evaluate/static-data.cc
flang/lib/evaluate/tools.cc
flang/lib/evaluate/type.cc
flang/lib/evaluate/variable.cc
flang/lib/parser/Fortran-parsers.cc
flang/lib/parser/basic-parsers.h
flang/lib/parser/char-block.cc
flang/lib/parser/char-buffer.cc
flang/lib/parser/char-set.cc
flang/lib/parser/characters.cc
flang/lib/parser/debug-parser.cc
flang/lib/parser/debug-parser.h
flang/lib/parser/executable-parsers.cc
flang/lib/parser/expr-parsers.cc
flang/lib/parser/expr-parsers.h
flang/lib/parser/instrumented-parser.cc
flang/lib/parser/io-parsers.cc
flang/lib/parser/message.cc
flang/lib/parser/misc-parsers.h
flang/lib/parser/openmp-parsers.cc
flang/lib/parser/parse-tree.cc
flang/lib/parser/parsing.cc
flang/lib/parser/preprocessor.cc
flang/lib/parser/preprocessor.h
flang/lib/parser/prescan.cc
flang/lib/parser/prescan.h
flang/lib/parser/program-parsers.cc
flang/lib/parser/provenance.cc
flang/lib/parser/source.cc
flang/lib/parser/token-parsers.h
flang/lib/parser/token-sequence.cc
flang/lib/parser/token-sequence.h
flang/lib/parser/tools.cc
flang/lib/parser/type-parsers.h
flang/lib/parser/unparse.cc
flang/lib/parser/user-state.cc
flang/lib/semantics/assignment.cc
flang/lib/semantics/assignment.h
flang/lib/semantics/attr.cc
flang/lib/semantics/canonicalize-do.cc
flang/lib/semantics/canonicalize-omp.cc
flang/lib/semantics/check-allocate.cc
flang/lib/semantics/check-allocate.h
flang/lib/semantics/check-arithmeticif.cc
flang/lib/semantics/check-arithmeticif.h
flang/lib/semantics/check-call.cc
flang/lib/semantics/check-call.h
flang/lib/semantics/check-coarray.cc
flang/lib/semantics/check-coarray.h
flang/lib/semantics/check-deallocate.cc
flang/lib/semantics/check-deallocate.h
flang/lib/semantics/check-declarations.cc
flang/lib/semantics/check-do.cc
flang/lib/semantics/check-do.h
flang/lib/semantics/check-if-stmt.cc
flang/lib/semantics/check-if-stmt.h
flang/lib/semantics/check-io.cc
flang/lib/semantics/check-io.h
flang/lib/semantics/check-nullify.cc
flang/lib/semantics/check-nullify.h
flang/lib/semantics/check-omp-structure.cc
flang/lib/semantics/check-omp-structure.h
flang/lib/semantics/check-purity.cc
flang/lib/semantics/check-purity.h
flang/lib/semantics/check-return.cc
flang/lib/semantics/check-return.h
flang/lib/semantics/check-stop.cc
flang/lib/semantics/check-stop.h
flang/lib/semantics/expression.cc
flang/lib/semantics/mod-file.cc
flang/lib/semantics/mod-file.h
flang/lib/semantics/pointer-assignment.cc
flang/lib/semantics/pointer-assignment.h
flang/lib/semantics/program-tree.cc
flang/lib/semantics/program-tree.h
flang/lib/semantics/resolve-labels.cc
flang/lib/semantics/resolve-names-utils.cc
flang/lib/semantics/resolve-names-utils.h
flang/lib/semantics/resolve-names.cc
flang/lib/semantics/rewrite-parse-tree.cc
flang/lib/semantics/scope.cc
flang/lib/semantics/semantics.cc
flang/lib/semantics/symbol.cc
flang/lib/semantics/tools.cc
flang/lib/semantics/type.cc
flang/lib/semantics/unparse-with-symbols.cc
flang/runtime/derived-type.h
flang/runtime/descriptor.cc
flang/runtime/descriptor.h
flang/runtime/format.cc
flang/runtime/format.h
flang/runtime/transformational.cc
flang/runtime/type-code.h
flang/test/decimal/quick-sanity-test.cc
flang/test/decimal/thorough-test.cc
flang/test/evaluate/bit-population-count.cc
flang/test/evaluate/expression.cc
flang/test/evaluate/folding.cc
flang/test/evaluate/fp-testing.h
flang/test/evaluate/integer.cc
flang/test/evaluate/intrinsics.cc
flang/test/evaluate/leading-zero-bit-count.cc
flang/test/evaluate/logical.cc
flang/test/evaluate/real.cc
flang/test/evaluate/uint128.cc
flang/tools/f18/f18-parse-demo.cc
flang/tools/f18/f18.cc
flang/tools/f18/stub-evaluate.cc

index eb45995..21fb1ae 100644 (file)
@@ -18,7 +18,7 @@ IncludeCategories:
     Priority:        4
   - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
     Priority:        3
-  - Regex:           '^"\.\./'
+  - Regex:           '^"(flang|\.\.)/'
     Priority:        2
   - Regex:           '.*'
     Priority:        1
similarity index 94%
rename from flang/lib/common/Fortran-features.h
rename to flang/include/flang/common/Fortran-features.h
index bca723d..0b318e9 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/Fortran-features.h ---------------------------*- C++ -*-===//
+//===-- include/flang/common/Fortran-features.h -----------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,9 +9,9 @@
 #ifndef FORTRAN_COMMON_FORTRAN_FEATURES_H_
 #define FORTRAN_COMMON_FORTRAN_FEATURES_H_
 
-#include "Fortran.h"
-#include "enum-set.h"
-#include "idioms.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/idioms.h"
 
 namespace Fortran::common {
 
similarity index 97%
rename from flang/lib/common/Fortran.h
rename to flang/include/flang/common/Fortran.h
index c4f3677..9c73c32 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/Fortran.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/common/Fortran.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 98%
rename from flang/lib/common/bit-population-count.h
rename to flang/include/flang/common/bit-population-count.h
index fb580ef..0a95643 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/bit-population-count.h -----------------------*- C++ -*-===//
+//===-- include/flang/common/bit-population-count.h -------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 98%
rename from flang/lib/common/constexpr-bitset.h
rename to flang/include/flang/common/constexpr-bitset.h
index 100b5c3..1125655 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/constexpr-bitset.h ---------------------------*- C++ -*-===//
+//===-- include/flang/common/constexpr-bitset.h -----------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 96%
rename from flang/lib/common/default-kinds.h
rename to flang/include/flang/common/default-kinds.h
index a888e58..e9532ad 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/default-kinds.h ------------------------------*- C++ -*-===//
+//===-- include/flang/common/default-kinds.h --------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_COMMON_DEFAULT_KINDS_H_
 #define FORTRAN_COMMON_DEFAULT_KINDS_H_
 
-#include "Fortran.h"
+#include "flang/common/Fortran.h"
 #include <cstdint>
 
 namespace Fortran::common {
similarity index 99%
rename from flang/lib/common/enum-set.h
rename to flang/include/flang/common/enum-set.h
index d3f55b3..0414180 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/enum-set.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/common/enum-set.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 99%
rename from flang/lib/common/format.h
rename to flang/include/flang/common/format.h
index df056f8..92cd0e9 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/format.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/common/format.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,8 +9,8 @@
 #ifndef FORTRAN_COMMON_FORMAT_H_
 #define FORTRAN_COMMON_FORMAT_H_
 
-#include "Fortran.h"
 #include "enum-set.h"
+#include "flang/common/Fortran.h"
 #include <cstring>
 
 // Define a FormatValidator class template to validate a format expression
similarity index 98%
rename from flang/lib/common/idioms.h
rename to flang/include/flang/common/idioms.h
index 9e1ea7c..8debe21 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/idioms.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/common/idioms.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 98%
rename from flang/lib/common/indirection.h
rename to flang/include/flang/common/indirection.h
index 4e8ea32..fcf0554 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/indirection.h --------------------------------*- C++ -*-===//
+//===-- include/flang/common/indirection.h ----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 98%
rename from flang/lib/common/interval.h
rename to flang/include/flang/common/interval.h
index ca8a346..144f719 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/interval.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/common/interval.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -1,4 +1,4 @@
-//===-- lib/common/leading-zero-bit-count.h ---------------------*- C++ -*-===//
+//===-- include/flang/common/leading-zero-bit-count.h -----------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 96%
rename from flang/lib/common/reference-counted.h
rename to flang/include/flang/common/reference-counted.h
index 64065ff..d7dc68c 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/reference-counted.h --------------------------*- C++ -*-===//
+//===-- include/flang/common/reference-counted.h ----------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 96%
rename from flang/lib/common/reference.h
rename to flang/include/flang/common/reference.h
index 053f290..8f01b65 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/reference.h ----------------------------------*- C++ -*-===//
+//===-- include/flang/common/reference.h ------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 95%
rename from flang/lib/common/restorer.h
rename to flang/include/flang/common/restorer.h
index 4677345..95b730b 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/restorer.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/common/restorer.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 99%
rename from flang/lib/common/template.h
rename to flang/include/flang/common/template.h
index 0d344bb..c8a18e7 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/template.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/common/template.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,6 +9,7 @@
 #ifndef FORTRAN_COMMON_TEMPLATE_H_
 #define FORTRAN_COMMON_TEMPLATE_H_
 
+#include "flang/common/idioms.h"
 #include <functional>
 #include <optional>
 #include <tuple>
similarity index 99%
rename from flang/lib/common/uint128.h
rename to flang/include/flang/common/uint128.h
index 51c29a5..0129101 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/uint128.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/common/uint128.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -1,4 +1,4 @@
-//===-- lib/common/unsigned-const-division.h --------------------*- C++ -*-===//
+//===-- include/flang/common/unsigned-const-division.h ----------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 98%
rename from flang/lib/common/unwrap.h
rename to flang/include/flang/common/unwrap.h
index ce066b9..1370b14 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/common/unwrap.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/common/unwrap.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -1,4 +1,4 @@
-//===-- lib/decimal/binary-floating-point.h ---------------------*- C++ -*-===//
+//===-- include/flang/decimal/binary-floating-point.h -----------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -12,7 +12,7 @@
 // Access and manipulate the fields of an IEEE-754 binary
 // floating-point value via a generalized template.
 
-#include "../common/uint128.h"
+#include "flang/common/uint128.h"
 #include <cinttypes>
 #include <climits>
 #include <cstring>
similarity index 98%
rename from flang/lib/decimal/decimal.h
rename to flang/include/flang/decimal/decimal.h
index a8f46f9..812d08f 100644 (file)
@@ -1,4 +1,4 @@
-/*===-- lib/decimal/decimal.h -------------------------------------*- C++ -*-===
+/*===-- include/flang/decimal/decimal.h ---------------------------*- C++ -*-===
  *
  * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  * See https://llvm.org/LICENSE.txt for license information.
similarity index 97%
rename from flang/lib/evaluate/call.h
rename to flang/include/flang/evaluate/call.h
index 5a048da..97d1ea1 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/call.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/call.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 #include "constant.h"
 #include "formatting.h"
 #include "type.h"
-#include "../common/indirection.h"
-#include "../common/reference.h"
-#include "../parser/char-block.h"
-#include "../semantics/attr.h"
+#include "flang/common/indirection.h"
+#include "flang/common/reference.h"
+#include "flang/parser/char-block.h"
+#include "flang/semantics/attr.h"
 #include <optional>
 #include <ostream>
 #include <vector>
similarity index 97%
rename from flang/lib/evaluate/characteristics.h
rename to flang/include/flang/evaluate/characteristics.h
index 3da4d63..9e61602 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/characteristics.h --------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/characteristics.h ----------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 #include "expression.h"
 #include "shape.h"
 #include "type.h"
-#include "../common/Fortran.h"
-#include "../common/enum-set.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
-#include "../parser/char-block.h"
-#include "../semantics/symbol.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
+#include "flang/parser/char-block.h"
+#include "flang/semantics/symbol.h"
 #include <optional>
 #include <ostream>
 #include <string>
similarity index 97%
rename from flang/lib/evaluate/check-expression.h
rename to flang/include/flang/evaluate/check-expression.h
index b19d747..31a79fb 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/check-expression.h -------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/check-expression.h ---------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 96%
rename from flang/lib/evaluate/common.h
rename to flang/include/flang/evaluate/common.h
index e716d21..f24e93d 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/common.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/common.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 #define FORTRAN_EVALUATE_COMMON_H_
 
 #include "intrinsics-library.h"
-#include "../common/Fortran.h"
-#include "../common/default-kinds.h"
-#include "../common/enum-set.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
-#include "../common/restorer.h"
-#include "../parser/char-block.h"
-#include "../parser/message.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/default-kinds.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
+#include "flang/common/restorer.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/message.h"
 #include <cinttypes>
 #include <map>
 
similarity index 98%
rename from flang/lib/evaluate/complex.h
rename to flang/include/flang/evaluate/complex.h
index 8d35203..201cbce 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/complex.h ----------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/complex.h ------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 98%
rename from flang/lib/evaluate/constant.h
rename to flang/include/flang/evaluate/constant.h
index 290343b..833702a 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/constant.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/constant.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -11,8 +11,8 @@
 
 #include "formatting.h"
 #include "type.h"
-#include "../common/default-kinds.h"
-#include "../common/reference.h"
+#include "flang/common/default-kinds.h"
+#include "flang/common/reference.h"
 #include <map>
 #include <ostream>
 #include <vector>
similarity index 99%
rename from flang/lib/evaluate/expression.h
rename to flang/include/flang/evaluate/expression.h
index 00363b5..b061191 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/expression.h -------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/expression.h ---------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 #include "formatting.h"
 #include "type.h"
 #include "variable.h"
-#include "../common/Fortran.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
-#include "../common/template.h"
-#include "../parser/char-block.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
+#include "flang/common/template.h"
+#include "flang/parser/char-block.h"
 #include <algorithm>
 #include <list>
 #include <ostream>
similarity index 97%
rename from flang/lib/evaluate/fold.h
rename to flang/include/flang/evaluate/fold.h
index 88daa51..5f33d69 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/fold.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/fold.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 94%
rename from flang/lib/evaluate/formatting.h
rename to flang/include/flang/evaluate/formatting.h
index 4774b4b..a2b8458 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/formatting.h -------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/formatting.h ---------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -19,7 +19,7 @@
 // This header is meant to be included by the headers that define the several
 // representational class templates that need it, not by external clients.
 
-#include "../common/indirection.h"
+#include "flang/common/indirection.h"
 #include <optional>
 #include <ostream>
 #include <type_traits>
similarity index 99%
rename from flang/lib/evaluate/integer.h
rename to flang/include/flang/evaluate/integer.h
index 78f9b84..1bff2bb 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/integer.h ----------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/integer.h ------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -17,9 +17,9 @@
 // (*"Signed" here means two's-complement, just to be clear.  Ones'-complement
 // and signed-magnitude encodings appear to be extinct in 2018.)
 
-#include "common.h"
-#include "../common/bit-population-count.h"
-#include "../common/leading-zero-bit-count.h"
+#include "flang/common/bit-population-count.h"
+#include "flang/common/leading-zero-bit-count.h"
+#include "flang/evaluate/common.h"
 #include <cinttypes>
 #include <climits>
 #include <cstddef>
similarity index 98%
rename from flang/lib/evaluate/intrinsics-library.h
rename to flang/include/flang/evaluate/intrinsics-library.h
index a558add..a7a1959 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/intrinsics-library.h -----------------------*- C++ -*-===//
+//===-- include/flang/evaluate/intrinsics-library.h -------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 93%
rename from flang/lib/evaluate/intrinsics.h
rename to flang/include/flang/evaluate/intrinsics.h
index 036a401..525e090 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/intrinsics.h -------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/intrinsics.h ---------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -12,9 +12,9 @@
 #include "call.h"
 #include "characteristics.h"
 #include "type.h"
-#include "../common/default-kinds.h"
-#include "../parser/char-block.h"
-#include "../parser/message.h"
+#include "flang/common/default-kinds.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/message.h"
 #include <optional>
 #include <ostream>
 #include <string>
similarity index 97%
rename from flang/lib/evaluate/logical.h
rename to flang/include/flang/evaluate/logical.h
index e98637a..d76abf8 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/logical.h ----------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/logical.h ------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 99%
rename from flang/lib/evaluate/real.h
rename to flang/include/flang/evaluate/real.h
index 92bb7d1..84e2d55 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/real.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/real.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,10 +9,10 @@
 #ifndef FORTRAN_EVALUATE_REAL_H_
 #define FORTRAN_EVALUATE_REAL_H_
 
-#include "common.h"
 #include "formatting.h"
 #include "integer.h"
 #include "rounding-bits.h"
+#include "flang/evaluate/common.h"
 #include <cinttypes>
 #include <limits>
 #include <ostream>
similarity index 97%
rename from flang/lib/evaluate/rounding-bits.h
rename to flang/include/flang/evaluate/rounding-bits.h
index 07db7ce..bc57716 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/rounding-bits.h ----------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/rounding-bits.h ------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 97%
rename from flang/lib/evaluate/shape.h
rename to flang/include/flang/evaluate/shape.h
index 15e16eb..ca9700b 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/shape.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/shape.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 #define FORTRAN_EVALUATE_SHAPE_H_
 
 #include "expression.h"
-#include "tools.h"
 #include "traverse.h"
-#include "type.h"
 #include "variable.h"
-#include "../common/indirection.h"
+#include "flang/common/indirection.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/type.h"
 #include <optional>
 #include <variant>
 
similarity index 95%
rename from flang/lib/evaluate/static-data.h
rename to flang/include/flang/evaluate/static-data.h
index 902dcff..ce66351 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/static-data.h ------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/static-data.h --------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -13,7 +13,7 @@
 
 #include "formatting.h"
 #include "type.h"
-#include "../common/idioms.h"
+#include "flang/common/idioms.h"
 #include <cinttypes>
 #include <memory>
 #include <optional>
similarity index 98%
rename from flang/lib/evaluate/tools.h
rename to flang/include/flang/evaluate/tools.h
index 5b2824a..9a47361 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/tools.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/tools.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,15 +9,15 @@
 #ifndef FORTRAN_EVALUATE_TOOLS_H_
 #define FORTRAN_EVALUATE_TOOLS_H_
 
-#include "constant.h"
-#include "expression.h"
 #include "traverse.h"
-#include "../common/idioms.h"
-#include "../common/template.h"
-#include "../common/unwrap.h"
-#include "../parser/message.h"
-#include "../semantics/attr.h"
-#include "../semantics/symbol.h"
+#include "flang/common/idioms.h"
+#include "flang/common/template.h"
+#include "flang/common/unwrap.h"
+#include "flang/evaluate/constant.h"
+#include "flang/evaluate/expression.h"
+#include "flang/parser/message.h"
+#include "flang/semantics/attr.h"
+#include "flang/semantics/symbol.h"
 #include <array>
 #include <optional>
 #include <set>
similarity index 98%
rename from flang/lib/evaluate/traverse.h
rename to flang/include/flang/evaluate/traverse.h
index 2fa8995..326104b 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/traverse.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/traverse.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -35,8 +35,8 @@
 // - Overloads of operator() in each visitor handle the cases of interest.
 
 #include "expression.h"
-#include "../semantics/symbol.h"
-#include "../semantics/type.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/type.h"
 #include <set>
 #include <type_traits>
 
similarity index 99%
rename from flang/lib/evaluate/type.h
rename to flang/include/flang/evaluate/type.h
index 91a7c60..29dde4e 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/type.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/type.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -22,9 +22,9 @@
 #include "integer.h"
 #include "logical.h"
 #include "real.h"
-#include "../common/Fortran.h"
-#include "../common/idioms.h"
-#include "../common/template.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
+#include "flang/common/template.h"
 #include <cinttypes>
 #include <optional>
 #include <string>
similarity index 98%
rename from flang/lib/evaluate/variable.h
rename to flang/include/flang/evaluate/variable.h
index 15cd638..bbbdd7c 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/evaluate/variable.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/variable.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 #include "formatting.h"
 #include "static-data.h"
 #include "type.h"
-#include "../common/idioms.h"
-#include "../common/reference.h"
-#include "../common/template.h"
-#include "../parser/char-block.h"
+#include "flang/common/idioms.h"
+#include "flang/common/reference.h"
+#include "flang/common/template.h"
+#include "flang/parser/char-block.h"
 #include <optional>
 #include <ostream>
 #include <variant>
similarity index 98%
rename from flang/lib/parser/char-block.h
rename to flang/include/flang/parser/char-block.h
index 3f5585e..f05211f 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/char-block.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/parser/char-block.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -11,7 +11,7 @@
 
 // Describes a contiguous block of characters; does not own their storage.
 
-#include "../common/interval.h"
+#include "flang/common/interval.h"
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
similarity index 97%
rename from flang/lib/parser/char-buffer.h
rename to flang/include/flang/parser/char-buffer.h
index c5c0c8a..b9f66c6 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/char-buffer.h --------------------------------*- C++ -*-===//
+//===-- include/flang/parser/char-buffer.h ----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 97%
rename from flang/lib/parser/char-set.h
rename to flang/include/flang/parser/char-set.h
index 6f041b2..9bac7ea 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/char-set.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/parser/char-set.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 99%
rename from flang/lib/parser/characters.h
rename to flang/include/flang/parser/characters.h
index ceb7aa1..102d886 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/characters.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/parser/characters.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 99%
rename from flang/lib/parser/dump-parse-tree.h
rename to flang/include/flang/parser/dump-parse-tree.h
index 1ebbbbd..aca1813 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/dump-parse-tree.h ----------------------------*- C++ -*-===//
+//===-- include/flang/parser/dump-parse-tree.h ------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -13,8 +13,8 @@
 #include "parse-tree-visitor.h"
 #include "parse-tree.h"
 #include "unparse.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
 #include <ostream>
 #include <sstream>
 #include <string>
similarity index 98%
rename from flang/lib/parser/format-specification.h
rename to flang/include/flang/parser/format-specification.h
index 64bce96..6f1de18 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/format-specification.h -----------------------*- C++ -*-===//
+//===-- include/flang/parser/format-specification.h -------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 94%
rename from flang/lib/parser/instrumented-parser.h
rename to flang/include/flang/parser/instrumented-parser.h
index 66bb73e..ec760a6 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/instrumented-parser.h ------------------------*- C++ -*-===//
+//===-- include/flang/parser/instrumented-parser.h --------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,10 +9,10 @@
 #ifndef FORTRAN_PARSER_INSTRUMENTED_PARSER_H_
 #define FORTRAN_PARSER_INSTRUMENTED_PARSER_H_
 
-#include "message.h"
 #include "parse-state.h"
-#include "provenance.h"
 #include "user-state.h"
+#include "flang/parser/message.h"
+#include "flang/parser/provenance.h"
 #include <cstddef>
 #include <map>
 #include <ostream>
similarity index 98%
rename from flang/lib/parser/message.h
rename to flang/include/flang/parser/message.h
index eb946c2..fd62f46 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/message.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/parser/message.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -15,9 +15,9 @@
 #include "char-block.h"
 #include "char-set.h"
 #include "provenance.h"
-#include "../common/idioms.h"
-#include "../common/reference-counted.h"
-#include "../common/restorer.h"
+#include "flang/common/idioms.h"
+#include "flang/common/reference-counted.h"
+#include "flang/common/restorer.h"
 #include <cstddef>
 #include <cstring>
 #include <forward_list>
similarity index 96%
rename from flang/lib/parser/parse-state.h
rename to flang/include/flang/parser/parse-state.h
index 03bfaba..afd4516 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/parse-state.h --------------------------------*- C++ -*-===//
+//===-- include/flang/parser/parse-state.h ----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // attempts.  Must be efficient to duplicate and assign for backtracking
 // and recovery during parsing!
 
-#include "characters.h"
-#include "message.h"
-#include "provenance.h"
 #include "user-state.h"
-#include "../common/Fortran-features.h"
-#include "../common/idioms.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/common/idioms.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/message.h"
+#include "flang/parser/provenance.h"
 #include <cstddef>
 #include <cstring>
 #include <list>
similarity index 99%
rename from flang/lib/parser/parse-tree-visitor.h
rename to flang/include/flang/parser/parse-tree-visitor.h
index 2fac692..b2c49fe 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/parse-tree-visitor.h -------------------------*- C++ -*-===//
+//===-- include/flang/parser/parse-tree-visitor.h ---------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 99%
rename from flang/lib/parser/parse-tree.h
rename to flang/include/flang/parser/parse-tree.h
index e94432e..2963895 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/parse-tree.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/parser/parse-tree.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -22,9 +22,9 @@
 #include "format-specification.h"
 #include "message.h"
 #include "provenance.h"
-#include "../common/Fortran.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
 #include <cinttypes>
 #include <list>
 #include <memory>
similarity index 95%
rename from flang/lib/parser/parsing.h
rename to flang/include/flang/parser/parsing.h
index d251b62..a163a77 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/parsing.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/parser/parsing.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -14,7 +14,7 @@
 #include "message.h"
 #include "parse-tree.h"
 #include "provenance.h"
-#include "../common/Fortran-features.h"
+#include "flang/common/Fortran-features.h"
 #include <optional>
 #include <ostream>
 #include <string>
similarity index 98%
rename from flang/lib/parser/provenance.h
rename to flang/include/flang/parser/provenance.h
index 52e6d74..08cdf51 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/provenance.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/parser/provenance.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -13,8 +13,8 @@
 #include "char-buffer.h"
 #include "characters.h"
 #include "source.h"
-#include "../common/idioms.h"
-#include "../common/interval.h"
+#include "flang/common/idioms.h"
+#include "flang/common/interval.h"
 #include <cstddef>
 #include <map>
 #include <memory>
similarity index 97%
rename from flang/lib/parser/source.h
rename to flang/include/flang/parser/source.h
index 1b809e7..5eb000d 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/source.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/parser/source.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 97%
rename from flang/lib/parser/tools.h
rename to flang/include/flang/parser/tools.h
index 461b0f2..447d08c 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/tools.h --------------------------------------*- C++ -*-===//
+//===-- include/flang/parser/tools.h ----------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 95%
rename from flang/lib/parser/unparse.h
rename to flang/include/flang/parser/unparse.h
index 08d8b84..0055ce3 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/unparse.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/parser/unparse.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
similarity index 94%
rename from flang/lib/parser/user-state.h
rename to flang/include/flang/parser/user-state.h
index cb14ae3..aaf8672 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/parser/user-state.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/parser/user-state.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // parse tree construction so as to avoid any need for representing
 // state in static data.
 
-#include "char-block.h"
-#include "parse-tree.h"
-#include "../common/Fortran-features.h"
-#include "../common/idioms.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/common/idioms.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/parse-tree.h"
 #include <cinttypes>
 #include <optional>
 #include <ostream>
similarity index 92%
rename from flang/lib/semantics/attr.h
rename to flang/include/flang/semantics/attr.h
index 99db4c8..475d689 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/semantics/attr.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/attr.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,8 +9,8 @@
 #ifndef FORTRAN_SEMANTICS_ATTR_H_
 #define FORTRAN_SEMANTICS_ATTR_H_
 
-#include "../common/enum-set.h"
-#include "../common/idioms.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/idioms.h"
 #include <cinttypes>
 #include <string>
 
similarity index 97%
rename from flang/lib/semantics/expression.h
rename to flang/include/flang/semantics/expression.h
index bac545b..110a0bd 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/semantics/expression.h ------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/expression.h --------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 #define FORTRAN_SEMANTICS_EXPRESSION_H_
 
 #include "semantics.h"
-#include "../common/Fortran.h"
-#include "../common/indirection.h"
-#include "../evaluate/characteristics.h"
-#include "../evaluate/check-expression.h"
-#include "../evaluate/expression.h"
-#include "../evaluate/fold.h"
-#include "../evaluate/tools.h"
-#include "../evaluate/type.h"
-#include "../parser/char-block.h"
-#include "../parser/parse-tree-visitor.h"
-#include "../parser/parse-tree.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/indirection.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/check-expression.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/type.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree.h"
 #include <map>
 #include <optional>
 #include <variant>
similarity index 97%
rename from flang/lib/semantics/scope.h
rename to flang/include/flang/semantics/scope.h
index c44a687..1de11bb 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/semantics/scope.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/scope.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 
 #include "attr.h"
 #include "symbol.h"
-#include "../common/Fortran.h"
-#include "../common/idioms.h"
-#include "../common/reference.h"
-#include "../parser/message.h"
-#include "../parser/provenance.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
+#include "flang/common/reference.h"
+#include "flang/parser/message.h"
+#include "flang/parser/provenance.h"
 #include <list>
 #include <map>
 #include <optional>
similarity index 97%
rename from flang/lib/semantics/semantics.h
rename to flang/include/flang/semantics/semantics.h
index d7ebb5a..e823f48 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/semantics/semantics.h -------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/semantics.h ---------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 
 #include "scope.h"
 #include "symbol.h"
-#include "../common/Fortran-features.h"
-#include "../evaluate/common.h"
-#include "../evaluate/intrinsics.h"
-#include "../parser/message.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/evaluate/common.h"
+#include "flang/evaluate/intrinsics.h"
+#include "flang/parser/message.h"
 #include <iosfwd>
 #include <string>
 #include <vector>
similarity index 99%
rename from flang/lib/semantics/symbol.h
rename to flang/include/flang/semantics/symbol.h
index b37e560..335e6ed 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/semantics/symbol.h ----------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/symbol.h ------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,9 +10,9 @@
 #define FORTRAN_SEMANTICS_SYMBOL_H_
 
 #include "type.h"
-#include "../common/Fortran.h"
-#include "../common/enum-set.h"
-#include "../common/reference.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/reference.h"
 #include <list>
 #include <optional>
 #include <set>
similarity index 98%
rename from flang/lib/semantics/tools.h
rename to flang/include/flang/semantics/tools.h
index 83741bd..5f56325 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/semantics/tools.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/tools.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // Simple predicates and look-up functions that are best defined
 // canonically for use in semantic checking.
 
-#include "attr.h"
-#include "expression.h"
-#include "semantics.h"
-#include "../common/Fortran.h"
-#include "../evaluate/expression.h"
-#include "../evaluate/type.h"
-#include "../evaluate/variable.h"
-#include "../parser/message.h"
-#include "../parser/parse-tree.h"
+#include "flang/common/Fortran.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/type.h"
+#include "flang/evaluate/variable.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/attr.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/semantics.h"
 #include <functional>
 
 namespace Fortran::semantics {
similarity index 98%
rename from flang/lib/semantics/type.h
rename to flang/include/flang/semantics/type.h
index 9a31423..19d0200 100644 (file)
@@ -1,4 +1,4 @@
-//===-- lib/semantics/type.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/type.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,10 +9,10 @@
 #ifndef FORTRAN_SEMANTICS_TYPE_H_
 #define FORTRAN_SEMANTICS_TYPE_H_
 
-#include "../common/Fortran.h"
-#include "../common/idioms.h"
-#include "../evaluate/expression.h"
-#include "../parser/char-block.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/expression.h"
+#include "flang/parser/char-block.h"
 #include <algorithm>
 #include <iosfwd>
 #include <map>
@@ -1,4 +1,4 @@
-//===-- lib/semantics/unparse-with-symbols.h --------------------*- C++ -*-===//
+//===-- include/flang/semantics/unparse-with-symbols.h ----------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_SEMANTICS_UNPARSE_WITH_SYMBOLS_H_
 #define FORTRAN_SEMANTICS_UNPARSE_WITH_SYMBOLS_H_
 
-#include "../parser/characters.h"
+#include "flang/parser/characters.h"
 #include <iosfwd>
 
 namespace Fortran::parser {
index 8e5e08e..f921626 100644 (file)
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Fortran-features.h"
-#include "Fortran.h"
-#include "idioms.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
 
 namespace Fortran::common {
 
index 35d61f0..8b915bb 100644 (file)
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Fortran.h"
+#include "flang/common/Fortran.h"
 
 namespace Fortran::common {
 
index 4b40c49..1f45993 100644 (file)
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "default-kinds.h"
-#include "idioms.h"
+#include "flang/common/default-kinds.h"
+#include "flang/common/idioms.h"
 
 namespace Fortran::common {
 
index d942269..f27f7b1 100644 (file)
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "idioms.h"
+#include "flang/common/idioms.h"
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
index 7b84015..51eb9ec 100644 (file)
 // for conversions between binary and decimal representations; it is not
 // a general-purpose facility.
 
-#include "binary-floating-point.h"
-#include "decimal.h"
-#include "../common/bit-population-count.h"
-#include "../common/leading-zero-bit-count.h"
-#include "../common/uint128.h"
-#include "../common/unsigned-const-division.h"
+#include "flang/common/bit-population-count.h"
+#include "flang/common/leading-zero-bit-count.h"
+#include "flang/common/uint128.h"
+#include "flang/common/unsigned-const-division.h"
+#include "flang/decimal/binary-floating-point.h"
+#include "flang/decimal/decimal.h"
 #include <cinttypes>
 #include <limits>
 #include <type_traits>
index 50bca73..53b00c3 100644 (file)
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "big-radix-floating-point.h"
-#include "../decimal/decimal.h"
+#include "flang/decimal/decimal.h"
 
 namespace Fortran::decimal {
 
index 34ecb7c..3f57a3b 100644 (file)
@@ -7,10 +7,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "big-radix-floating-point.h"
-#include "binary-floating-point.h"
-#include "decimal.h"
-#include "../common/bit-population-count.h"
-#include "../common/leading-zero-bit-count.h"
+#include "flang/common/bit-population-count.h"
+#include "flang/common/leading-zero-bit-count.h"
+#include "flang/decimal/binary-floating-point.h"
+#include "flang/decimal/decimal.h"
 #include <cinttypes>
 #include <cstring>
 #include <ctype.h>
index ceb5953..a61f679 100644 (file)
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "call.h"
-#include "characteristics.h"
-#include "expression.h"
-#include "tools.h"
-#include "../common/idioms.h"
-#include "../semantics/symbol.h"
+#include "flang/evaluate/call.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/tools.h"
+#include "flang/semantics/symbol.h"
 
 namespace Fortran::evaluate {
 
index 032f729..be1303e 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_EVALUATE_CHARACTER_H_
 #define FORTRAN_EVALUATE_CHARACTER_H_
 
-#include "type.h"
+#include "flang/evaluate/type.h"
 #include <string>
 
 // Provides implementations of intrinsic functions operating on character
index 83c7946..1e4f282 100644 (file)
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "characteristics.h"
-#include "check-expression.h"
-#include "fold.h"
-#include "intrinsics.h"
-#include "tools.h"
-#include "type.h"
-#include "../common/indirection.h"
-#include "../parser/message.h"
-#include "../semantics/scope.h"
-#include "../semantics/symbol.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/common/indirection.h"
+#include "flang/evaluate/check-expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/intrinsics.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/type.h"
+#include "flang/parser/message.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/symbol.h"
 #include <initializer_list>
 #include <ostream>
 
index 92dbb76..31d1454 100644 (file)
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "check-expression.h"
-#include "traverse.h"
-#include "type.h"
-#include "../semantics/symbol.h"
-#include "../semantics/tools.h"
+#include "flang/evaluate/check-expression.h"
+#include "flang/evaluate/traverse.h"
+#include "flang/evaluate/type.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
 
 namespace Fortran::evaluate {
 
index 5bf76ec..a1f7cbb 100644 (file)
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "common.h"
-#include "../common/idioms.h"
+#include "flang/evaluate/common.h"
+#include "flang/common/idioms.h"
 
 using namespace Fortran::parser::literals;
 
index c68228f..e932459 100644 (file)
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "complex.h"
+#include "flang/evaluate/complex.h"
 
 namespace Fortran::evaluate::value {
 
index d49d93f..4c83e34 100644 (file)
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "constant.h"
-#include "expression.h"
-#include "shape.h"
-#include "type.h"
+#include "flang/evaluate/constant.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/shape.h"
+#include "flang/evaluate/type.h"
 #include <string>
 
 namespace Fortran::evaluate {
index 39aa4dc..21a0176 100644 (file)
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "expression.h"
-#include "common.h"
+#include "flang/evaluate/expression.h"
 #include "int-power.h"
-#include "tools.h"
-#include "variable.h"
-#include "../common/idioms.h"
-#include "../parser/message.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/common.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/variable.h"
+#include "flang/parser/message.h"
 #include <string>
 #include <type_traits>
 
index d78c527..fdb85df 100644 (file)
 #define FORTRAN_EVALUATE_FOLD_IMPLEMENTATION_H_
 
 #include "character.h"
-#include "characteristics.h"
-#include "common.h"
-#include "constant.h"
-#include "expression.h"
-#include "fold.h"
-#include "formatting.h"
 #include "host.h"
 #include "int-power.h"
 #include "intrinsics-library-templates.h"
-#include "shape.h"
-#include "tools.h"
-#include "traverse.h"
-#include "type.h"
-#include "../common/indirection.h"
-#include "../common/template.h"
-#include "../common/unwrap.h"
-#include "../parser/message.h"
-#include "../semantics/scope.h"
-#include "../semantics/symbol.h"
-#include "../semantics/tools.h"
+#include "flang/common/indirection.h"
+#include "flang/common/template.h"
+#include "flang/common/unwrap.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/common.h"
+#include "flang/evaluate/constant.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/formatting.h"
+#include "flang/evaluate/shape.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/traverse.h"
+#include "flang/evaluate/type.h"
+#include "flang/parser/message.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
 #include <algorithm>
 #include <cmath>
 #include <complex>
index fd67fb1..649f745 100644 (file)
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "check-expression.h"
 #include "fold-implementation.h"
+#include "flang/evaluate/check-expression.h"
 
 namespace Fortran::evaluate {
 
index 0a36c91..af1de40 100644 (file)
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "fold.h"
+#include "flang/evaluate/fold.h"
 #include "fold-implementation.h"
 
 namespace Fortran::evaluate {
index 67320ac..6eb43a4 100644 (file)
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "formatting.h"
-#include "call.h"
-#include "constant.h"
-#include "expression.h"
-#include "fold.h"
-#include "tools.h"
-#include "../parser/characters.h"
-#include "../semantics/symbol.h"
+#include "flang/evaluate/formatting.h"
+#include "flang/evaluate/call.h"
+#include "flang/evaluate/constant.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/tools.h"
+#include "flang/parser/characters.h"
+#include "flang/semantics/symbol.h"
 #include <sstream>
 
 namespace Fortran::evaluate {
index 718bc7a..62dd448 100644 (file)
@@ -8,7 +8,7 @@
 
 #include "host.h"
 
-#include "../common/idioms.h"
+#include "flang/common/idioms.h"
 #include <cerrno>
 #include <cfenv>
 
index fb30590..f2d8c1d 100644 (file)
@@ -17,7 +17,7 @@
 // hardware type maps to Fortran intrinsic type T. Then HostType<T> can be used
 // to safely refer to this hardware type.
 
-#include "type.h"
+#include "flang/evaluate/type.h"
 #include <cfenv>
 #include <complex>
 #include <cstdint>
index 01b0908..6a6fe83 100644 (file)
@@ -11,7 +11,7 @@
 
 // Computes an integer power of a real or complex value.
 
-#include "common.h"
+#include "flang/evaluate/common.h"
 
 namespace Fortran::evaluate {
 
index abc9473..30484d9 100644 (file)
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "integer.h"
+#include "flang/evaluate/integer.h"
 
 namespace Fortran::evaluate::value {
 
index 78b0c67..4ab657d 100644 (file)
@@ -17,9 +17,9 @@
 // which version should be instantiated in a generic way.
 
 #include "host.h"
-#include "intrinsics-library.h"
-#include "type.h"
-#include "../common/template.h"
+#include "flang/common/template.h"
+#include "flang/evaluate/intrinsics-library.h"
+#include "flang/evaluate/type.h"
 
 #include <tuple>
 #include <type_traits>
index e57bfcd..1a8b5ba 100644 (file)
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "intrinsics.h"
-#include "common.h"
-#include "expression.h"
-#include "fold.h"
-#include "shape.h"
-#include "tools.h"
-#include "type.h"
-#include "../common/Fortran.h"
-#include "../common/enum-set.h"
-#include "../common/idioms.h"
+#include "flang/evaluate/intrinsics.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/common.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/shape.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/type.h"
 #include <algorithm>
 #include <map>
 #include <ostream>
index e3fcc0e..bdbfedb 100644 (file)
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "logical.h"
+#include "flang/evaluate/logical.h"
 
 namespace Fortran::evaluate::value {
 
index 44b7cbe..b803a8e 100644 (file)
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "real.h"
+#include "flang/evaluate/real.h"
 #include "int-power.h"
-#include "../common/idioms.h"
-#include "../decimal/decimal.h"
-#include "../parser/characters.h"
+#include "flang/common/idioms.h"
+#include "flang/decimal/decimal.h"
+#include "flang/parser/characters.h"
 #include <limits>
 
 namespace Fortran::evaluate::value {
index 1ccbfea..62bc879 100644 (file)
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "shape.h"
-#include "characteristics.h"
-#include "fold.h"
-#include "intrinsics.h"
-#include "tools.h"
-#include "type.h"
-#include "../common/idioms.h"
-#include "../common/template.h"
-#include "../parser/message.h"
-#include "../semantics/symbol.h"
+#include "flang/evaluate/shape.h"
+#include "flang/common/idioms.h"
+#include "flang/common/template.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/intrinsics.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/type.h"
+#include "flang/parser/message.h"
+#include "flang/semantics/symbol.h"
 #include <functional>
 
 using namespace std::placeholders;  // _1, _2, &c. for std::bind()
index 3b08ddb..f5311ce 100644 (file)
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "static-data.h"
-#include "../parser/characters.h"
+#include "flang/evaluate/static-data.h"
+#include "flang/parser/characters.h"
 
 namespace Fortran::evaluate {
 
index 2b1b907..4710343 100644 (file)
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "tools.h"
-#include "characteristics.h"
-#include "traverse.h"
-#include "../common/idioms.h"
-#include "../parser/message.h"
+#include "flang/evaluate/tools.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/traverse.h"
+#include "flang/parser/message.h"
 #include <algorithm>
 #include <variant>
 
index c78c8ee..bf7e801 100644 (file)
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "type.h"
-#include "expression.h"
-#include "fold.h"
-#include "../common/idioms.h"
-#include "../common/template.h"
-#include "../parser/characters.h"
-#include "../semantics/scope.h"
-#include "../semantics/symbol.h"
-#include "../semantics/tools.h"
-#include "../semantics/type.h"
+#include "flang/evaluate/type.h"
+#include "flang/common/idioms.h"
+#include "flang/common/template.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/parser/characters.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
+#include "flang/semantics/type.h"
 #include <algorithm>
 #include <optional>
 #include <sstream>
index a0f1685..0922ba6 100644 (file)
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "variable.h"
-#include "fold.h"
-#include "tools.h"
-#include "../common/idioms.h"
-#include "../parser/char-block.h"
-#include "../parser/characters.h"
-#include "../parser/message.h"
-#include "../semantics/symbol.h"
+#include "flang/evaluate/variable.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/tools.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/message.h"
+#include "flang/semantics/symbol.h"
 #include <ostream>
 #include <type_traits>
 
index 9efa895..bfc7122 100644 (file)
 #include "basic-parsers.h"
 #include "expr-parsers.h"
 #include "misc-parsers.h"
-#include "parse-tree.h"
 #include "stmt-parser.h"
 #include "token-parsers.h"
 #include "type-parser-implementation.h"
-#include "user-state.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/parser/user-state.h"
 
 namespace Fortran::parser {
 
index 3cad011..31491a2 100644 (file)
 // This header defines the fundamental parser class templates and helper
 // template functions.  See parser-combinators.txt for documentation.
 
-#include "char-block.h"
-#include "message.h"
-#include "parse-state.h"
-#include "provenance.h"
-#include "user-state.h"
-#include "../common/Fortran-features.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-state.h"
+#include "flang/parser/provenance.h"
+#include "flang/parser/user-state.h"
 #include <cstring>
 #include <functional>
 #include <list>
index e8254d0..8c9784e 100644 (file)
@@ -6,7 +6,7 @@
 //
 //----------------------------------------------------------------------------//
 
-#include "char-block.h"
+#include "flang/parser/char-block.h"
 #include <ostream>
 
 namespace Fortran::parser {
index 5cfddb8..6c42624 100644 (file)
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "char-buffer.h"
-#include "../common/idioms.h"
+#include "flang/parser/char-buffer.h"
+#include "flang/common/idioms.h"
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
index ae56e9a..c8a324f 100644 (file)
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "char-set.h"
+#include "flang/parser/char-set.h"
 
 namespace Fortran::parser {
 
index 89f16ec..d6fc0d6 100644 (file)
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "characters.h"
-#include "../common/idioms.h"
+#include "flang/parser/characters.h"
+#include "flang/common/idioms.h"
 #include <algorithm>
 #include <cstddef>
 #include <optional>
index 1f2a910..97fdf28 100644 (file)
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "debug-parser.h"
-#include "user-state.h"
+#include "flang/parser/user-state.h"
 #include <ostream>
 #include <string>
 
index 8287164..dbb812c 100644 (file)
@@ -14,7 +14,7 @@
 // flow of the parsers.  Not to be used in production.
 
 #include "basic-parsers.h"
-#include "parse-state.h"
+#include "flang/parser/parse-state.h"
 #include <cstddef>
 #include <optional>
 
index 1cbc493..a1557a0 100644 (file)
@@ -9,14 +9,14 @@
 // Per-type parsers for executable statements
 
 #include "basic-parsers.h"
-#include "characters.h"
 #include "debug-parser.h"
 #include "expr-parsers.h"
 #include "misc-parsers.h"
-#include "parse-tree.h"
 #include "stmt-parser.h"
 #include "token-parsers.h"
 #include "type-parser-implementation.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/parse-tree.h"
 
 namespace Fortran::parser {
 
index 4989a6b..14bc391 100644 (file)
 
 #include "expr-parsers.h"
 #include "basic-parsers.h"
-#include "characters.h"
 #include "debug-parser.h"
 #include "misc-parsers.h"
-#include "parse-tree.h"
 #include "stmt-parser.h"
 #include "token-parsers.h"
 #include "type-parser-implementation.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/parse-tree.h"
 
 namespace Fortran::parser {
 
index 3ed9a2c..fcaeeda 100644 (file)
@@ -10,9 +10,9 @@
 #define FORTRAN_PARSER_EXPR_PARSERS_H_
 
 #include "basic-parsers.h"
-#include "parse-tree.h"
 #include "token-parsers.h"
 #include "type-parsers.h"
+#include "flang/parser/parse-tree.h"
 
 namespace Fortran::parser {
 
index 24a59cc..b845b22 100644 (file)
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "instrumented-parser.h"
-#include "message.h"
-#include "provenance.h"
+#include "flang/parser/instrumented-parser.h"
+#include "flang/parser/message.h"
+#include "flang/parser/provenance.h"
 #include <map>
 #include <ostream>
 
index 9577008..5488a32 100644 (file)
@@ -9,14 +9,14 @@
 // Per-type parsers for I/O statements and FORMAT
 
 #include "basic-parsers.h"
-#include "characters.h"
 #include "debug-parser.h"
 #include "expr-parsers.h"
 #include "misc-parsers.h"
-#include "parse-tree.h"
 #include "stmt-parser.h"
 #include "token-parsers.h"
 #include "type-parser-implementation.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/parse-tree.h"
 
 namespace Fortran::parser {
 // R1201 io-unit -> file-unit-number | * | internal-file-variable
index a8a321a..5589707 100644 (file)
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "message.h"
-#include "char-set.h"
-#include "../common/idioms.h"
+#include "flang/parser/message.h"
+#include "flang/common/idioms.h"
+#include "flang/parser/char-set.h"
 #include <algorithm>
 #include <cstdarg>
 #include <cstddef>
index 62589bb..1a7c641 100644 (file)
 #define FORTRAN_PARSER_MISC_PARSERS_H_
 
 #include "basic-parsers.h"
-#include "message.h"
-#include "parse-tree.h"
 #include "token-parsers.h"
 #include "type-parsers.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree.h"
 
 namespace Fortran::parser {
 
index d30a93a..4a5a083 100644 (file)
 #include "basic-parsers.h"
 #include "expr-parsers.h"
 #include "misc-parsers.h"
-#include "parse-tree.h"
 #include "stmt-parser.h"
 #include "token-parsers.h"
 #include "type-parser-implementation.h"
+#include "flang/parser/parse-tree.h"
 
 // OpenMP Directives and Clauses
 namespace Fortran::parser {
index afd2c68..6e0e017 100644 (file)
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "parse-tree.h"
-#include "user-state.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
+#include "flang/parser/user-state.h"
 #include <algorithm>
 
 // So "delete Expr;" calls an external destructor for its typedExpr.
index e427529..c2b96ab 100644 (file)
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "parsing.h"
-#include "message.h"
+#include "flang/parser/parsing.h"
 #include "preprocessor.h"
 #include "prescan.h"
-#include "provenance.h"
-#include "source.h"
 #include "type-parsers.h"
+#include "flang/parser/message.h"
+#include "flang/parser/provenance.h"
+#include "flang/parser/source.h"
 #include <sstream>
 
 namespace Fortran::parser {
index 27ce7f1..270e72c 100644 (file)
@@ -7,10 +7,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "preprocessor.h"
-#include "characters.h"
-#include "message.h"
 #include "prescan.h"
-#include "../common/idioms.h"
+#include "flang/common/idioms.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/message.h"
 #include <algorithm>
 #include <cinttypes>
 #include <cstddef>
index 1a01896..523c880 100644 (file)
@@ -15,9 +15,9 @@
 // performed, so that special compiler command options &/or source file name
 // extensions for preprocessing will not be necessary.
 
-#include "char-block.h"
-#include "provenance.h"
 #include "token-sequence.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/provenance.h"
 #include <cstddef>
 #include <list>
 #include <stack>
index 2af12df..07f294a 100644 (file)
@@ -7,12 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "prescan.h"
-#include "characters.h"
-#include "message.h"
 #include "preprocessor.h"
-#include "source.h"
 #include "token-sequence.h"
-#include "../common/idioms.h"
+#include "flang/common/idioms.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/message.h"
+#include "flang/parser/source.h"
 #include <cstddef>
 #include <cstring>
 #include <sstream>
index a399cab..1b13cb7 100644 (file)
 // fixed form character literals on truncated card images, file
 // inclusion, and driving the Fortran source preprocessor.
 
-#include "characters.h"
-#include "message.h"
-#include "provenance.h"
 #include "token-sequence.h"
-#include "../common/Fortran-features.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/message.h"
+#include "flang/parser/provenance.h"
 #include <bitset>
 #include <optional>
 #include <string>
index bded0cb..f198242 100644 (file)
@@ -9,14 +9,14 @@
 // Per-type parsers for program units
 
 #include "basic-parsers.h"
-#include "characters.h"
 #include "debug-parser.h"
 #include "expr-parsers.h"
 #include "misc-parsers.h"
-#include "parse-tree.h"
 #include "stmt-parser.h"
 #include "token-parsers.h"
 #include "type-parser-implementation.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/parse-tree.h"
 
 namespace Fortran::parser {
 
index bfa5133..9ad864e 100644 (file)
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "provenance.h"
-#include "../common/idioms.h"
+#include "flang/parser/provenance.h"
+#include "flang/common/idioms.h"
 #include <algorithm>
 #include <utility>
 
index 6dc6c71..4e4c273 100644 (file)
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "source.h"
-#include "char-buffer.h"
-#include "../common/idioms.h"
+#include "flang/parser/source.h"
+#include "flang/common/idioms.h"
+#include "flang/parser/char-buffer.h"
 #include <algorithm>
 #include <cerrno>
 #include <cstddef>
index 6b4ce9e..d36d789 100644 (file)
 // the prescanned character stream and recognize context-sensitive tokens.
 
 #include "basic-parsers.h"
-#include "char-set.h"
-#include "characters.h"
-#include "instrumented-parser.h"
-#include "provenance.h"
 #include "type-parsers.h"
-#include "../common/idioms.h"
+#include "flang/common/idioms.h"
+#include "flang/parser/char-set.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/instrumented-parser.h"
+#include "flang/parser/provenance.h"
 #include <cctype>
 #include <cstddef>
 #include <cstring>
index 6270d3f..d6337f4 100644 (file)
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "token-sequence.h"
-#include "characters.h"
+#include "flang/parser/characters.h"
 
 namespace Fortran::parser {
 
index d189692..e4b7dce 100644 (file)
@@ -13,8 +13,8 @@
 // and a partitioning thereof into preprocessing tokens, along with their
 // associated provenances.
 
-#include "char-block.h"
-#include "provenance.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/provenance.h"
 #include <cstddef>
 #include <cstring>
 #include <ostream>
index ab0ab15..1ef05b4 100644 (file)
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "tools.h"
+#include "flang/parser/tools.h"
 
 namespace Fortran::parser {
 
index 7a18b3c..82273a3 100644 (file)
@@ -9,8 +9,8 @@
 #ifndef FORTRAN_PARSER_TYPE_PARSERS_H_
 #define FORTRAN_PARSER_TYPE_PARSERS_H_
 
-#include "instrumented-parser.h"
-#include "parse-tree.h"
+#include "flang/parser/instrumented-parser.h"
+#include "flang/parser/parse-tree.h"
 #include <optional>
 
 namespace Fortran::parser {
index 6e63962..6550efa 100644 (file)
@@ -9,13 +9,13 @@
 // Generates Fortran from the content of a parse tree, using the
 // traversal templates in parse-tree-visitor.h.
 
-#include "unparse.h"
-#include "characters.h"
-#include "parse-tree-visitor.h"
-#include "parse-tree.h"
-#include "../common/Fortran.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
+#include "flang/parser/unparse.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree.h"
 #include <algorithm>
 #include <cinttypes>
 #include <cstddef>
index a0f2ea6..b23b8f5 100644 (file)
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "user-state.h"
-#include "parse-state.h"
+#include "flang/parser/user-state.h"
 #include "stmt-parser.h"
 #include "type-parsers.h"
+#include "flang/parser/parse-state.h"
 #include <optional>
 
 namespace Fortran::parser {
index d7b9d91..70f2f65 100644 (file)
@@ -7,18 +7,19 @@
 //===----------------------------------------------------------------------===//
 
 #include "assignment.h"
-#include "expression.h"
 #include "pointer-assignment.h"
-#include "symbol.h"
-#include "tools.h"
-#include "../common/idioms.h"
-#include "../common/restorer.h"
-#include "../evaluate/expression.h"
-#include "../evaluate/fold.h"
-#include "../evaluate/tools.h"
-#include "../parser/message.h"
-#include "../parser/parse-tree-visitor.h"
-#include "../parser/parse-tree.h"
+#include "flang/common/idioms.h"
+#include "flang/common/restorer.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/tools.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
 #include <optional>
 #include <set>
 #include <string>
index d963b6a..4bce8cb 100644 (file)
@@ -9,10 +9,10 @@
 #ifndef FORTRAN_SEMANTICS_ASSIGNMENT_H_
 #define FORTRAN_SEMANTICS_ASSIGNMENT_H_
 
-#include "semantics.h"
-#include "tools.h"
-#include "../common/indirection.h"
-#include "../evaluate/expression.h"
+#include "flang/common/indirection.h"
+#include "flang/evaluate/expression.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/tools.h"
 #include <string>
 
 namespace Fortran::parser {
index 765569a..25d9201 100644 (file)
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "attr.h"
-#include "../common/idioms.h"
+#include "flang/semantics/attr.h"
+#include "flang/common/idioms.h"
 #include <ostream>
 #include <stddef.h>
 
index 0f813a6..b4ac377 100644 (file)
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "canonicalize-do.h"
-#include "../parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree-visitor.h"
 
 namespace Fortran::parser {
 
index ae57d3f..cbd26d1 100644 (file)
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "canonicalize-omp.h"
-#include "../parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree-visitor.h"
 
 // After Loop Canonicalization, rewrite OpenMP parse tree to make OpenMP
 // Constructs more structured which provide explicit scopes for later
index e72d3bd..4db1434 100644 (file)
@@ -8,14 +8,14 @@
 
 #include "check-allocate.h"
 #include "assignment.h"
-#include "attr.h"
-#include "expression.h"
-#include "tools.h"
-#include "type.h"
-#include "../evaluate/fold.h"
-#include "../evaluate/type.h"
-#include "../parser/parse-tree.h"
-#include "../parser/tools.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/type.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/parser/tools.h"
+#include "flang/semantics/attr.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/tools.h"
+#include "flang/semantics/type.h"
 
 namespace Fortran::semantics {
 
index 79e0af5..2d495b1 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_SEMANTICS_CHECK_ALLOCATE_H_
 #define FORTRAN_SEMANTICS_CHECK_ALLOCATE_H_
 
-#include "semantics.h"
+#include "flang/semantics/semantics.h"
 
 namespace Fortran::parser {
 struct AllocateStmt;
index e6e05f8..fd293ce 100644 (file)
@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "check-arithmeticif.h"
-#include "tools.h"
-#include "../parser/message.h"
-#include "../parser/parse-tree.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/tools.h"
 
 namespace Fortran::semantics {
 
index 26a0440..32e2b35 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_SEMANTICS_CHECK_ARITHMETICIF_STMT_H_
 #define FORTRAN_SEMANTICS_CHECK_ARITHMETICIF_STMT_H_
 
-#include "semantics.h"
+#include "flang/semantics/semantics.h"
 
 namespace Fortran::parser {
 struct ArithmeticIfStmt;
index a643c38..164dbc8 100644 (file)
@@ -8,14 +8,14 @@
 
 #include "check-call.h"
 #include "pointer-assignment.h"
-#include "scope.h"
-#include "tools.h"
-#include "../evaluate/characteristics.h"
-#include "../evaluate/check-expression.h"
-#include "../evaluate/shape.h"
-#include "../evaluate/tools.h"
-#include "../parser/characters.h"
-#include "../parser/message.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/check-expression.h"
+#include "flang/evaluate/shape.h"
+#include "flang/evaluate/tools.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/message.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/tools.h"
 #include <map>
 #include <string>
 
index 89953ae..68c5b53 100644 (file)
@@ -11,7 +11,7 @@
 #ifndef FORTRAN_SEMANTICS_CHECK_CALL_H_
 #define FORTRAN_SEMANTICS_CHECK_CALL_H_
 
-#include "../evaluate/call.h"
+#include "flang/evaluate/call.h"
 
 namespace Fortran::parser {
 class Messages;
index 1df756a..44f8cf4 100644 (file)
@@ -7,13 +7,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "check-coarray.h"
-#include "expression.h"
-#include "tools.h"
-#include "../common/indirection.h"
-#include "../evaluate/expression.h"
-#include "../parser/message.h"
-#include "../parser/parse-tree.h"
-#include "../parser/tools.h"
+#include "flang/common/indirection.h"
+#include "flang/evaluate/expression.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/parser/tools.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/tools.h"
 
 namespace Fortran::semantics {
 
index a843105..fe4176c 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_SEMANTICS_CHECK_COARRAY_H_
 #define FORTRAN_SEMANTICS_CHECK_COARRAY_H_
 
-#include "semantics.h"
+#include "flang/semantics/semantics.h"
 #include <list>
 
 namespace Fortran::parser {
index 0d82382..7e66fcd 100644 (file)
@@ -7,10 +7,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "check-deallocate.h"
-#include "expression.h"
-#include "tools.h"
-#include "../parser/message.h"
-#include "../parser/parse-tree.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/tools.h"
 
 namespace Fortran::semantics {
 
index 1ad9f3d..6855055 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_SEMANTICS_CHECK_DEALLOCATE_H_
 #define FORTRAN_SEMANTICS_CHECK_DEALLOCATE_H_
 
-#include "semantics.h"
+#include "flang/semantics/semantics.h"
 
 namespace Fortran::parser {
 struct DeallocateStmt;
index 752a73e..a3352d9 100644 (file)
@@ -9,14 +9,14 @@
 // Static declaration checking
 
 #include "check-declarations.h"
-#include "scope.h"
-#include "semantics.h"
-#include "symbol.h"
-#include "tools.h"
-#include "type.h"
-#include "../evaluate/check-expression.h"
-#include "../evaluate/fold.h"
-#include "../evaluate/tools.h"
+#include "flang/evaluate/check-expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/tools.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
+#include "flang/semantics/type.h"
 #include <algorithm>
 
 namespace Fortran::semantics {
index d614751..8112c63 100644 (file)
@@ -7,19 +7,19 @@
 //===----------------------------------------------------------------------===//
 
 #include "check-do.h"
-#include "attr.h"
-#include "scope.h"
-#include "semantics.h"
-#include "symbol.h"
-#include "tools.h"
-#include "type.h"
-#include "../common/template.h"
-#include "../evaluate/call.h"
-#include "../evaluate/expression.h"
-#include "../evaluate/tools.h"
-#include "../parser/message.h"
-#include "../parser/parse-tree-visitor.h"
-#include "../parser/tools.h"
+#include "flang/common/template.h"
+#include "flang/evaluate/call.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/tools.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/tools.h"
+#include "flang/semantics/attr.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
+#include "flang/semantics/type.h"
 
 namespace Fortran::evaluate {
 using ActualArgumentRef = common::Reference<const ActualArgument>;
index 8d6cfee..03d8c75 100644 (file)
@@ -9,8 +9,8 @@
 #ifndef FORTRAN_SEMANTICS_CHECK_DO_H_
 #define FORTRAN_SEMANTICS_CHECK_DO_H_
 
-#include "semantics.h"
-#include "../common/idioms.h"
+#include "flang/common/idioms.h"
+#include "flang/semantics/semantics.h"
 
 namespace Fortran::parser {
 struct AssignmentStmt;
index b77f11e..ec423e3 100644 (file)
@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "check-if-stmt.h"
-#include "tools.h"
-#include "../parser/message.h"
-#include "../parser/parse-tree.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/tools.h"
 
 namespace Fortran::semantics {
 
index 7e6326e..01aac0e 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_SEMANTICS_CHECK_IF_STMT_H_
 #define FORTRAN_SEMANTICS_CHECK_IF_STMT_H_
 
-#include "semantics.h"
+#include "flang/semantics/semantics.h"
 
 namespace Fortran::parser {
 struct IfStmt;
index 929907f..dc6ef9e 100644 (file)
@@ -7,10 +7,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "check-io.h"
-#include "expression.h"
-#include "tools.h"
-#include "../common/format.h"
-#include "../parser/tools.h"
+#include "flang/common/format.h"
+#include "flang/parser/tools.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/tools.h"
 #include <unordered_map>
 
 namespace Fortran::semantics {
index e8d61c6..96315d5 100644 (file)
@@ -9,10 +9,10 @@
 #ifndef FORTRAN_SEMANTICS_CHECK_IO_H_
 #define FORTRAN_SEMANTICS_CHECK_IO_H_
 
-#include "semantics.h"
-#include "tools.h"
-#include "../common/enum-set.h"
-#include "../parser/parse-tree.h"
+#include "flang/common/enum-set.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/tools.h"
 
 namespace Fortran::semantics {
 
index 7c570da..9951a16 100644 (file)
@@ -8,11 +8,11 @@
 
 #include "check-nullify.h"
 #include "assignment.h"
-#include "expression.h"
-#include "tools.h"
-#include "../evaluate/expression.h"
-#include "../parser/message.h"
-#include "../parser/parse-tree.h"
+#include "flang/evaluate/expression.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/tools.h"
 
 namespace Fortran::semantics {
 
index c034db7..f06fc66 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_SEMANTICS_CHECK_NULLIFY_H_
 #define FORTRAN_SEMANTICS_CHECK_NULLIFY_H_
 
-#include "semantics.h"
+#include "flang/semantics/semantics.h"
 
 namespace Fortran::parser {
 struct NullifyStmt;
index 1c1ed33..15b51d3 100644 (file)
@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "check-omp-structure.h"
-#include "tools.h"
-#include "../parser/parse-tree.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/tools.h"
 #include <unordered_map>
 
 namespace Fortran::semantics {
index a08884c..cfe4a2f 100644 (file)
@@ -14,9 +14,9 @@
 #ifndef FORTRAN_SEMANTICS_CHECK_OMP_STRUCTURE_H_
 #define FORTRAN_SEMANTICS_CHECK_OMP_STRUCTURE_H_
 
-#include "semantics.h"
-#include "../common/enum-set.h"
-#include "../parser/parse-tree.h"
+#include "flang/common/enum-set.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/semantics.h"
 
 namespace Fortran::semantics {
 
index 6d33aa1..541696f 100644 (file)
@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "check-purity.h"
-#include "tools.h"
-#include "../parser/parse-tree.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/tools.h"
 
 namespace Fortran::semantics {
 void PurityChecker::Enter(const parser::ExecutableConstruct &exec) {
index 80e6d77..189f72c 100644 (file)
@@ -8,7 +8,7 @@
 
 #ifndef FORTRAN_SEMANTICS_CHECK_PURITY_H_
 #define FORTRAN_SEMANTICS_CHECK_PURITY_H_
-#include "semantics.h"
+#include "flang/semantics/semantics.h"
 #include <list>
 namespace Fortran::parser {
 struct ExecutableConstruct;
index 939bb8b..fc2f2cf 100644 (file)
@@ -7,10 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "check-return.h"
-#include "semantics.h"
-#include "tools.h"
-#include "../parser/message.h"
-#include "../parser/parse-tree.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/tools.h"
 
 namespace Fortran::semantics {
 
index 176d945..b2f4f06 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_SEMANTICS_CHECK_RETURN_H_
 #define FORTRAN_SEMANTICS_CHECK_RETURN_H_
 
-#include "semantics.h"
+#include "flang/semantics/semantics.h"
 
 namespace Fortran::parser {
 struct ReturnStmt;
index 7655ab7..0cf56e9 100644 (file)
@@ -7,11 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "check-stop.h"
-#include "semantics.h"
-#include "tools.h"
-#include "../common/Fortran.h"
-#include "../evaluate/expression.h"
-#include "../parser/parse-tree.h"
+#include "flang/common/Fortran.h"
+#include "flang/evaluate/expression.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/tools.h"
 #include <optional>
 
 namespace Fortran::semantics {
index 957555d..3daf7da 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_SEMANTICS_CHECK_STOP_H_
 #define FORTRAN_SEMANTICS_CHECK_STOP_H_
 
-#include "semantics.h"
+#include "flang/semantics/semantics.h"
 
 namespace Fortran::parser {
 struct StopStmt;
index e24b310..3334bf2 100644 (file)
@@ -6,21 +6,21 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "expression.h"
+#include "flang/semantics/expression.h"
 #include "check-call.h"
 #include "pointer-assignment.h"
-#include "scope.h"
-#include "semantics.h"
-#include "symbol.h"
-#include "tools.h"
-#include "../common/idioms.h"
-#include "../evaluate/common.h"
-#include "../evaluate/fold.h"
-#include "../evaluate/tools.h"
-#include "../parser/characters.h"
-#include "../parser/dump-parse-tree.h"
-#include "../parser/parse-tree-visitor.h"
-#include "../parser/parse-tree.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/common.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/tools.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/dump-parse-tree.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
 #include <algorithm>
 #include <functional>
 #include <optional>
index 6846e28..e0a18b2 100644 (file)
@@ -8,13 +8,13 @@
 
 #include "mod-file.h"
 #include "resolve-names.h"
-#include "scope.h"
-#include "semantics.h"
-#include "symbol.h"
-#include "tools.h"
-#include "../evaluate/tools.h"
-#include "../parser/message.h"
-#include "../parser/parsing.h"
+#include "flang/evaluate/tools.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parsing.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
 #include <algorithm>
 #include <cerrno>
 #include <fstream>
index 4d5afae..ba6bae0 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_SEMANTICS_MOD_FILE_H_
 #define FORTRAN_SEMANTICS_MOD_FILE_H_
 
-#include "attr.h"
+#include "flang/semantics/attr.h"
 #include <sstream>
 #include <string>
 
index 017d0e8..bf93bdb 100644 (file)
@@ -7,18 +7,18 @@
 //===----------------------------------------------------------------------===//
 
 #include "pointer-assignment.h"
-#include "expression.h"
-#include "symbol.h"
-#include "tools.h"
-#include "../common/idioms.h"
-#include "../common/restorer.h"
-#include "../evaluate/characteristics.h"
-#include "../evaluate/expression.h"
-#include "../evaluate/fold.h"
-#include "../evaluate/tools.h"
-#include "../parser/message.h"
-#include "../parser/parse-tree-visitor.h"
-#include "../parser/parse-tree.h"
+#include "flang/common/idioms.h"
+#include "flang/common/restorer.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/tools.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
 #include <optional>
 #include <set>
 #include <string>
index 83652ae..70c8056 100644 (file)
@@ -9,9 +9,9 @@
 #ifndef FORTRAN_SEMANTICS_POINTER_ASSIGNMENT_H_
 #define FORTRAN_SEMANTICS_POINTER_ASSIGNMENT_H_
 
-#include "type.h"
-#include "../evaluate/expression.h"
-#include "../parser/char-block.h"
+#include "flang/evaluate/expression.h"
+#include "flang/parser/char-block.h"
+#include "flang/semantics/type.h"
 #include <string>
 
 namespace Fortran::evaluate::characteristics {
index a026f74..f208191 100644 (file)
@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "program-tree.h"
-#include "scope.h"
-#include "../common/idioms.h"
-#include "../parser/char-block.h"
+#include "flang/common/idioms.h"
+#include "flang/parser/char-block.h"
+#include "flang/semantics/scope.h"
 
 namespace Fortran::semantics {
 
index 8df2f9b..88a2749 100644 (file)
@@ -9,8 +9,8 @@
 #ifndef FORTRAN_SEMANTICS_PROGRAM_TREE_H_
 #define FORTRAN_SEMANTICS_PROGRAM_TREE_H_
 
-#include "symbol.h"
-#include "../parser/parse-tree.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/symbol.h"
 #include <variant>
 
 // A ProgramTree represents a tree of program units and their contained
index c8c2c42..0c09fb4 100644 (file)
@@ -7,10 +7,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "resolve-labels.h"
-#include "semantics.h"
-#include "../common/enum-set.h"
-#include "../common/template.h"
-#include "../parser/parse-tree-visitor.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/template.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/semantics/semantics.h"
 #include <cctype>
 #include <cstdarg>
 #include <type_traits>
index 4fc70a6..dd8c85d 100644 (file)
@@ -7,17 +7,17 @@
 //===----------------------------------------------------------------------===//
 
 #include "resolve-names-utils.h"
-#include "expression.h"
-#include "semantics.h"
-#include "tools.h"
-#include "../common/Fortran-features.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
-#include "../evaluate/fold.h"
-#include "../evaluate/tools.h"
-#include "../evaluate/type.h"
-#include "../parser/char-block.h"
-#include "../parser/parse-tree.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/type.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/tools.h"
 #include <initializer_list>
 #include <ostream>
 #include <variant>
index 05ca093..0036cb7 100644 (file)
 
 // Utility functions and class for use in resolve-names.cc.
 
-#include "scope.h"
-#include "symbol.h"
-#include "type.h"
-#include "../parser/message.h"
+#include "flang/parser/message.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/type.h"
 #include <forward_list>
 
 namespace Fortran::parser {
index 002024a..ae20be1 100644 (file)
@@ -8,30 +8,30 @@
 
 #include "resolve-names.h"
 #include "assignment.h"
-#include "attr.h"
-#include "expression.h"
 #include "mod-file.h"
 #include "program-tree.h"
 #include "resolve-names-utils.h"
 #include "rewrite-parse-tree.h"
-#include "scope.h"
-#include "semantics.h"
-#include "symbol.h"
-#include "tools.h"
-#include "type.h"
-#include "../common/Fortran.h"
-#include "../common/default-kinds.h"
-#include "../common/indirection.h"
-#include "../common/restorer.h"
-#include "../evaluate/characteristics.h"
-#include "../evaluate/common.h"
-#include "../evaluate/fold.h"
-#include "../evaluate/intrinsics.h"
-#include "../evaluate/tools.h"
-#include "../evaluate/type.h"
-#include "../parser/parse-tree-visitor.h"
-#include "../parser/parse-tree.h"
-#include "../parser/tools.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/default-kinds.h"
+#include "flang/common/indirection.h"
+#include "flang/common/restorer.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/common.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/intrinsics.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/type.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/parser/tools.h"
+#include "flang/semantics/attr.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
+#include "flang/semantics/type.h"
 #include <list>
 #include <map>
 #include <ostream>
index c23aad7..932a6ec 100644 (file)
@@ -7,14 +7,14 @@
 //===----------------------------------------------------------------------===//
 
 #include "rewrite-parse-tree.h"
-#include "scope.h"
-#include "semantics.h"
-#include "symbol.h"
-#include "tools.h"
-#include "../common/indirection.h"
-#include "../parser/parse-tree-visitor.h"
-#include "../parser/parse-tree.h"
-#include "../parser/tools.h"
+#include "flang/common/indirection.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/parser/tools.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
 #include <list>
 
 namespace Fortran::semantics {
index 9173d94..23166b1 100644 (file)
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "scope.h"
-#include "symbol.h"
-#include "type.h"
-#include "../parser/characters.h"
+#include "flang/semantics/scope.h"
+#include "flang/parser/characters.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/type.h"
 #include <algorithm>
 #include <memory>
 #include <sstream>
index cac83ec..7642366 100644 (file)
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "semantics.h"
+#include "flang/semantics/semantics.h"
 #include "assignment.h"
 #include "canonicalize-do.h"
 #include "canonicalize-omp.h"
 #include "check-purity.h"
 #include "check-return.h"
 #include "check-stop.h"
-#include "expression.h"
 #include "mod-file.h"
 #include "resolve-labels.h"
 #include "resolve-names.h"
 #include "rewrite-parse-tree.h"
-#include "scope.h"
-#include "symbol.h"
-#include "../common/default-kinds.h"
-#include "../parser/parse-tree-visitor.h"
-#include "../parser/tools.h"
+#include "flang/common/default-kinds.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/tools.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/symbol.h"
 
 namespace Fortran::semantics {
 
index 4015cf7..6393fa1 100644 (file)
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "symbol.h"
-#include "scope.h"
-#include "semantics.h"
-#include "tools.h"
-#include "../common/idioms.h"
-#include "../evaluate/expression.h"
+#include "flang/semantics/symbol.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/expression.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/tools.h"
 #include <ostream>
 #include <string>
 
index 8342e41..24b87b4 100644 (file)
@@ -6,17 +6,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "tools.h"
-#include "scope.h"
-#include "semantics.h"
-#include "symbol.h"
-#include "type.h"
-#include "../common/Fortran.h"
-#include "../common/indirection.h"
-#include "../parser/dump-parse-tree.h"
-#include "../parser/message.h"
-#include "../parser/parse-tree.h"
-#include "../parser/tools.h"
+#include "flang/parser/tools.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/indirection.h"
+#include "flang/parser/dump-parse-tree.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
+#include "flang/semantics/type.h"
 #include <algorithm>
 #include <set>
 #include <sstream>
@@ -83,7 +83,8 @@ Tristate IsDefinedAssignment(
     const auto *lhsDerived{evaluate::GetDerivedTypeSpec(lhsType)};
     const auto *rhsDerived{evaluate::GetDerivedTypeSpec(rhsType)};
     if (lhsDerived && rhsDerived && *lhsDerived == *rhsDerived) {
-      return Tristate::Maybe;  // TYPE(t) = TYPE(t) can be defined or intrinsic
+      return Tristate::Maybe;  // TYPE(t) = TYPE(t) can be defined or
+                               // intrinsic
     } else {
       return Tristate::Yes;
     }
@@ -1275,5 +1276,4 @@ void LabelEnforce::SayWithConstruct(SemanticsContext &context,
   context.Say(stmtLocation, message)
       .Attach(constructLocation, GetEnclosingConstructMsg());
 }
-
 }
index 3e96186..0f196db 100644 (file)
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "type.h"
-#include "scope.h"
-#include "symbol.h"
-#include "tools.h"
-#include "../evaluate/fold.h"
-#include "../parser/characters.h"
+#include "flang/semantics/type.h"
+#include "flang/evaluate/fold.h"
+#include "flang/parser/characters.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
 #include <ostream>
 #include <sstream>
 
index 67d27f9..70ed49d 100644 (file)
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "unparse-with-symbols.h"
-#include "symbol.h"
-#include "../parser/parse-tree-visitor.h"
-#include "../parser/parse-tree.h"
-#include "../parser/unparse.h"
+#include "flang/semantics/unparse-with-symbols.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/parser/unparse.h"
+#include "flang/semantics/symbol.h"
 #include <map>
 #include <ostream>
 #include <set>
index e55c770..1d0e850 100644 (file)
@@ -10,7 +10,7 @@
 #define FORTRAN_RUNTIME_DERIVED_TYPE_H_
 
 #include "type-code.h"
-#include "../include/flang/ISO_Fortran_binding.h"
+#include "flang/ISO_Fortran_binding.h"
 #include <cinttypes>
 #include <cstddef>
 
index 8cd66bf..e412df4 100644 (file)
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "descriptor.h"
-#include "../lib/common/idioms.h"
+#include "flang/common/idioms.h"
 #include <cassert>
 #include <cstdlib>
 
index 5d5dd09..3a4f2ce 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "derived-type.h"
 #include "type-code.h"
-#include "../include/flang/ISO_Fortran_binding.h"
+#include "flang/ISO_Fortran_binding.h"
 #include <cassert>
 #include <cinttypes>
 #include <cstddef>
index 9324d15..2dd76e3 100644 (file)
@@ -8,8 +8,8 @@
 
 #include "format.h"
 #include "io-stmt.h"
-#include "../lib/common/format.h"
-#include "../lib/decimal/decimal.h"
+#include "flang/common/format.h"
+#include "flang/decimal/decimal.h"
 #include <limits>
 
 namespace Fortran::runtime::io {
index 1f576d2..ed164e8 100644 (file)
@@ -12,7 +12,7 @@
 #define FORTRAN_RUNTIME_FORMAT_H_
 
 #include "terminator.h"
-#include "../lib/common/Fortran.h"
+#include "flang/common/Fortran.h"
 #include <cinttypes>
 #include <optional>
 
index 6c11447..bd408de 100644 (file)
@@ -7,7 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "transformational.h"
-#include "../lib/common/idioms.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/integer.h"
 #include <algorithm>
 #include <bitset>
 #include <cinttypes>
index 4975499..b04d453 100644 (file)
@@ -9,8 +9,8 @@
 #ifndef FORTRAN_RUNTIME_TYPE_CODE_H_
 #define FORTRAN_RUNTIME_TYPE_CODE_H_
 
-#include "../include/flang/ISO_Fortran_binding.h"
-#include "../lib/common/Fortran.h"
+#include "flang/ISO_Fortran_binding.h"
+#include "flang/common/Fortran.h"
 
 namespace Fortran::runtime {
 
index 49c8ada..d9ebf8d 100644 (file)
@@ -1,4 +1,4 @@
-#include "../../lib/decimal/decimal.h"
+#include "flang/decimal/decimal.h"
 #include <cinttypes>
 #include <cstdio>
 #include <cstring>
index 40e37ad..f5e3274 100644 (file)
@@ -1,4 +1,4 @@
-#include "../../lib/decimal/decimal.h"
+#include "flang/decimal/decimal.h"
 #include <cinttypes>
 #include <cstdio>
 #include <cstring>
index 162ea78..0b98f64 100644 (file)
@@ -1,4 +1,4 @@
-#include "../../lib/common/bit-population-count.h"
+#include "flang/common/bit-population-count.h"
 #include "testing.h"
 
 using Fortran::common::BitPopulationCount;
index 24a6e0f..ced868d 100644 (file)
@@ -1,9 +1,9 @@
-#include "../../lib/evaluate/expression.h"
+#include "flang/evaluate/expression.h"
 #include "testing.h"
-#include "../../lib/evaluate/fold.h"
-#include "../../lib/evaluate/intrinsics.h"
-#include "../../lib/evaluate/tools.h"
-#include "../../lib/parser/message.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/intrinsics.h"
+#include "flang/evaluate/tools.h"
+#include "flang/parser/message.h"
 #include <cstdio>
 #include <cstdlib>
 #include <string>
index 83ec52a..f72670e 100644 (file)
@@ -1,11 +1,11 @@
 #include "testing.h"
-#include "../../lib/evaluate/call.h"
-#include "../../lib/evaluate/expression.h"
-#include "../../lib/evaluate/fold.h"
 #include "../../lib/evaluate/host.h"
 #include "../../lib/evaluate/intrinsics-library-templates.h"
-#include "../../lib/evaluate/intrinsics.h"
-#include "../../lib/evaluate/tools.h"
+#include "flang/evaluate/call.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/intrinsics.h"
+#include "flang/evaluate/tools.h"
 #include <tuple>
 
 using namespace Fortran::evaluate;
index acb2d68..c86fbba 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef FORTRAN_TEST_EVALUATE_FP_TESTING_H_
 #define FORTRAN_TEST_EVALUATE_FP_TESTING_H_
 
-#include "../../lib/evaluate/common.h"
+#include "flang/evaluate/common.h"
 #include <fenv.h>
 
 using Fortran::common::RoundingMode;
index db02418..e31f230 100644 (file)
@@ -1,4 +1,4 @@
-#include "../../lib/evaluate/integer.h"
+#include "flang/evaluate/integer.h"
 #include "testing.h"
 #include <cstdio>
 #include <string>
index cb9260b..1826a46 100644 (file)
@@ -1,9 +1,9 @@
-#include "../../lib/evaluate/intrinsics.h"
+#include "flang/evaluate/intrinsics.h"
 #include "testing.h"
-#include "../../lib/evaluate/common.h"
-#include "../../lib/evaluate/expression.h"
-#include "../../lib/evaluate/tools.h"
-#include "../../lib/parser/provenance.h"
+#include "flang/evaluate/common.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/tools.h"
+#include "flang/parser/provenance.h"
 #include <initializer_list>
 #include <iostream>
 #include <map>
index 2ab53aa..1abd0f7 100644 (file)
@@ -1,4 +1,4 @@
-#include "../../lib/common/leading-zero-bit-count.h"
+#include "flang/common/leading-zero-bit-count.h"
 #include "testing.h"
 
 using Fortran::common::LeadingZeroBitCount;
index 8b37a79..3edbd6a 100644 (file)
@@ -1,5 +1,5 @@
 #include "testing.h"
-#include "../../lib/evaluate/type.h"
+#include "flang/evaluate/type.h"
 #include <cstdio>
 
 template<int KIND> void testKind() {
index 7ac4878..919bc3c 100644 (file)
@@ -1,6 +1,6 @@
 #include "fp-testing.h"
 #include "testing.h"
-#include "../../lib/evaluate/type.h"
+#include "flang/evaluate/type.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
index 3b693bc..6a20d32 100644 (file)
@@ -1,5 +1,5 @@
 #define AVOID_NATIVE_UINT128_T 1
-#include "../../lib/common/uint128.h"
+#include "flang/common/uint128.h"
 #include "testing.h"
 #include <cinttypes>
 #include <iostream>
index 4bb30f9..f65b47b 100644 (file)
 // 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/parser/characters.h"
-#include "../../lib/parser/dump-parse-tree.h"
-#include "../../lib/parser/message.h"
-#include "../../lib/parser/parse-tree-visitor.h"
-#include "../../lib/parser/parse-tree.h"
-#include "../../lib/parser/parsing.h"
-#include "../../lib/parser/provenance.h"
-#include "../../lib/parser/unparse.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/common/default-kinds.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/dump-parse-tree.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/parser/parsing.h"
+#include "flang/parser/provenance.h"
+#include "flang/parser/unparse.h"
 #include <cerrno>
 #include <cstdio>
 #include <cstring>
index 6e68540..32a5cd4 100644 (file)
@@ -8,20 +8,20 @@
 
 // Temporary Fortran front end driver main program for development scaffolding.
 
-#include "../../lib/common/Fortran-features.h"
-#include "../../lib/common/default-kinds.h"
-#include "../../lib/evaluate/expression.h"
-#include "../../lib/parser/characters.h"
-#include "../../lib/parser/dump-parse-tree.h"
-#include "../../lib/parser/message.h"
-#include "../../lib/parser/parse-tree-visitor.h"
-#include "../../lib/parser/parse-tree.h"
-#include "../../lib/parser/parsing.h"
-#include "../../lib/parser/provenance.h"
-#include "../../lib/parser/unparse.h"
-#include "../../lib/semantics/expression.h"
-#include "../../lib/semantics/semantics.h"
-#include "../../lib/semantics/unparse-with-symbols.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/common/default-kinds.h"
+#include "flang/evaluate/expression.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/dump-parse-tree.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/parser/parsing.h"
+#include "flang/parser/provenance.h"
+#include "flang/parser/unparse.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/semantics.h"
+#include "flang/semantics/unparse-with-symbols.h"
 #include <cerrno>
 #include <cstdio>
 #include <cstring>
index 14f16c7..0b20203 100644 (file)
@@ -11,7 +11,7 @@
 // libraries, as here, we need to stub out the dependences on the external
 // destructors, which will never actually be called.
 
-#include "../../lib/common/indirection.h"
+#include "flang/common/indirection.h"
 
 namespace Fortran::evaluate {
 struct GenericExprWrapper {