// $Id$
//
-// SuperTux - A Jump'n Run
-// Copyright (C) 2004 Matthias Braun <matze@braunis.de
+// SuperTux
+// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
#include "writer.hpp"
#include "physfs/physfs_stream.hpp"
+#include "log.hpp"
namespace lisp
{
Writer::~Writer()
{
if(lists.size() > 0) {
- std::cerr << "Warning: Not all sections closed in lispwriter!\n";
+ log_warning << "Not all sections closed in lispwriter" << std::endl;
}
if(out_owned)
delete out;
}
void
-Writer::start_list(const std::string& listname)
+Writer::start_list(const std::string& listname, bool string)
{
indent();
- *out << '(' << listname << '\n';
+ *out << '(';
+ if(string)
+ write_escaped_string(listname);
+ else
+ *out << listname;
+ *out << '\n';
indent_depth += 2;
lists.push_back(listname);
Writer::end_list(const std::string& listname)
{
if(lists.size() == 0) {
- std::cerr << "Trying to close list '" << listname
- << "', which is not open.\n";
+ log_warning << "Trying to close list '" << listname << "', which is not open" << std::endl;
return;
}
if(lists.back() != listname) {
- std::cerr << "Warning: trying to close list '" << listname
- << "' while list '" << lists.back() << "' is open.\n";
+ log_warning << "trying to close list '" << listname << "' while list '" << lists.back() << "' is open" << std::endl;
return;
}
lists.pop_back();
indent();
*out << '(' << name;
if(translatable) {
- *out << " (_ \"" << value << "\"))\n";
+ *out << " (_ ";
+ write_escaped_string(value);
+ *out << "))\n";
} else {
- *out << " \"" << value << "\")\n";
+ *out << " ";
+ write_escaped_string(value);
+ *out << ")\n";
}
}
}
void
+Writer::write_escaped_string(const std::string& str)
+{
+ *out << '"';
+ for(const char* c = str.c_str(); *c != 0; ++c) {
+ if(*c == '\"')
+ *out << "\\\"";
+ else if(*c == '\\')
+ *out << "\\\\";
+ else
+ *out << *c;
+ }
+ *out << '"';
+}
+
+void
Writer::indent()
{
for(int i = 0; i<indent_depth; ++i)