[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 8f8ef2f 1/5: Replace garish "expedient" names
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 8f8ef2f 1/5: Replace garish "expedient" names |
Date: |
Fri, 3 Feb 2017 20:07:36 +0000 (UTC) |
branch: master
commit 8f8ef2f9bbb49ccd940d9ad5973c5de75c0c97bb
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Replace garish "expedient" names
Replaced the garish names of a few members that had been introduced
in order to split classes InputSequence and SequenceParser.
---
input_sequence.cpp | 12 +++++++-----
input_sequence.hpp | 6 +++---
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/input_sequence.cpp b/input_sequence.cpp
index fa3b538..5d333cc 100644
--- a/input_sequence.cpp
+++ b/input_sequence.cpp
@@ -76,12 +76,12 @@ SequenceParser::SequenceParser
SequenceParser::~SequenceParser() = default;
-std::string SequenceParser::EXPEDIENTdiagnostics() const
+std::string SequenceParser::diagnostics() const
{
return diagnostics_.str();
}
-std::vector<ValueInterval> const& SequenceParser::EXPEDIENTintervals() const
+std::vector<ValueInterval> const& SequenceParser::intervals() const
{
return intervals_;
}
@@ -117,8 +117,8 @@ InputSequence::InputSequence
,keywords_only_
);
- EXPEDIENTdiagnostics_ = parser.EXPEDIENTdiagnostics();
- intervals_ = parser.EXPEDIENTintervals();
+ parser_diagnostics_ = parser.diagnostics();
+ intervals_ = parser.intervals();
// Inception and maturity endpoints exist, so the interval they
// define must exist. However, parsing an empty expression
@@ -1022,7 +1022,9 @@ std::string InputSequence::formatted_diagnostics
(bool show_first_message_only
) const
{
- std::string s(EXPEDIENTdiagnostics_);
+ // Data member parser_diagnostics_ exists only so that this function
+ // can return it. Eliminate it when this function is eliminated.
+ std::string s(parser_diagnostics_);
if(show_first_message_only)
{
std::string::size_type z(s.find('\n'));
diff --git a/input_sequence.hpp b/input_sequence.hpp
index d182118..c754517 100644
--- a/input_sequence.hpp
+++ b/input_sequence.hpp
@@ -186,8 +186,8 @@ class SequenceParser
~SequenceParser();
- std::string EXPEDIENTdiagnostics() const;
- std::vector<ValueInterval> const& EXPEDIENTintervals() const;
+ std::string diagnostics() const;
+ std::vector<ValueInterval> const& intervals() const;
private:
enum token_type
@@ -299,7 +299,7 @@ class LMI_SO InputSequence
// Copy of a ctor arg that is unique to this class.
std::string default_keyword_;
- std::string EXPEDIENTdiagnostics_;
+ std::string parser_diagnostics_;
std::vector<ValueInterval> intervals_;
std::vector<double> number_result_;