X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstrings%2Fformat.cpp;h=773eefac7fc30698bab7c8d6ebfca8fb1188de18;hb=74e62aabadda67d02b3eab09baa37c9d7640b794;hp=4fa5e2caeaf3eac74f1d1d42bc49625f2e642f2c;hpb=02df44f46e4aaa3989d0ee9c9e2e25f8a808e0ec;p=libs%2Fcore.git

diff --git a/source/strings/format.cpp b/source/strings/format.cpp
index 4fa5e2c..773eefa 100644
--- a/source/strings/format.cpp
+++ b/source/strings/format.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2006-2007 Mikko Rasa
-Distributed under the LGPL
-*/
-
 #include "format.h"
 
 using namespace std;
@@ -18,10 +11,20 @@ Formatter::Formatter(const string &f):
 	advance();
 }
 
-/**
-Returns the result of the formatting operation.  Will throw if not enough
-values have been fed to the formatter.
-*/
+Formatter::Formatter(const Formatter &other):
+	fmt(other.fmt),
+	pos(fmt.begin()+(other.pos-other.fmt.begin())),
+	result(other.result)
+{ }
+
+Formatter &Formatter::operator=(const Formatter &other)
+{
+	fmt = other.fmt;
+	pos = fmt.begin()+(other.pos-other.fmt.begin());
+	result = other.result;
+	return *this;
+}
+
 const string &Formatter::str() const
 {
 	if(pos!=fmt.end())
@@ -30,11 +33,6 @@ const string &Formatter::str() const
 	return result;
 }
 
-/**
-Advances the pos iterator to the next conversion, adding literal characters to
-the result.  The iterator is left at the second character of the conversion
-(i.e. after the %).
-*/
 void Formatter::advance()
 {
 	for(; pos!=fmt.end(); ++pos)
@@ -52,10 +50,6 @@ void Formatter::advance()
 	}
 }
 
-/**
-Reads the next conversion from the format string and returns a corresponding
-Fmt object.
-*/
 Fmt Formatter::get_conversion()
 {
 	if(pos==fmt.end())