[lmi-commits] [lmi] master 6afc28a 3/5: Prefer brace-or-equal-initializers

[Greg Chicares]

branch: master
commit 6afc28aad7bd97992bbf9073f7a6db35ba9954c0
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Prefer brace-or-equal-initializers
    
    sequence() is called by the only ctor, and it cannot initialize
    input_stream_ anyway, so there is no reason for it to initialize other
    data members that can be initialized in the class declaration.
    
    Formerly, last_input_duration_ was certainly uninitialized sometimes.
    That would have been less likely had brace-or-equal-initializers been
    available when this code was originally written.
---
 input_sequence_parser.cpp |  5 -----
 input_sequence_parser.hpp | 12 ++++++------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/input_sequence_parser.cpp b/input_sequence_parser.cpp
index b534f5e..0f3fe91 100644
--- a/input_sequence_parser.cpp
+++ b/input_sequence_parser.cpp
@@ -501,11 +501,6 @@ void SequenceParser::span()
 
 void SequenceParser::sequence()
 {
-    current_token_type_            = e_startup;
-    previous_duration_scalar_mode_ = e_inception;
-    current_duration_scalar_mode_  = e_inception;
-    last_input_duration_           = 0;
-
     // All ValueInterval members should be set explicitly, so
     // initialize them now to recognizable, implausible values,
     // such that the interval is insane until modified.
diff --git a/input_sequence_parser.hpp b/input_sequence_parser.hpp
index d88ea18..d1a5d3d 100644
--- a/input_sequence_parser.hpp
+++ b/input_sequence_parser.hpp
@@ -103,14 +103,14 @@ class SequenceParser
     std::vector<std::string> allowed_keywords_;
     bool keywords_only_;
 
-    token_type current_token_type_;
-    double current_number_;
+    token_type current_token_type_               = e_startup;
+    double current_number_                       = 0.0;
     std::string current_keyword_;
-    int current_duration_scalar_;
-    duration_mode previous_duration_scalar_mode_;
-    duration_mode current_duration_scalar_mode_;
+    int current_duration_scalar_                 = 0;
+    duration_mode previous_duration_scalar_mode_ = e_inception;
+    duration_mode current_duration_scalar_mode_  = e_inception;
     ValueInterval current_interval_;
-    int last_input_duration_;
+    int last_input_duration_                     = 0;
 
     std::ostringstream diagnostics_;