[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master aee673f 05/10: Fix defect introduced 20170205
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master aee673f 05/10: Fix defect introduced 20170205T2107Z: fixed the wrong problem |
Date: |
Mon, 6 Feb 2017 04:10:56 +0000 (UTC) |
branch: master
commit aee673fd8ae2c74d939ef3cac6a7d99b33b1ca4b
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Fix defect introduced 20170205T2107Z: fixed the wrong problem
There was no newline to remove. Only the code now copied from
formatted_diagnostics() is wanted.
---
input_sequence_entry.cpp | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/input_sequence_entry.cpp b/input_sequence_entry.cpp
index 18a1000..8ee719e 100644
--- a/input_sequence_entry.cpp
+++ b/input_sequence_entry.cpp
@@ -29,7 +29,6 @@
#include "input.hpp"
#include "input_seq_helpers.hpp"
#include "input_sequence.hpp"
-#include "miscellany.hpp" // rtrim()
#include "mvc_controller.hpp"
#include "numeric_io_cast.hpp"
#include "value_cast.hpp"
@@ -1221,7 +1220,11 @@ wxString InputSequenceEditor::get_diagnostics_message()
,default_keyword_
);
std::string parser_diagnostics(sequence.formatted_diagnostics());
- rtrim(parser_diagnostics, "\n");
+ std::string::size_type z(parser_diagnostics.find('\n'));
+ if(std::string::npos != z)
+ {
+ parser_diagnostics.erase(z);
+ }
return wxString(parser_diagnostics.c_str());
}
@@ -1562,7 +1565,11 @@ void InputSequenceEntry::DoOpenEditor()
);
std::string parser_diagnostics(sequence.formatted_diagnostics());
- rtrim(parser_diagnostics, "\n");
+ std::string::size_type z(parser_diagnostics.find('\n'));
+ if(std::string::npos != z)
+ {
+ parser_diagnostics.erase(z);
+ }
if(!parser_diagnostics.empty())
{
warning()
- [lmi-commits] [lmi] master updated (97d2acd -> 6eb2614), Greg Chicares, 2017/02/05
- [lmi-commits] [lmi] master 934e2f6 04/10: Emphasize that [lr]trim() removes no internal superfluity, Greg Chicares, 2017/02/05
- [lmi-commits] [lmi] master 3e089d5 03/10: Fix defect introduced 20110801T2357Z: arguments omitted, Greg Chicares, 2017/02/05
- [lmi-commits] [lmi] master e52e02c 02/10: GUI sequence parser diagnostics: generalize code, improve documentation, Greg Chicares, 2017/02/05
- [lmi-commits] [lmi] master 987adcc 06/10: Get sequence parser diagnostics from exception, not function, Greg Chicares, 2017/02/05
- [lmi-commits] [lmi] master 6eb2614 10/10: Improve unit test, Greg Chicares, 2017/02/05
- [lmi-commits] [lmi] master 601f252 07/10: Throw any parser diagnostics from interval_representation(), Greg Chicares, 2017/02/05
- [lmi-commits] [lmi] master aee673f 05/10: Fix defect introduced 20170205T2107Z: fixed the wrong problem,
Greg Chicares <=
- [lmi-commits] [lmi] master e411ac4 09/10: Throw any parser errors from all *_representation() functions, Greg Chicares, 2017/02/05
- [lmi-commits] [lmi] master 502fedc 01/10: Improve [lr]trim unit test and documentation, Greg Chicares, 2017/02/05
- [lmi-commits] [lmi] master 4f05707 08/10: Omit unhelpful file name and line number from a warning, Greg Chicares, 2017/02/05