[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master a43582c 2/4: Refactor for simplicity
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master a43582c 2/4: Refactor for simplicity |
Date: |
Mon, 6 Feb 2017 19:13:31 +0000 (UTC) |
branch: master
commit a43582cc6016e6d3be86c6ed5e81060e63e49f05
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Refactor for simplicity
---
gpt_input.cpp | 8 +-------
input_realization.cpp | 24 +++---------------------
input_sequence_entry.cpp | 16 ++--------------
mec_input.cpp | 8 +-------
4 files changed, 7 insertions(+), 49 deletions(-)
diff --git a/gpt_input.cpp b/gpt_input.cpp
index 4da87ff..600beb9 100644
--- a/gpt_input.cpp
+++ b/gpt_input.cpp
@@ -66,13 +66,7 @@ std::string realize_sequence_string
}
catch(std::exception const& e)
{
- std::string parser_diagnostics(e.what());
- std::string::size_type z(parser_diagnostics.find('\n'));
- if(std::string::npos != z)
- {
- parser_diagnostics.erase(z);
- }
- return parser_diagnostics;
+ return abridge_diagnostics(e.what());
}
return std::string();
}
diff --git a/input_realization.cpp b/input_realization.cpp
index 20bbf99..64adc1d 100644
--- a/input_realization.cpp
+++ b/input_realization.cpp
@@ -64,13 +64,7 @@ std::string realize_sequence_string
}
catch(std::exception const& e)
{
- std::string parser_diagnostics(e.what());
- std::string::size_type z(parser_diagnostics.find('\n'));
- if(std::string::npos != z)
- {
- parser_diagnostics.erase(z);
- }
- return parser_diagnostics;
+ return abridge_diagnostics(e.what());
}
return std::string();
}
@@ -108,13 +102,7 @@ std::string realize_sequence_string
}
catch(std::exception const& e)
{
- std::string parser_diagnostics(e.what());
- std::string::size_type z(parser_diagnostics.find('\n'));
- if(std::string::npos != z)
- {
- parser_diagnostics.erase(z);
- }
- return parser_diagnostics;
+ return abridge_diagnostics(e.what());
}
return std::string();
}
@@ -154,13 +142,7 @@ std::string realize_sequence_string
}
catch(std::exception const& e)
{
- std::string parser_diagnostics(e.what());
- std::string::size_type z(parser_diagnostics.find('\n'));
- if(std::string::npos != z)
- {
- parser_diagnostics.erase(z);
- }
- return parser_diagnostics;
+ return abridge_diagnostics(e.what());
}
return std::string();
}
diff --git a/input_sequence_entry.cpp b/input_sequence_entry.cpp
index 5af7f86..47944dd 100644
--- a/input_sequence_entry.cpp
+++ b/input_sequence_entry.cpp
@@ -1225,13 +1225,7 @@ wxString InputSequenceEditor::get_diagnostics_message()
}
catch(std::exception const& e)
{
- std::string parser_diagnostics(e.what());
- std::string::size_type z(parser_diagnostics.find('\n'));
- if(std::string::npos != z)
- {
- parser_diagnostics.erase(z);
- }
- return wxString(parser_diagnostics.c_str());
+ return wxString(abridge_diagnostics(e.what()).c_str());
}
return wxString();
@@ -1578,15 +1572,9 @@ void InputSequenceEntry::DoOpenEditor()
}
catch(std::exception const& e)
{
- std::string parser_diagnostics(e.what());
- std::string::size_type z(parser_diagnostics.find('\n'));
- if(std::string::npos != z)
- {
- parser_diagnostics.erase(z);
- }
warning()
<< "The sequence is invalid and cannot be edited visually.\n"
- << parser_diagnostics
+ << abridge_diagnostics(e.what())
<< std::flush
;
return;
diff --git a/mec_input.cpp b/mec_input.cpp
index f3feff7..8b626ae 100644
--- a/mec_input.cpp
+++ b/mec_input.cpp
@@ -66,13 +66,7 @@ std::string realize_sequence_string
}
catch(std::exception const& e)
{
- std::string parser_diagnostics(e.what());
- std::string::size_type z(parser_diagnostics.find('\n'));
- if(std::string::npos != z)
- {
- parser_diagnostics.erase(z);
- }
- return parser_diagnostics;
+ return abridge_diagnostics(e.what());
}
return std::string();
}