From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 1 Dec 2012 20:57:35 +0000 (+0200)
Subject: Throw from LexicalConverter::get if no conversion was performed
X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=commitdiff_plain;h=468ec9f6554c89b52e10a280411c9b9d99ef451b

Throw from LexicalConverter::get if no conversion was performed
---

diff --git a/source/strings/lexicalcast.cpp b/source/strings/lexicalcast.cpp
index ab83b11..f4b5830 100644
--- a/source/strings/lexicalcast.cpp
+++ b/source/strings/lexicalcast.cpp
@@ -471,6 +471,7 @@ namespace Msp {
 
 void LexicalConverter::result(const string &s)
 {
+	filled = true;
 	if(s.size()<fmt.get_width())
 	{
 		if(fmt.get_align()==Fmt::RIGHT)
@@ -482,6 +483,13 @@ void LexicalConverter::result(const string &s)
 		buf = s;
 }
 
+const string &LexicalConverter::get() const
+{
+	if(!filled)
+		throw lexical_error("conversion not performed");
+	return buf;
+}
+
 
 /*** operator<< ***/
 
diff --git a/source/strings/lexicalcast.h b/source/strings/lexicalcast.h
index 80963f4..25e3268 100644
--- a/source/strings/lexicalcast.h
+++ b/source/strings/lexicalcast.h
@@ -35,14 +35,15 @@ class LexicalConverter
 {
 private:
 	Fmt fmt;
+	bool filled;
 	std::string buf;
 
 public:
-	LexicalConverter(const Fmt &f): fmt(f) { }
-	LexicalConverter(const std::string &s, const Fmt &f): fmt(f), buf(s) { }
+	LexicalConverter(const Fmt &f): fmt(f), filled(false) { }
+	LexicalConverter(const std::string &s, const Fmt &f): fmt(f), filled(true), buf(s) { }
 
 	const Fmt &get_fmt() const { return fmt; }
-	const std::string &get() const { return buf; }
+	const std::string &get() const;
 	void result(const std::string &);
 };