Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-02-07 17:32:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Jacob Dufault 2017-03-29 10:12:00 -07:00
parent 843a86a4a9
commit 2a3ee89349
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/clang_args
View File

@ -3,10 +3,16 @@
-std=c++11 -std=c++11
# Includes # Includes
-IC:/Users/jacob/Desktop/superindex/indexer/third_party # Windows
-IC:/Users/jacob/Desktop/superindex/indexer/third_party/doctest/doctest #-IC:/Users/jacob/Desktop/superindex/indexer/third_party
-IC:/Users/jacob/Desktop/superindex/indexer/third_party/rapidjson/include #-IC:/Users/jacob/Desktop/superindex/indexer/third_party/doctest
-IC:/Program Files/LLVM/include #-IC:/Users/jacob/Desktop/superindex/indexer/third_party/rapidjson/include
#-IC:/Program Files/LLVM/include
# OSX
-I/Users/jdufault/Personal/super-clang-index/third_party
-I/Users/jdufault/Personal/super-clang-index/third_party/doctest
-I/Users/jdufault/Personal/super-clang-index/third_party/rapidjson/include
-I/Users/jdufault/Personal/super-clang-index/build/clang+llvm-4.0.0-x86_64-apple-darwin/include
# Use libcxx # Use libcxx
#-stdlib=libc++ #-stdlib=libc++

3
src/platform_linux.cc
View File

@ -142,7 +142,8 @@ std::vector<std::string> GetPlatformClangArguments() {
return { return {
"-stdlib=libc++", "-stdlib=libc++",
"-nostdinc++", "-nostdinc++",
"-I/usr/local/Cellar/llvm/3.9.1/include" //"-I/usr/local/Cellar/llvm/3.9.1/include",
"-I/Users/jdufault/Personal/super-clang-index/libcxx/include"
}; };
} }
#undef CHECKED #undef CHECKED

9
src/query.cc
View File

@ -131,10 +131,17 @@ QueryableVarDef::DefUpdate MapIdToUsr(const IdCache& id_cache, const VarDefDefin
QueryableFile::QueryableFile(const IndexedFile& indexed) QueryableFile::QueryableFile(const IndexedFile& indexed)
: file_id(indexed.path) { : file_id(indexed.path) {
// TODO: investigate this
//std::cerr << "Adding QueryableFile for " << indexed.path
// << ", file_path_to_file_id.size()=" << indexed.id_cache.file_path_to_file_id.size() << std::endl;
//for (auto& entry : indexed.id_cache.file_path_to_file_id)
// std::cerr << "-" << entry.first << std::endl;
//assert(indexed.id_cache.file_path_to_file_id.find(indexed.path) !=
// indexed.id_cache.file_path_to_file_id.end());
auto it = indexed.id_cache.file_path_to_file_id.find(indexed.path); auto it = indexed.id_cache.file_path_to_file_id.find(indexed.path);
if (it == indexed.id_cache.file_path_to_file_id.end()) { if (it == indexed.id_cache.file_path_to_file_id.end()) {
// TODO: investigate // TODO: investigate
std::cerr << "Unable to find cached file " << indexed.path << std::endl; std::cerr << "!!! FIXME !!! Unable to find cached file " << indexed.path << std::endl;
return; return;
} }

2
wscript
View File

@ -85,7 +85,7 @@ def build(bld):
print('CLANG_LIB_DIR: {0}'.format(CLANG_LIB_DIR)) print('CLANG_LIB_DIR: {0}'.format(CLANG_LIB_DIR))
cc_files = bld.path.ant_glob(['**/*.cpp', '**/*.cc'], cc_files = bld.path.ant_glob(['**/*.cpp', '**/*.cc'],
excl=['*tests/*', 'third_party/*']) excl=['libcxx/*', '*tests/*', 'third_party/*'])
bld.program( bld.program(
source=cc_files, source=cc_files,
cxxflags=['-std=c++11', '-Wall'], cxxflags=['-std=c++11', '-Wall'],