zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Renamed a few variables to more appropriate names

merge-requests/365/head
eidheim 10 years ago
parent
af62c9a3f7
commit
d8ab25db47
2 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/source_clang.cc
  2. 10
      src/source_clang.h

22
src/source_clang.cc
Unescape View File

@ -35,7 +35,7 @@ Source::View(file_path, project_path, language) {
parsing_in_progress=Singleton::terminal->print_in_progress("Parsing "+file_path.string()); parsing_in_progress=Singleton::terminal->print_in_progress("Parsing "+file_path.string());
//GTK-calls must happen in main thread, so the parse_thread //GTK-calls must happen in main thread, so the parse_thread
//sends signals to the main thread that it is to call the following functions: //sends signals to the main thread that it is to call the following functions:
parse_start_connection=parse_preprocess.connect([this]{ parse_preprocess_connection=parse_preprocess.connect([this]{
auto expected=ParseProcessState::PREPROCESSING; auto expected=ParseProcessState::PREPROCESSING;
if(parse_mutex.try_lock()) { if(parse_mutex.try_lock()) {
if(parse_process_state.compare_exchange_strong(expected, ParseProcessState::PROCESSING)) if(parse_process_state.compare_exchange_strong(expected, ParseProcessState::PROCESSING))
@ -45,7 +45,7 @@ Source::View(file_path, project_path, language) {
else else
parse_process_state.compare_exchange_strong(expected, ParseProcessState::STARTING); parse_process_state.compare_exchange_strong(expected, ParseProcessState::STARTING);
}); });
parse_done_connection=parse_postprocess.connect([this](){ parse_postprocess_connection=parse_postprocess.connect([this](){
if(parse_mutex.try_lock()) { if(parse_mutex.try_lock()) {
auto expected=ParseProcessState::POSTPROCESSING; auto expected=ParseProcessState::POSTPROCESSING;
if(parse_process_state.compare_exchange_strong(expected, ParseProcessState::IDLE)) { if(parse_process_state.compare_exchange_strong(expected, ParseProcessState::IDLE)) {
@ -57,7 +57,7 @@ Source::View(file_path, project_path, language) {
parse_mutex.unlock(); parse_mutex.unlock();
} }
}); });
parse_fail_connection=parse_error.connect([this](){ parse_error_connection=parse_error.connect([this](){
Singleton::terminal->print("Error: failed to reparse "+this->file_path.string()+".\n", true); Singleton::terminal->print("Error: failed to reparse "+this->file_path.string()+".\n", true);
set_status(""); set_status("");
set_info(""); set_info("");
@ -663,7 +663,7 @@ Source::ClangViewParse(file_path, project_path, language), autocomplete_state(Au
return false; return false;
}); });
autocomplete_done_connection=autocomplete_done.connect([this](){ autocomplete_error_connection=autocomplete_done.connect([this](){
if(autocomplete_state==AutocompleteState::CANCELED) { if(autocomplete_state==AutocompleteState::CANCELED) {
set_status(""); set_status("");
soft_reparse(); soft_reparse();
@ -710,7 +710,7 @@ Source::ClangViewParse(file_path, project_path, language), autocomplete_state(Au
autocomplete_restart_connection=autocomplete_restart.connect([this]() { autocomplete_restart_connection=autocomplete_restart.connect([this]() {
autocomplete_check(); autocomplete_check();
}); });
autocomplete_fail_connection=autocomplete_fail.connect([this]() { autocomplete_error_connection=autocomplete_error.connect([this]() {
Singleton::terminal->print("Error: autocomplete failed, reparsing "+this->file_path.string()+"\n", true); Singleton::terminal->print("Error: autocomplete failed, reparsing "+this->file_path.string()+"\n", true);
autocomplete_state=AutocompleteState::CANCELED; autocomplete_state=AutocompleteState::CANCELED;
full_reparse(); full_reparse();
@ -867,7 +867,7 @@ void Source::ClangViewAutocomplete::autocomplete() {
if(parse_state==ParseState::PROCESSING) if(parse_state==ParseState::PROCESSING)
autocomplete_done(); autocomplete_done();
else else
autocomplete_fail(); autocomplete_error();
parse_mutex.unlock(); parse_mutex.unlock();
}); });
} }
@ -1393,12 +1393,12 @@ Source::ClangView::ClangView(const boost::filesystem::path &file_path, const boo
void Source::ClangView::async_delete() { void Source::ClangView::async_delete() {
delayed_reparse_connection.disconnect(); delayed_reparse_connection.disconnect();
parse_done_connection.disconnect(); parse_postprocess_connection.disconnect();
parse_start_connection.disconnect(); parse_preprocess_connection.disconnect();
parse_fail_connection.disconnect(); parse_error_connection.disconnect();
autocomplete_done_connection.disconnect(); autocomplete_error_connection.disconnect();
autocomplete_restart_connection.disconnect(); autocomplete_restart_connection.disconnect();
autocomplete_fail_connection.disconnect(); autocomplete_error_connection.disconnect();
do_restart_parse_connection.disconnect(); do_restart_parse_connection.disconnect();
delayed_tag_similar_tokens_connection.disconnect(); delayed_tag_similar_tokens_connection.disconnect();
ClangViewAutocomplete::async_delete(); ClangViewAutocomplete::async_delete();

10
src/source_clang.h
Unescape View File

@ -53,9 +53,9 @@ namespace Source {
std::mutex parse_mutex; std::mutex parse_mutex;
std::atomic<ParseState> parse_state; std::atomic<ParseState> parse_state;
std::atomic<ParseProcessState> parse_process_state; std::atomic<ParseProcessState> parse_process_state;
sigc::connection parse_done_connection; sigc::connection parse_preprocess_connection;
sigc::connection parse_start_connection; sigc::connection parse_postprocess_connection;
sigc::connection parse_fail_connection; sigc::connection parse_error_connection;
private: private:
Glib::Dispatcher parse_preprocess; Glib::Dispatcher parse_preprocess;
Glib::Dispatcher parse_postprocess; Glib::Dispatcher parse_postprocess;
@ -92,7 +92,7 @@ namespace Source {
std::thread autocomplete_thread; std::thread autocomplete_thread;
sigc::connection autocomplete_done_connection; sigc::connection autocomplete_done_connection;
sigc::connection autocomplete_restart_connection; sigc::connection autocomplete_restart_connection;
sigc::connection autocomplete_fail_connection; sigc::connection autocomplete_error_connection;
sigc::connection do_delete_object_connection; sigc::connection do_delete_object_connection;
sigc::connection do_restart_parse_connection; sigc::connection do_restart_parse_connection;
private: private:
@ -106,7 +106,7 @@ namespace Source {
std::vector<AutoCompleteData> autocomplete_get_suggestions(const std::string &buffer, int line_number, int column); std::vector<AutoCompleteData> autocomplete_get_suggestions(const std::string &buffer, int line_number, int column);
Glib::Dispatcher autocomplete_done; Glib::Dispatcher autocomplete_done;
Glib::Dispatcher autocomplete_restart; Glib::Dispatcher autocomplete_restart;
Glib::Dispatcher autocomplete_fail; Glib::Dispatcher autocomplete_error;
guint last_keyval=0; guint last_keyval=0;
std::string prefix; std::string prefix;
std::mutex prefix_mutex; std::mutex prefix_mutex;

Write Preview
Loading…
Cancel
Save