X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinaryparser.cpp;h=25edd63a15060d96bb5bcc95775cc3241dc9ce36;hb=29fafaa2c570b0cf92f41eeb534cfb65a841a892;hp=81a86ea9a3b66b7ae9c9a6ba0a3dfff4f134ff17;hpb=e0af585ed57bdb5b1ea4f4a415fda13b5d99d2dc;p=libs%2Fdatafile.git

diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp
index 81a86ea..25edd63 100644
--- a/source/binaryparser.cpp
+++ b/source/binaryparser.cpp
@@ -1,7 +1,9 @@
+#include <limits>
 #include <sys/param.h>
 #include <msp/core/maputils.h>
 #include <msp/strings/format.h>
 #include "binaryparser.h"
+#include "binfloat.h"
 #include "input.h"
 
 using namespace std;
@@ -22,41 +24,15 @@ public:
 
 BinaryParser::BinaryParser(Input &i, const string &s):
 	ParserMode(i, s),
-	first(true)
+	first(true),
+	float_precision(32)
 {
-	dict[-1] = DictEntry("__kwd", "iss");
-	dict[-2] = DictEntry("__str", "is");
+	dict[-1] = StatementKey("__kwd", "iss");
+	dict[-2] = StatementKey("__str", "is");
+	dict[-3] = StatementKey("__flt", "i");
 }
 
 Statement BinaryParser::parse()
-{
-	while(1)
-	{
-		Statement st = parse_statement();
-		if(st.keyword=="__kwd")
-		{
-			if(st.args.size()!=3)
-				throw bad_definition("__kwd");
-
-			const int id = st.args[0].get<unsigned>();
-			const string &kw = st.args[1].get<const string &>();
-			const string &args = st.args[2].get<const string &>();
-			dict[id] = DictEntry(kw, args);
-		}
-		else if(st.keyword=="__str")
-		{
-			if(st.args.size()!=2)
-				throw bad_definition("__str");
-
-			const unsigned id = st.args[0].get<unsigned>();
-			strings[id] = st.args[1].get<const string &>();
-		}
-		else
-			return st;
-	}
-}
-
-Statement BinaryParser::parse_statement()
 {
 	while(first && in.peek()=='\n')
 		in.get();
@@ -66,15 +42,15 @@ Statement BinaryParser::parse_statement()
 	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());
@@ -103,6 +79,35 @@ Statement BinaryParser::parse_statement()
 	return result;
 }
 
+void BinaryParser::process_control_statement(const Statement &st)
+{
+	if(st.keyword=="__kwd")
+	{
+		int id = st.args[0].get<int>();
+		if(id<=0)
+			throw bad_definition("__kwd");
+
+		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)
+				if(!valid_signatures[j])
+					throw bad_definition("__kwd");
+
+		dict[id] = StatementKey(kw, args);
+	}
+	else if(st.keyword=="__str")
+	{
+		int id = st.args[0].get<int>();
+		if(id<=0)
+			throw bad_definition("__str");
+
+		strings[id] = st.args[1].get<const string &>();
+	}
+	else if(st.keyword=="__flt")
+		float_precision = st.args[0].get<unsigned>();
+}
+
 IntType::Store BinaryParser::parse_int()
 {
 	IntType::Store result = 0;
@@ -127,21 +132,47 @@ IntType::Store BinaryParser::parse_int()
 
 FloatType::Store BinaryParser::parse_float()
 {
-	union
+	UInt64 encoded = 0;
+	for(unsigned i=0; i<float_precision; i+=8)
+	{
+		int c = in.get();
+		encoded = (encoded<<8) | (c&0xFF);
+	}
+
+	BinFloat bf = BinFloat::explode(encoded, float_precision);
+
+	if(numeric_limits<FloatType::Store>::is_iec559)
+		return bf.compose_iec559<FloatType::Store>();
+	else
 	{
-		float f;
-		char d[sizeof(float)];
-	};
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-	for(unsigned i = sizeof(float); i--;)
-		d[i] = in.get();
-#else
-	for(unsigned i = 0; i<sizeof(float); ++i)
-		d[i] = in.get();
-#endif
-
-	return f;
+		/* Put the float together with arithmetic since we don't know its
+		internal layout */
+		FloatType::Store f = 0;
+		if(bf.infinity)
+		{
+			if(numeric_limits<FloatType::Store>::has_infinity)
+				f = numeric_limits<FloatType::Store>::infinity();
+			else
+				f = numeric_limits<FloatType::Store>::max();
+		}
+		else
+		{
+			for(unsigned i=0; i<64; ++i)
+			{
+				f /= 2;
+				if(bf.mantissa&1)
+					f += 1;
+				bf.mantissa >>= 1;
+			}
+			for(int i=0; i<bf.exponent; ++i)
+				f *= 2;
+			for(int i=0; i>bf.exponent; --i)
+				f /= 2;
+		}
+		if(bf.sign)
+			f = -f;
+		return f;
+	}
 }
 
 BoolType::Store BinaryParser::parse_bool()