caio/clice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. Make resource dir unique and global.

Browse Source 
2. Use our custom CDB loader.
This commit is contained in:
ykiko
2024-12-10 16:15:50 +08:00
parent f9bff085b2
commit c082458fb1
16 changed files with 332 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
unittests/Compiler/Command.cpp
View File

@@ -1,16 +1,41 @@
#include "../Test.h"
// #include "Compiler/Command.h"
//
// namespace {
//
// TEST(clice, CommandManager) {
// clice::CommandManager manager("/home/ykiko/C++/clice2/tests");
// auto args = manager.lookup("another_file.cpp");
// for(auto arg: args) {
// llvm::outs() << arg << " ";
// }
// llvm::outs() << "\n";
// }
//
// } // namespace
#include "Compiler/Command.h"
namespace clice {
namespace {
TEST(clice, Command) {
llvm::SmallString<1024> buffer;
llvm::SmallVector<const char*, 16> args;
auto command =
"/usr/local/bin/clang++"
" -Dclice_core_EXPORTS"
" -I/home/ykiko/C++/clice2/deps/llvm/build-install/include"
" -I/home/ykiko/C++/clice2/include"
" -I/home/ykiko/C++/clice2/deps/toml/include"
" -I/home/ykiko/C++/clice2/deps/libuv/include"
" -fno-rtti"
" -fno-exceptions"
" -g -O0 -fsanitize=address"
" -Wno-deprecated-declarations"
" -g -std=gnu++23 -fPIC -Winvalid-pch"
" -Xclang -include-pch"
" -Xclang /home/ykiko/C++/clice2/build/CMakeFiles/clice-core.dir/cmake_pch.hxx.pch"
" -Xclang -include -Xclang /home/ykiko/C++/clice2/build/CMakeFiles/clice-core.dir/cmake_pch.hxx"
" -o CMakeFiles/clice-core.dir/src/Basic/URI.cpp.o"
" -c /home/ykiko/C++/clice2/src/Basic/URI.cpp";
auto error = mangleCommand(command, args, buffer);
ASSERT_FALSE(bool(error));
for(auto arg: args) {
llvm::outs() << arg << '\n';
}
}
} // namespace
} // namespace clice

64
unittests/Compiler/Compiler.cpp
View File

