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

diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp
index 81a86ea..fd91875 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,10 +24,12 @@ 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[-3] = DictEntry("__flt", "i");
 }
 
 Statement BinaryParser::parse()
@@ -35,22 +39,29 @@ Statement BinaryParser::parse()
 		Statement st = parse_statement();
 		if(st.keyword=="__kwd")
 		{
-			if(st.args.size()!=3)
+			int id = st.args[0].get<int>();
+			if(id<=0)
 				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 &>();
+			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] = DictEntry(kw, args);
 		}
 		else if(st.keyword=="__str")
 		{
-			if(st.args.size()!=2)
+			int id = st.args[0].get<int>();
+			if(id<=0)
 				throw bad_definition("__str");
 
-			const unsigned id = st.args[0].get<unsigned>();
 			strings[id] = st.args[1].get<const string &>();
 		}
+		else if(st.keyword=="__flt")
+			float_precision = st.args[0].get<unsigned>();
 		else
 			return st;
 	}
@@ -127,21 +138,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()