X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftextwriter.cpp;h=921842279f133eabf555d57d97e609d563dacb72;hb=HEAD;hp=5212c9760488330de78807ab7e4eb97bc3727827;hpb=8e3fad222e174b7c659fd3d994d54314657ed989;p=libs%2Fdatafile.git

diff --git a/source/textwriter.cpp b/source/textwriter.cpp
index 5212c97..04fccff 100644
--- a/source/textwriter.cpp
+++ b/source/textwriter.cpp
@@ -10,13 +10,14 @@ namespace Msp {
 namespace DataFile {
 
 TextWriter::TextWriter(Output &o):
-	WriterMode(o),
-	float_format("%#.7g")
-{ }
+	WriterMode(o)
+{
+	float_format.showpoint().precision(7);
+}
 
 void TextWriter::set_float_precision(unsigned fp)
 {
-	float_format = format("%%#.%dg", fp/4-1);
+	float_format.precision(fp/4-1);
 }
 
 void TextWriter::write(const Statement &st)
@@ -29,20 +30,20 @@ void TextWriter::write_(const Statement &st, unsigned level)
 	string indent(level, '\t');
 
 	out.write(format("%s%s", indent, st.keyword));
-	for(ValueArray::const_iterator i = st.args.begin(); i!=st.args.end(); ++i)
+	for(const Value &v: st.args)
 	{
 		out.put(' ');
-		if(i->get_signature()==StringType::signature)
-			out.write(format("\"%s\"", c_escape(i->get<StringType::Store>(), false)));
-		else if(i->get_signature()==BoolType::signature)
-			out.write(i->get<BoolType::Store>() ? "true" : "false");
-		else if(i->get_signature()==IntType::signature)
-			out.write(lexical_cast(i->get<IntType::Store>()));
-		else if(i->get_signature()==FloatType::signature)
-			out.write(format(float_format, i->get<FloatType::Store>()));
-		else if(i->get_signature()==SymbolType::signature)
+		if(v.get_signature()==StringType::signature)
+			out.write(format("\"%s\"", c_escape(v.get<StringType::Store>(), false)));
+		else if(v.get_signature()==BoolType::signature)
+			out.write(v.get<BoolType::Store>() ? "true" : "false");
+		else if(v.get_signature()==IntType::signature)
+			out.write(lexical_cast<string>(v.get<IntType::Store>()));
+		else if(v.get_signature()==FloatType::signature)
+			out.write(lexical_cast<string>(v.get<FloatType::Store>(), float_format));
+		else if(v.get_signature()==SymbolType::signature)
 		{
-			string name = i->get<SymbolType::Store>().name;
+			string name = v.get<SymbolType::Store>().name;
 			if(isdigit(name[0]))
 				out.write("\\"+name);
 			else
@@ -52,8 +53,8 @@ void TextWriter::write_(const Statement &st, unsigned level)
 	if(!st.sub.empty())
 	{
 		out.write(format("\n%s{\n", indent));
-		for(list<Statement>::const_iterator i = st.sub.begin(); i!=st.sub.end(); ++i)
-			write_(*i, level+1);
+		for(const Statement &s: st.sub)
+			write_(s, level+1);
 		out.write(format("%s}", indent));
 	}
 	out.write(";\n");