X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinaryparser.cpp;h=8e16498c32ce7dde8380f7c36480057a07efc7c9;hb=b3b3fc2caf409f8c8ba523bbb3519af13b17e66e;hp=4ed2877a4424c2389c890473a0e71918418516ba;hpb=193d36c8ce13cf2c5cd055fbd008f3003dda0a3e;p=libs%2Fdatafile.git

diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp
index 4ed2877..8e16498 100644
--- a/source/binaryparser.cpp
+++ b/source/binaryparser.cpp
@@ -62,7 +62,7 @@ Statement BinaryParser::parse()
 			result.args.push_back(parse_bool());
 			break;
 		case SymbolType::signature:
-			result.args.push_back(parse_symbol());
+			result.args.push_back(Value(parse_symbol()));
 			break;
 		}
 	}
@@ -91,8 +91,8 @@ void BinaryParser::process_control_statement(const Statement &st)
 
 		const string &kw = st.args[1].get<const string &>();
 		const string &args = st.args[2].get<const string &>();
-		for(string::const_iterator i=args.begin(); i!=args.end(); ++i)
-			for(unsigned j=0; valid_signatures[j]!=*i; ++j)
+		for(char c: args)
+			for(unsigned j=0; valid_signatures[j]!=c; ++j)
 				if(!valid_signatures[j])
 					throw bad_definition("__kwd");