Merge pull request #9666 from github/redsun82/swift-code-reorg

Swift: reorganize code

Author: AlexDenisov

Diff for: swift/extractor/BUILD.bazel

@@ -3,24 +3,15 @@ load("//swift:rules.bzl", "swift_cc_binary")
 swift_cc_binary(
     name = "extractor",
     srcs = [
-        "SwiftDispatcher.h",
         "SwiftExtractor.cpp",
         "SwiftExtractor.h",
         "SwiftExtractorConfiguration.h",
-        "SwiftTagTraits.h",
-        "SwiftVisitor.h",
         "main.cpp",
-        "visitors/DeclVisitor.h",
-        "visitors/ExprVisitor.h",
-        "visitors/PatternVisitor.h",
-        "visitors/StmtVisitor.h",
-        "visitors/TypeReprVisitor.h",
-        "visitors/TypeVisitor.h",
-        "visitors/VisitorBase.h",
     ],
     visibility = ["//swift:__pkg__"],
     deps = [
-        "//swift/extractor/trap",
+        "//swift/extractor/infra",
+        "//swift/extractor/visitors",
         "//swift/tools/prebuilt:swift-llvm-support",
     ],
 )

Diff for: swift/extractor/SwiftExtractor.cpp

@@ -14,7 +14,7 @@
 
 #include "swift/extractor/trap/generated/TrapClasses.h"
 #include "swift/extractor/trap/TrapOutput.h"
-#include "swift/extractor/SwiftVisitor.h"
+#include "swift/extractor/visitors/SwiftVisitor.h"
 
 using namespace codeql;
 

Diff for: swift/extractor/SwiftExtractor.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SwiftExtractorConfiguration.h"
+#include "swift/extractor/SwiftExtractorConfiguration.h"
 #include <swift/AST/SourceFile.h>
 #include <swift/Frontend/Frontend.h>
 #include <memory>

Diff for: swift/extractor/infra/BUILD.bazel

@@ -0,0 +1,10 @@
+load("//swift:rules.bzl", "swift_cc_library")
+
+swift_cc_library(
+    name = "infra",
+    hdrs = glob(["*.h"]),
+    visibility = ["//swift:__subpackages__"],
+    deps = [
+        "//swift/extractor/trap",
+    ],
+)

Diff for: swift/extractor/SwiftDispatcher.h renamed to swift/extractor/infra/SwiftDispatcher.h

@@ -2,8 +2,9 @@
 
 #include "swift/extractor/trap/TrapArena.h"
 #include "swift/extractor/trap/TrapLabelStore.h"
+#include "swift/extractor/trap/TrapOutput.h"
 #include "swift/extractor/trap/generated/TrapClasses.h"
-#include "swift/extractor/SwiftTagTraits.h"
+#include "swift/extractor/infra/SwiftTagTraits.h"
 #include <swift/AST/SourceFile.h>
 #include <swift/Basic/SourceManager.h>
 #include <llvm/Support/FileSystem.h>

Diff for: swift/extractor/SwiftTagTraits.h renamed to swift/extractor/infra/SwiftTagTraits.h

@@ -39,32 +39,32 @@ MAP_TAG(StmtCondition);
 MAP_TAG(CaseLabelItem);
 #define ABSTRACT_STMT(CLASS, PARENT) MAP_SUBTAG(CLASS##Stmt, PARENT)
 #define STMT(CLASS, PARENT) ABSTRACT_STMT(CLASS, PARENT)
-#include "swift/AST/StmtNodes.def"
+#include <swift/AST/StmtNodes.def>
 
 MAP_TAG(Expr);
 #define ABSTRACT_EXPR(CLASS, PARENT) MAP_SUBTAG(CLASS##Expr, PARENT)
 #define EXPR(CLASS, PARENT) ABSTRACT_EXPR(CLASS, PARENT)
-#include "swift/AST/ExprNodes.def"
+#include <swift/AST/ExprNodes.def>
 
 MAP_TAG(Decl);
 #define ABSTRACT_DECL(CLASS, PARENT) MAP_SUBTAG(CLASS##Decl, PARENT)
 #define DECL(CLASS, PARENT) ABSTRACT_DECL(CLASS, PARENT)
-#include "swift/AST/DeclNodes.def"
+#include <swift/AST/DeclNodes.def>
 
 MAP_TAG(Pattern);
 #define ABSTRACT_PATTERN(CLASS, PARENT) MAP_SUBTAG(CLASS##Pattern, PARENT)
 #define PATTERN(CLASS, PARENT) ABSTRACT_PATTERN(CLASS, PARENT)
-#include "swift/AST/PatternNodes.def"
+#include <swift/AST/PatternNodes.def>
 
 MAP_TAG(TypeRepr);
 #define ABSTRACT_TYPEREPR(CLASS, PARENT) MAP_SUBTAG(CLASS##TypeRepr, PARENT)
 #define TYPEREPR(CLASS, PARENT) ABSTRACT_TYPEREPR(CLASS, PARENT)
-#include "swift/AST/TypeReprNodes.def"
+#include <swift/AST/TypeReprNodes.def>
 
 MAP_TYPE_TO_TAG(TypeBase, TypeTag);
 #define ABSTRACT_TYPE(CLASS, PARENT) MAP_SUBTAG(CLASS##Type, PARENT)
 #define TYPE(CLASS, PARENT) ABSTRACT_TYPE(CLASS, PARENT)
-#include "swift/AST/TypeNodes.def"
+#include <swift/AST/TypeNodes.def>
 
 OVERRIDE_TAG(FuncDecl, ConcreteFuncDeclTag);
 OVERRIDE_TAG(VarDecl, ConcreteVarDeclTag);

Diff for: swift/extractor/trap/BUILD.bazel

@@ -1,3 +1,5 @@
+load("//swift:rules.bzl", "swift_cc_library")
+
 genrule(
     name = "cppgen",
     srcs = [
@@ -26,7 +28,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 
-cc_library(
+swift_cc_library(
     name = "trap",
     hdrs = glob(["*.h"]) + [
         "generated/TrapEntries.h",

Diff for: swift/extractor/visitors/BUILD.bazel

@@ -0,0 +1,12 @@
+load("//swift:rules.bzl", "swift_cc_library")
+
+swift_cc_library(
+    name = "visitors",
+    srcs = glob(["*.cpp"]),
+    hdrs = glob(["*.h"]),
+    visibility = ["//swift:__subpackages__"],
+    deps = [
+        "//swift/extractor/infra",
+        "//swift/tools/prebuilt:swift-llvm-support",
+    ],
+)