X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinaryparser.cpp;h=d2fca32ef3a2155eb78eec3034e67649336c3c0f;hb=35d0da96bad97214376f18d15078e6d731e6f219;hp=2b50002eed7d26c3411fb4f70c85b8d3a9bf389d;hpb=7df5e45c7f414f6a07681dc4ec2abb63b091a309;p=libs%2Fdatafile.git

diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp
index 2b50002..d2fca32 100644
--- a/source/binaryparser.cpp
+++ b/source/binaryparser.cpp
@@ -1,5 +1,6 @@
 #include <sys/param.h>
-#include <msp/strings/formatter.h>
+#include <msp/core/maputils.h>
+#include <msp/strings/format.h>
 #include "binaryparser.h"
 #include "input.h"
 
@@ -54,10 +55,7 @@ Statement BinaryParser::parse_statement()
 	if(!in)
 		return Statement();
 
-	Dictionary::const_iterator i = dict.find(id);
-	if(i==dict.end())
-		throw_at(KeyError("Unknown statement ID", lexical_cast(id)), src);
-	const DictEntry &de = i->second;
+	const DictEntry &de = get_item(dict, id);
 
 	Statement result;
 	result.keyword = de.keyword;
@@ -152,20 +150,12 @@ string BinaryParser::parse_string()
 		return result;
 	}
 	else
-		return lookup_string(-len);
+		return get_item(strings, -len);
 }
 
 string BinaryParser::parse_enum()
 {
-	return lookup_string(parse_int());
-}
-
-const string &BinaryParser::lookup_string(unsigned id) const
-{
-	StringMap::const_iterator i = strings.find(id);
-	if(i==strings.end())
-		throw_at(KeyError("Unknown string", lexical_cast(id)), src);
-	return i->second;
+	return get_item(strings, parse_int());
 }
 
 } // namespace DataFile