From 7d15263c8f2634d3541eee4b4fe78bd973d7a311 Mon Sep 17 00:00:00 2001 From: ykiko Date: Tue, 1 Oct 2024 20:30:33 +0800 Subject: [PATCH] Rename `AST` dir to `Compiler`. --- include/{AST => Compiler}/Compiler.h | 0 include/{AST => Compiler}/Diagnostic.h | 0 include/{AST => Compiler}/Directive.h | 0 include/{AST => Compiler}/ParsedAST.h | 0 include/{AST => Compiler}/Preamble.h | 0 include/{AST => Compiler}/Resolver.h | 0 include/{AST => Compiler}/Selection.h | 0 include/Server/Scheduler.h | 4 ++-- src/{AST => Compiler}/Compiler.cpp | 4 ++-- src/{AST => Compiler}/Diagnostic.cpp | 2 +- src/{AST => Compiler}/Directive.cpp | 2 +- src/{AST => Compiler}/ParsedAST.cpp | 4 ++-- src/{AST => Compiler}/Preamble.cpp | 2 +- src/{AST => Compiler}/Resolver.cpp | 9 ++++++++- src/{AST => Compiler}/Selection.cpp | 2 +- src/Feature/SemanticTokens.cpp | 11 +++++++---- 16 files changed, 25 insertions(+), 15 deletions(-) rename include/{AST => Compiler}/Compiler.h (100%) rename include/{AST => Compiler}/Diagnostic.h (100%) rename include/{AST => Compiler}/Directive.h (100%) rename include/{AST => Compiler}/ParsedAST.h (100%) rename include/{AST => Compiler}/Preamble.h (100%) rename include/{AST => Compiler}/Resolver.h (100%) rename include/{AST => Compiler}/Selection.h (100%) rename src/{AST => Compiler}/Compiler.cpp (96%) rename src/{AST => Compiler}/Diagnostic.cpp (93%) rename src/{AST => Compiler}/Directive.cpp (99%) rename src/{AST => Compiler}/ParsedAST.cpp (96%) rename src/{AST => Compiler}/Preamble.cpp (98%) rename src/{AST => Compiler}/Resolver.cpp (98%) rename src/{AST => Compiler}/Selection.cpp (56%) diff --git a/include/AST/Compiler.h b/include/Compiler/Compiler.h similarity index 100% rename from include/AST/Compiler.h rename to include/Compiler/Compiler.h diff --git a/include/AST/Diagnostic.h b/include/Compiler/Diagnostic.h similarity index 100% rename from include/AST/Diagnostic.h rename to include/Compiler/Diagnostic.h diff --git a/include/AST/Directive.h b/include/Compiler/Directive.h similarity index 100% rename from include/AST/Directive.h rename to include/Compiler/Directive.h diff --git a/include/AST/ParsedAST.h b/include/Compiler/ParsedAST.h similarity index 100% rename from include/AST/ParsedAST.h rename to include/Compiler/ParsedAST.h diff --git a/include/AST/Preamble.h b/include/Compiler/Preamble.h similarity index 100% rename from include/AST/Preamble.h rename to include/Compiler/Preamble.h diff --git a/include/AST/Resolver.h b/include/Compiler/Resolver.h similarity index 100% rename from include/AST/Resolver.h rename to include/Compiler/Resolver.h diff --git a/include/AST/Selection.h b/include/Compiler/Selection.h similarity index 100% rename from include/AST/Selection.h rename to include/Compiler/Selection.h diff --git a/include/Server/Scheduler.h b/include/Server/Scheduler.h index a12dd1c8..c2b3c352 100644 --- a/include/Server/Scheduler.h +++ b/include/Server/Scheduler.h @@ -2,8 +2,8 @@ #include #include -#include -#include +#include +#include namespace clice { diff --git a/src/AST/Compiler.cpp b/src/Compiler/Compiler.cpp similarity index 96% rename from src/AST/Compiler.cpp rename to src/Compiler/Compiler.cpp index 6f428cec..36e831d8 100644 --- a/src/AST/Compiler.cpp +++ b/src/Compiler/Compiler.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include diff --git a/src/AST/Diagnostic.cpp b/src/Compiler/Diagnostic.cpp similarity index 93% rename from src/AST/Diagnostic.cpp rename to src/Compiler/Diagnostic.cpp index 38adf785..9a48a95c 100644 --- a/src/AST/Diagnostic.cpp +++ b/src/Compiler/Diagnostic.cpp @@ -1,4 +1,4 @@ -#include "AST/Diagnostic.h" +#include "Compiler/Diagnostic.h" namespace clice { diff --git a/src/AST/Directive.cpp b/src/Compiler/Directive.cpp similarity index 99% rename from src/AST/Directive.cpp rename to src/Compiler/Directive.cpp index a56df0d0..122fe606 100644 --- a/src/AST/Directive.cpp +++ b/src/Compiler/Directive.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/AST/ParsedAST.cpp b/src/Compiler/ParsedAST.cpp similarity index 96% rename from src/AST/ParsedAST.cpp rename to src/Compiler/ParsedAST.cpp index d5d64715..2fc6ad74 100644 --- a/src/AST/ParsedAST.cpp +++ b/src/Compiler/ParsedAST.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include namespace clice { diff --git a/src/AST/Preamble.cpp b/src/Compiler/Preamble.cpp similarity index 98% rename from src/AST/Preamble.cpp rename to src/Compiler/Preamble.cpp index 397d6347..7d7f413b 100644 --- a/src/AST/Preamble.cpp +++ b/src/Compiler/Preamble.cpp @@ -1,4 +1,4 @@ -#include +#include namespace clice { diff --git a/src/AST/Resolver.cpp b/src/Compiler/Resolver.cpp similarity index 98% rename from src/AST/Resolver.cpp rename to src/Compiler/Resolver.cpp index bc29d795..29d94f8d 100644 --- a/src/AST/Resolver.cpp +++ b/src/Compiler/Resolver.cpp @@ -1,7 +1,14 @@ -#include "AST/Resolver.h" +#include +#include namespace clice { +namespace { + +class TemplateResolver {}; + +} // namespace + clang::QualType DependentNameResolver::resolve(clang::NamedDecl* ND) { if(auto TAD = llvm::dyn_cast(ND)) { return resolve(substitute(TAD->getUnderlyingType())); diff --git a/src/AST/Selection.cpp b/src/Compiler/Selection.cpp similarity index 56% rename from src/AST/Selection.cpp rename to src/Compiler/Selection.cpp index 1cc84a39..388bcf5a 100644 --- a/src/AST/Selection.cpp +++ b/src/Compiler/Selection.cpp @@ -1,4 +1,4 @@ -#include "AST/Selection.h" +#include "Compiler/Selection.h" namespace clice { diff --git a/src/Feature/SemanticTokens.cpp b/src/Feature/SemanticTokens.cpp index f0fc2e9b..67d694bf 100644 --- a/src/Feature/SemanticTokens.cpp +++ b/src/Feature/SemanticTokens.cpp @@ -1,4 +1,4 @@ -#include "AST/ParsedAST.h" +#include "Compiler/ParsedAST.h" #include "Feature/SemanticTokens.h" namespace clice::feature { @@ -180,7 +180,6 @@ public: if(token) { return addToken(type, token->location(), token->length()); } - } // FIXME: source range can be a multi-line range, split it into multiple tokens @@ -255,9 +254,13 @@ public: // WalkUpFrom(NamespaceDecl) {} - VISIT(ImportDecl) { return true; } + VISIT(ImportDecl) { + return true; + } - VISIT(NamedDecl) { return true; } + VISIT(NamedDecl) { + return true; + } VISIT(NamespaceDecl) { builder.addToken(protocol::SemanticTokenType::Namespace, node->getLocation());