@@ -16,33 +16,16 @@ int main(){
}
)cpp";
llvm::SmallVector<const char*, 5> compileArgs = {
"clang++",
"-std=c++20",
"main.cpp",
"-resource-dir",
"/home/ykiko/C++/clice2/build/lib/clang/20",
};
CompliationParams params;
params.srcPath = "main.cpp";
params.content = code;
params.args = compileArgs;
params.srcPath = "main.cpp";
params.command = "clang++ -std=c++20 main.cpp";
auto info = compile(params);
ASSERT_TRUE(bool(info));
}
TEST(Compiler, ComputeBounds) {
llvm::SmallVector<const char*, 5> compileArgs = {
"clang++",
"-std=c++20",
"main.cpp",
"-resource-dir",
"/home/ykiko/C++/clice2/build/lib/clang/20",
};
const char* code = R"cpp(
#include <cstdio>
int main(){
@@ -52,9 +35,9 @@ int main(){
/// Test in no header file.
CompliationParams params;
params.srcPath = "main.cpp";
params.args = compileArgs;
params.content = code;
params.srcPath = "main.cpp";
params.command = "clang++ -std=c++20 main.cpp";
params.computeBounds();
ASSERT_TRUE(params.bounds.has_value());
@@ -62,8 +45,6 @@ int main(){
params.bounds.reset();
compileArgs = {"clang++", "-std=c++20", "main.cpp"};
std::unique_ptr<vfs::InMemoryFileSystem> vfs(new vfs::InMemoryFileSystem);
const char* header = R"cpp(
#include "target.h"
@@ -80,14 +61,7 @@ int main(){
return 0;
})cpp";
compileArgs = {
"clang++",
"-std=c++20",
"main.cpp",
};
params.srcPath = "main.cpp";
params.args = compileArgs;
params.content = code;
params.vfs = std::move(vfs);
params.computeBounds("target.h");
@@ -106,14 +80,6 @@ int main(){
}
)cpp";
llvm::SmallVector<const char*, 5> compileArgs = {
"clang++",
"-std=c++20",
"main.cpp",
"-resource-dir",
"/home/ykiko/C++/clice2/build/lib/clang/20",
};
llvm::SmallString<128> outpath;
if(auto error = llvm::sys::fs::createTemporaryFile("main", "pch", outpath)) {
llvm::errs() << error.message() << "\n";
@@ -129,7 +95,7 @@ int main(){
params.content = code;
params.srcPath = "main.cpp";
params.outPath = outpath;
params.args = compileArgs;
params.command = "clang++ -std=c++20 main.cpp";
params.computeBounds();
PCHInfo pch;
@@ -162,17 +128,11 @@ export int foo() {
return;
}
llvm::SmallVector<const char*, 5> compileArgs = {
"clang++",
"-std=c++20",
"main.cppm",
};
CompliationParams params;
params.srcPath = "main.cppm";
params.content = code;
params.outPath = outpath;
params.args = compileArgs;
params.command = "clang++ -std=c++20 main.cppm";
PCMInfo pcm;
ASSERT_TRUE(bool(clice::compile(params, pcm)));
@@ -189,7 +149,7 @@ int main(){
params.srcPath = "main.cpp";
params.content = code2;
params.args = compileArgs;
params.command = "clang++ -std=c++20 main.cpp";
params.addPCM(pcm);
auto info = compile(params);
@@ -202,16 +162,10 @@ export module A;
export int foo = 1;
)cpp";
llvm::SmallVector<const char*, 5> compileArgs = {
"clang++",
"-std=c++20",
"main.cppm",
};
CompliationParams params;
params.srcPath = "main.cppm";
params.content = code;
params.args = compileArgs;
params.srcPath = "main.cppm";
params.command = "clang++ -std=c++20 main.cppm";
params.line = 3;
params.column = 10;

26
unittests/Compiler/Resolver.cpp
View File

@@ -8,24 +8,16 @@ namespace {
struct TemplateResolverTester : public clang::RecursiveASTVisitor<TemplateResolverTester> {
TemplateResolverTester(llvm::StringRef code) {
compileArgs = {
"clang++",
"-std=c++20",
"main.cpp",
"-resource-dir",
"/home/ykiko/C++/clice2/build/lib/clang/20",
};
CompliationParams params;
params.srcPath = "main.cpp";
params.content = code;
params.args = compileArgs;
auto info = compile(params);
if(!info) {
llvm::errs() << info.takeError() << "\n";
return;
}
// CompliationParams params;
// params.srcPath = "main.cpp";
// params.content = code;
// params.args = compileArgs;
// auto info = compile(params);
// if(!info) {
// llvm::errs() << info.takeError() << "\n";
// return;
// }
compiler = std::move(*info);
test();
}

12
unittests/Feature/CodeCompletion.cpp
View File

@@ -14,18 +14,10 @@ int main() {
}
)cpp";
llvm::SmallVector<const char*, 5> compileArgs = {
"clang++",
"-std=c++20",
"main.cpp",
"-resource-dir",
"/home/ykiko/C++/clice2/build/lib/clang/20",
};
CompliationParams params;
params.srcPath = "main.cpp";
params.content = code;
params.args = compileArgs;
params.srcPath = "main.cpp";
params.content = "clang++ -std=c++20 main.cpp";
auto result = feature::codeCompletion(params, 5, 7, "main.cpp", {});
for(auto& item: result) {

10
unittests/Test.h
View File

@@ -185,15 +185,7 @@ public:
Tester& run(const char* standard = "-std=c++20") {
params.vfs = std::move(vfs);
llvm::SmallVector<const char*> args = {
"clang++",
standard,
params.srcPath.c_str(),
"-resource-dir",
test::resource_dir().data(),
};
params.args = args;
params.command = std::format("clang++ {} {} main.cpp", standard, params.srcPath);
auto info = compile(params);
if(!info) {

12
unittests/main.cpp
View File

@@ -29,14 +29,16 @@ llvm::StringRef resource_dir() {
} // namespace clice
int main(int argc, char** argv) {
using namespace clice;
if(auto error = fs::init_resource_dir(argv[0])) {
llvm::outs() << std::format("Failed to get resource directory, because {}\n", error);
return 1;
}
testing::InitGoogleTest(&argc, argv);
llvm::cl::ParseCommandLineOptions(argc, argv, "clice test\n");
if(auto error = clice::fs::real_path(llvm::Twine(argv[0]) + "/../../lib/clang/20)",
clice::cl::resource_dir)) {
llvm::errs() << "Failed to get resource directory, because " << error.message() << '\n';
}
return RUN_ALL_TESTS();
}