X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstrings%2Flexicalcast.cpp;h=782f4a8537adb05583c6e45e68c6b80620439142;hp=5903bb1197d6364382714dd4f1772b477844b919;hb=967785734be5c3fc6f75da122c2d93ebbb338271;hpb=b56eb5ec1da675da0c66abc53c1e4f6c4e4cccbd

diff --git a/source/strings/lexicalcast.cpp b/source/strings/lexicalcast.cpp
index 5903bb1..782f4a8 100644
--- a/source/strings/lexicalcast.cpp
+++ b/source/strings/lexicalcast.cpp
@@ -1,12 +1,6 @@
-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2006-2008 Mikko Rasa
-Distributed under the LGPL
-*/
-
 #include <cmath>
 #include <limits>
+#include "format.h"
 #include "lexicalcast.h"
 
 using namespace std;
@@ -130,7 +124,7 @@ template<typename T>
 T str_to_int(const std::string &s, const Fmt &f)
 {
 	if(s.empty())
-		throw LexicalError("Empty input in integer conversion");
+		throw lexical_error("conversion of '' to integer");
 
 	std::string::const_iterator i = s.begin();
 
@@ -139,7 +133,7 @@ T str_to_int(const std::string &s, const Fmt &f)
 	if(*i=='-')
 	{
 		if(!IsSigned<T>::result)
-			throw LexicalError("Negative sign in unsigned integer conversion");
+			throw lexical_error(format("conversion of '%s' to unsigned integer", s));
 		neg = true;
 		++i;
 	}
@@ -148,7 +142,7 @@ T str_to_int(const std::string &s, const Fmt &f)
 
 	// Must have some digits to convert
 	if(i==s.end())
-		throw LexicalError("Missing digits in integer conversion");
+		throw lexical_error(format("conversion of '%s' to integer", s));
 
 	T base = f.get_base();
 	if(!base && i!=s.end())
@@ -185,10 +179,10 @@ T str_to_int(const std::string &s, const Fmt &f)
 		else if(*i>='a' && *i<='f')
 			digit = *i-'a'+10;
 		if(digit>=base)
-			throw LexicalError("Invalid digit in integer conversion");
+			throw lexical_error(format("conversion of '%s' to integer (base-%d)", s, base));
 		T next = result*base+digit;
 		if(next/base!=result)
-			throw LexicalError("Overflow in integer conversion");
+			throw lexical_error(format("conversion of '%s' to %d-bit integer", s, sizeof(T)*8));
 		result = next;
 	}
 
@@ -212,14 +206,14 @@ string bool_to_str(bool b, const Fmt &f)
 bool str_to_bool(const string &s)
 {
 	if(s.empty())
-		throw LexicalError("Empty input in boolean conversion");
+		throw lexical_error("conversion of '' to boolean");
 
 	if(s=="1" || s=="true" || s=="yes" || s=="on")
 		return true;
 	else if(s=="0" || s=="false" || s=="no" || s=="off")
 		return false;
 
-	throw LexicalError("Invalid input in boolean conversion");
+	throw lexical_error(format("conversion of '%s' to boolean", s));
 }
 
 
@@ -229,7 +223,7 @@ template<typename T>
 string flt_to_str(T v, const Fmt &f)
 {
 	if(f.get_type()==Fmt::CHAR)
-		throw LexicalError("Character format in floating-point conversion");
+		throw format_mismatch("floating-point conversion with character format");
 
 	Fmt::FloatMode mode = f.get_floatmode();
 	long double w = abs(v);
@@ -395,7 +389,7 @@ template<typename T>
 T str_to_flt(const string &s, const Fmt &)
 {
 	if(s.empty())
-		throw LexicalError("Empty input in floating-point conversion");
+		throw lexical_error("conversion of '' to floating-point");
 
 	std::string::const_iterator i = s.begin();
 
@@ -411,7 +405,7 @@ T str_to_flt(const string &s, const Fmt &)
 
 	// Must have some digits to convert
 	if(i==s.end())
-		throw LexicalError("Missing digits in floating-point conversion");
+		throw lexical_error(format("conversion of '%s' to floating-point", s));
 
 	long double v = 0;
 	int exp = 0;
@@ -423,7 +417,7 @@ T str_to_flt(const string &s, const Fmt &)
 		if(*i=='.')
 		{
 			if(point_seen)
-				throw LexicalError("Extra point in floating-point conversion");
+				throw lexical_error(format("conversion of '%s' to floating-point", s));
 			point_seen = true;
 		}
 		else if(*i>='0' && *i<='9')
@@ -442,7 +436,7 @@ T str_to_flt(const string &s, const Fmt &)
 			break;
 		}
 		else
-			throw LexicalError("Invalid digit in floating-point conversion");
+			throw lexical_error(format("conversion of '%s' to floating-point", s));
 	}
 
 	// Scale and negate the result as needed
@@ -469,7 +463,7 @@ T str_to_flt(const string &s, const Fmt &)
 string str_to_str(const string &s, const Fmt &f)
 {
 	if(f.get_type()==Fmt::NUM)
-		throw LexicalError("Numeric format in string conversion");
+		throw format_mismatch("string conversion with numeric format");
 	return s;
 }
 
@@ -566,9 +560,9 @@ void operator>>(const LexicalConverter &c, char &v)
 	{
 		const std::string &s = c.get();
 		if(s.empty())
-			throw LexicalError("Empty input in character conversion");
+			throw lexical_error("conversion of '' to character");
 		if(s.size()>1)
-			throw LexicalError("Extra input in character conversion");
+			throw lexical_error(format("conversion of '%s' to character", s));
 		v = s[0];
 	}
 }