f88c9feb4f
This change should fix the random hangs and segfaults when using the clang completer. Also, assertion errors printed to the console on vim exit should go away too, same thing with segfaults on vim exit. These "on exit" errors were caused by not cleanly shutting down the background threads; both the identifier completer and the clang one now join the threads on destruction. This results in a clean shutdown. The new clang completer architecture now uses only one clang thread (again) instead of a completion and parsing thread. Since the parsing task needs to wait on the completion task if it was started first (and vice-versa) there's no point to using two threads. The desired "simplicity" of using two threads for these two tasks actually created needless complexity (and bugs). Sigh. Such is life. A TranslationUnit abstraction was also created and this in turn also reduces the complexity of the clang completer. The clang completer now also has some (very) basic tests.
106 lines
4.6 KiB
C++
106 lines
4.6 KiB
C++
// Copyright (C) 2011, 2012 Strahinja Val Markovic <val@markovic.io>
|
|
//
|
|
// This file is part of YouCompleteMe.
|
|
//
|
|
// YouCompleteMe is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// YouCompleteMe is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with YouCompleteMe. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#include "IdentifierCompleter.h"
|
|
#include "ClangCompleter.h"
|
|
#include "Future.h"
|
|
#include "CompletionData.h"
|
|
#include "Diagnostic.h"
|
|
#include "UnsavedFile.h"
|
|
|
|
#include <boost/python.hpp>
|
|
#include <boost/utility.hpp>
|
|
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
|
|
|
|
BOOST_PYTHON_MODULE(ycm_core)
|
|
{
|
|
using namespace boost::python;
|
|
using namespace YouCompleteMe;
|
|
|
|
// TODO: rename these *Vec classes to *Vector; don't forget the python file
|
|
class_< std::vector< std::string >,
|
|
boost::shared_ptr< std::vector< std::string > > >( "StringVec" )
|
|
.def( vector_indexing_suite< std::vector< std::string > >() );
|
|
|
|
class_< CompletionData >( "CompletionData" )
|
|
.def( "TextToInsertInBuffer", &CompletionData::TextToInsertInBuffer )
|
|
.def( "MainCompletionText", &CompletionData::MainCompletionText )
|
|
.def( "ExtraMenuInfo", &CompletionData::ExtraMenuInfo )
|
|
.def( "DetailedInfoForPreviewWindow",
|
|
&CompletionData::DetailedInfoForPreviewWindow )
|
|
.def_readonly( "kind_", &CompletionData::kind_ );
|
|
|
|
class_< std::vector< CompletionData >,
|
|
boost::shared_ptr< std::vector< CompletionData > > >(
|
|
"CompletionVec" )
|
|
.def( vector_indexing_suite< std::vector< CompletionData > >() );
|
|
|
|
class_< Diagnostic >( "Diagnostic" )
|
|
.def_readonly( "line_number_", &Diagnostic::line_number_ )
|
|
.def_readonly( "column_number_", &Diagnostic::column_number_ )
|
|
.def_readonly( "kind_", &Diagnostic::kind_ )
|
|
.def_readonly( "filename_", &Diagnostic::filename_ )
|
|
.def_readonly( "text_", &Diagnostic::text_ );
|
|
|
|
class_< std::vector< Diagnostic > >( "DiagnosticVec" )
|
|
.def( vector_indexing_suite< std::vector< Diagnostic > >() );
|
|
|
|
class_< Future< AsyncResults > >( "FutureResults" )
|
|
.def( "ResultsReady", &Future< AsyncResults >::ResultsReady )
|
|
.def( "GetResults", &Future< AsyncResults >::GetResults );
|
|
|
|
class_< Future< AsyncCompletions > >( "FutureCompletions" )
|
|
.def( "ResultsReady", &Future< AsyncCompletions >::ResultsReady )
|
|
.def( "GetResults", &Future< AsyncCompletions >::GetResults );
|
|
|
|
class_< IdentifierCompleter, boost::noncopyable >( "IdentifierCompleter" )
|
|
.def( "EnableThreading", &IdentifierCompleter::EnableThreading )
|
|
.def( "AddCandidatesToDatabase",
|
|
&IdentifierCompleter::AddCandidatesToDatabase )
|
|
.def( "AddCandidatesToDatabaseFromBufferAsync",
|
|
&IdentifierCompleter::AddCandidatesToDatabaseFromBufferAsync )
|
|
.def( "CandidatesForQueryAndTypeAsync",
|
|
&IdentifierCompleter::CandidatesForQueryAndTypeAsync );
|
|
|
|
// CAREFUL HERE! For filename and contents we are referring directly to
|
|
// Python-allocated and -managed memory since we are accepting pointers to
|
|
// data members of python objects. We need to ensure that those objects
|
|
// outlive our UnsavedFile objects.
|
|
class_< UnsavedFile >( "UnsavedFile" )
|
|
.add_property( "filename_",
|
|
make_getter( &UnsavedFile::filename_ ),
|
|
make_setter( &UnsavedFile::filename_,
|
|
return_value_policy< reference_existing_object >() ) )
|
|
.add_property( "contents_",
|
|
make_getter( &UnsavedFile::contents_ ),
|
|
make_setter( &UnsavedFile::contents_,
|
|
return_value_policy< reference_existing_object >() ) )
|
|
.def_readwrite( "length_", &UnsavedFile::length_ );
|
|
|
|
class_< std::vector< UnsavedFile > >( "UnsavedFileVec" )
|
|
.def( vector_indexing_suite< std::vector< UnsavedFile > >() );
|
|
|
|
class_< ClangCompleter, boost::noncopyable >( "ClangCompleter" )
|
|
.def( "EnableThreading", &ClangCompleter::EnableThreading )
|
|
.def( "DiagnosticsForFile", &ClangCompleter::DiagnosticsForFile )
|
|
.def( "UpdatingTranslationUnit", &ClangCompleter::UpdatingTranslationUnit )
|
|
.def( "UpdateTranslationUnitAsync",
|
|
&ClangCompleter::UpdateTranslationUnitAsync )
|
|
.def( "CandidatesForQueryAndLocationInFileAsync",
|
|
&ClangCompleter::CandidatesForQueryAndLocationInFileAsync );
|
|
}
|