X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinaryparser.cpp;fp=source%2Fbinaryparser.cpp;h=7d1591de77105264a3d59fc2506c4bd0c03a9739;hb=2d289d20a9a4aeac7774976e4213a7c72f1dc75b;hp=796a592d3e84d05a70e2e8316abdcccbe543f3bf;hpb=d248c63a252b0efcbcd9ef11cf7f8e22e594403e;p=libs%2Fdatafile.git

diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp
index 796a592..7d1591d 100644
--- a/source/binaryparser.cpp
+++ b/source/binaryparser.cpp
@@ -27,9 +27,9 @@ BinaryParser::BinaryParser(Input &i, const string &s):
 	first(true),
 	float_precision(32)
 {
-	dict[-1] = DictEntry("__kwd", "iss");
-	dict[-2] = DictEntry("__str", "is");
-	dict[-3] = DictEntry("__flt", "i");
+	dict[-1] = StatementKey("__kwd", "iss");
+	dict[-2] = StatementKey("__str", "is");
+	dict[-3] = StatementKey("__flt", "i");
 }
 
 Statement BinaryParser::parse(bool raw)
@@ -50,7 +50,7 @@ Statement BinaryParser::parse(bool raw)
 					if(!valid_signatures[j])
 						throw bad_definition("__kwd");
 
-			dict[id] = DictEntry(kw, args);
+			dict[id] = StatementKey(kw, args);
 		}
 		else if(st.keyword=="__str")
 		{
@@ -80,15 +80,15 @@ Statement BinaryParser::parse_statement(bool raw)
 	if(!in)
 		return Statement();
 
-	const DictEntry &de = get_item(dict, id);
+	const StatementKey &key = get_item(dict, id);
 
 	Statement result;
-	result.keyword = de.keyword;
+	result.keyword = key.keyword;
 	result.source = src;
 
-	for(unsigned j = 0; j<de.args.size(); ++j)
+	for(unsigned j=0; j<key.signature.size(); ++j)
 	{
-		switch(de.args[j])
+		switch(key.signature[j])
 		{
 		case IntType::signature:
 			result.args.push_back(parse_int());