[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master bc48fc6 2/5: Arrange data members more logica
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master bc48fc6 2/5: Arrange data members more logically |
Date: |
Tue, 7 Mar 2017 18:04:19 -0500 (EST) |
branch: master
commit bc48fc6d37bbd099e8f88cdd6a75252303217eff
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Arrange data members more logically
---
input_sequence_parser.hpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/input_sequence_parser.hpp b/input_sequence_parser.hpp
index b8f36f1..2e972d6 100644
--- a/input_sequence_parser.hpp
+++ b/input_sequence_parser.hpp
@@ -90,7 +90,12 @@ class SequenceParser final
void mark_diagnostic_context();
+ // Parser products.
+ std::vector<ValueInterval> intervals_;
+
+ // Streams for parser input and diagnostic messages.
std::istringstream input_stream_;
+ std::ostringstream diagnostics_;
// Copies of ctor args that are identical to class InputSequence's.
int years_to_maturity_;
@@ -101,6 +106,7 @@ class SequenceParser final
std::vector<std::string> allowed_keywords_;
bool keywords_only_;
+ // Parser internals.
token_type current_token_type_ = e_startup;
double current_number_ = 0.0;
std::string current_keyword_;
@@ -109,10 +115,6 @@ class SequenceParser final
duration_mode current_duration_scalar_mode_ = e_inception;
ValueInterval current_interval_;
int last_input_duration_ = 0;
-
- std::ostringstream diagnostics_;
-
- std::vector<ValueInterval> intervals_;
};
#endif // input_sequence_parser_hpp