Cosmetic changes

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

diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp
index 8e16498c32ce7dde8380f7c36480057a07efc7c9..11e0badaaa5c148cd37e53659a8119114fae29d9 100644 (file)
--- a/source/binaryparser.cpp
+++ b/source/binaryparser.cpp
@@ -1,5 +1,4 @@
 #include <limits>
-#include <sys/param.h>
 #include <msp/core/maputils.h>
 #include <msp/strings/format.h>
 #include "argumentstore.h"
@@ -15,9 +14,7 @@ namespace Msp {
 namespace DataFile {
 
 BinaryParser::BinaryParser(Input &i, const string &s):
-       ParserMode(i, s),
-       float_precision(32),
-       cur_info(0)
+       ParserMode(i, s)
 {
        dict[-1] = StatementInfo("__kwd", "iss");
        dict[-2] = StatementInfo("__str", "is");
@@ -30,7 +27,7 @@ Statement BinaryParser::parse()
        if(cur_info)
        {
                key = &cur_info->key;
-               cur_info = 0;
+               cur_info = nullptr;
        }
        else
        {
@@ -120,14 +117,14 @@ const StatementKey *BinaryParser::peek(unsigned level)
                for(unsigned i=sub_remaining.back(); i-->0; )
                        parse();
                sub_remaining.pop_back();
-               cur_info = 0;
+               cur_info = nullptr;
        }
 
        if(!sub_remaining.empty() && sub_remaining.back()==0)
        {
                // No more substatements on this level
-               cur_info = 0;
-               return 0;
+               cur_info = nullptr;
+               return nullptr;
        }
 
        if(cur_info)
@@ -135,7 +132,7 @@ const StatementKey *BinaryParser::peek(unsigned level)
 
        int id = parse_int();
        if(!in)
-               return 0;
+               return nullptr;
 
        cur_info = &get_item(dict, id);
        return &cur_info->key;
@@ -170,7 +167,7 @@ bool BinaryParser::parse_and_load(unsigned level, Loader &ldr, const LoaderActio
        if(!sub_remaining.empty())
                --sub_remaining.back();
        sub_remaining.push_back(parse_int());
-       cur_info = 0;
+       cur_info = nullptr;
 
        act.execute(ldr, args);
 
@@ -201,7 +198,7 @@ IntType::Store BinaryParser::parse_int()
 
 FloatType::Store BinaryParser::parse_float()
 {
-       UInt64 encoded = 0;
+       uint64_t encoded = 0;
        for(unsigned i=0; i<float_precision; i+=8)
        {
                int c = in.get();