X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Fbinaryparser.cpp;h=4ed2877a4424c2389c890473a0e71918418516ba;hp=e105393f3d02c16f1fbb21ff5a5922f365e8534b;hb=HEAD;hpb=ffdab05698de3d2d612f04ffc146381c2362d386

diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp
index e105393..11e0bad 100644
--- a/source/binaryparser.cpp
+++ b/source/binaryparser.cpp
@@ -14,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");
@@ -29,7 +27,7 @@ Statement BinaryParser::parse()
 	if(cur_info)
 	{
 		key = &cur_info->key;
-		cur_info = 0;
+		cur_info = nullptr;
 	}
 	else
 	{
@@ -119,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)
@@ -134,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;
@@ -169,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);