X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinaryparser.cpp;h=e8487223cf24d1290e07ed302774b3fb7ee00d28;hb=3b0d6fb8462bf87956099365d02ebb28435509cd;hp=298770a50f3ccbf2b02d3113f0163daea0dfefa7;hpb=27630d44298cb67e075c166f4421288cc8ca117e;p=libs%2Fdatafile.git diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp index 298770a..e848722 100644 --- a/source/binaryparser.cpp +++ b/source/binaryparser.cpp @@ -1,12 +1,5 @@ -/* $Id$ - -This file is part of libmspdatafile -Copyright © 2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include -#include +#include #include "binaryparser.h" #include "input.h" @@ -19,32 +12,32 @@ BinaryParser::BinaryParser(Input &i, const string &s): ParserMode(i, s), first(true) { - dict[1]=DictEntry("__kw", "iss"); - dict[2]=DictEntry("__enum", "is"); + dict[1] = DictEntry("__kwd", "iss"); + dict[2] = DictEntry("__str", "is"); } Statement BinaryParser::parse() { while(1) { - Statement st=parse_statement(); - if(st.keyword=="__kw") + Statement st = parse_statement(); + if(st.keyword=="__kwd") { if(st.args.size()!=3) - throw TypeError(src+": Keyword definition must have three arguments"); + throw_at(TypeError("Keyword definition must have three arguments"), src); - const unsigned id=st.args[0].get(); - const string &kw=st.args[1].get(); - const string &args=st.args[2].get(); - dict[id]=DictEntry(kw, args); + const unsigned id = st.args[0].get(); + const string &kw = st.args[1].get(); + const string &args = st.args[2].get(); + dict[id] = DictEntry(kw, args); } - else if(st.keyword=="__enum") + else if(st.keyword=="__str") { if(st.args.size()!=2) - throw TypeError(src+": Enum definition must have three arguments"); + throw_at(TypeError("String definition must have two arguments"), src); - const unsigned id=st.args[0].get(); - enums[id]=st.args[1].get(); + const unsigned id = st.args[0].get(); + strings[id] = st.args[1].get(); } else return st; @@ -55,70 +48,70 @@ Statement BinaryParser::parse_statement() { while(first && in.peek()=='\n') in.get(); - first=false; + first = false; - unsigned id=parse_int(); + unsigned id = parse_int(); if(!in) return Statement(); - Dictionary::const_iterator i=dict.find(id); + Dictionary::const_iterator i = dict.find(id); if(i==dict.end()) - throw ParseError(format("%s: Unknown statement ID %d", src, id), src, 0); - const DictEntry &de=i->second; + throw_at(KeyError("Unknown statement ID", lexical_cast(id)), src); + const DictEntry &de = i->second; Statement result; - result.keyword=de.keyword; - result.source=src; + result.keyword = de.keyword; + result.source = src; - for(unsigned j=0; j=0) + { + string result; + result.reserve(len); + for(int i = 0; isecond; }