Use default member initializers for constant initial values

[libs/datafile.git] / source / jsonparser.cpp

diff --git a/source/jsonparser.cpp b/source/jsonparser.cpp
index 4b937035b81fbcb5412efd216a8d74de779150bb..dcb1cf6a911343d3915598856f4e77e1747738e7 100644 (file)
--- a/source/jsonparser.cpp
+++ b/source/jsonparser.cpp
@@ -9,8 +9,7 @@ namespace Msp {
 namespace DataFile {
 
 JsonParser::JsonParser(Input &i, const string &s):
-       ParserMode(i, s),
-       toplevel_state(STATE_INIT)
+       ParserMode(i, s)
 { }
 
 Statement JsonParser::parse()
@@ -82,7 +81,7 @@ Statement JsonParser::parse_statement(const Token *t, State outer_state, const s
                if(t)
                {
                        token = *t;
-                       t = 0;
+                       t = nullptr;
                }
                else
                        token = parse_token();
@@ -312,7 +311,7 @@ string JsonParser::unescape(const string &str)
        StringCodec::Utf8::Encoder enc;
        bool escape = false;
 
-       for(string::const_iterator i=str.begin(); i!=str.end(); )
+       for(auto i=str.begin(); i!=str.end(); )
        {
                StringCodec::unichar c = dec.decode_char(str, i);