Skip to content

Swift: reorganize code #9666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions swift/extractor/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion swift/extractor/SwiftExtractor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion swift/extractor/SwiftExtractor.h
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
10 changes: 10 additions & 0 deletions swift/extractor/infra/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion swift/extractor/trap/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
load("//swift:rules.bzl", "swift_cc_library")

genrule(
name = "cppgen",
srcs = [
Expand Down Expand Up @@ -26,7 +28,7 @@ filegroup(
visibility = ["//visibility:public"],
)

cc_library(
swift_cc_library(
name = "trap",
hdrs = glob(["*.h"]) + [
"generated/TrapEntries.h",
Expand Down
12 changes: 12 additions & 0 deletions swift/extractor/visitors/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -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",
],
)
Loading