Refactor symbol handling in binary format

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

diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp
index e8487223cf24d1290e07ed302774b3fb7ee00d28..73bb5cb664c32ba5ecda25ca9aa047c16e2610bd 100644 (file)
--- a/source/binaryparser.cpp
+++ b/source/binaryparser.cpp
@@ -1,4 +1,5 @@
 #include <sys/param.h>
+#include <msp/core/maputils.h>
 #include <msp/strings/format.h>
 #include "binaryparser.h"
 #include "input.h"
@@ -8,6 +9,17 @@ using namespace std;
 namespace Msp {
 namespace DataFile {
 
+class bad_definition: public runtime_error
+{
+public:
+       bad_definition(const std::string &w):
+               runtime_error(w)
+       { }
+
+       virtual ~bad_definition() throw() { }
+};
+
+
 BinaryParser::BinaryParser(Input &i, const string &s):
        ParserMode(i, s),
        first(true)
@@ -24,7 +36,7 @@ Statement BinaryParser::parse()
                if(st.keyword=="__kwd")
                {
                        if(st.args.size()!=3)
-                               throw_at(TypeError("Keyword definition must have three arguments"), src);
+                               throw bad_definition("__kwd");
 
                        const unsigned id = st.args[0].get<unsigned>();
                        const string &kw = st.args[1].get<const string &>();
@@ -34,7 +46,7 @@ Statement BinaryParser::parse()
                else if(st.keyword=="__str")
                {
                        if(st.args.size()!=2)
-                               throw_at(TypeError("String definition must have two arguments"), src);
+                               throw bad_definition("__str");
 
                        const unsigned id = st.args[0].get<unsigned>();
                        strings[id] = st.args[1].get<const string &>();
@@ -54,10 +66,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;
@@ -80,7 +89,7 @@ Statement BinaryParser::parse_statement()
                        result.args.push_back(parse_bool());
                        break;
                case SymbolType::signature:
-                       result.args.push_back(Symbol(parse_enum()));
+                       result.args.push_back(parse_symbol());
                        break;
                }
        }
@@ -152,20 +161,12 @@ string BinaryParser::parse_string()
                return result;
        }
        else
-               return lookup_string(-len);
-}
-
-string BinaryParser::parse_enum()
-{
-       return lookup_string(parse_int());
+               return get_item(strings, -len);
 }
 
-const string &BinaryParser::lookup_string(unsigned id) const
+Symbol BinaryParser::parse_symbol()
 {
-       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