Revert "Possible fix for coverity #29375"

[supertux.git] / src / lisp / writer.cpp

diff --git a/src/lisp/writer.cpp b/src/lisp/writer.cpp
index ee0633c..63c5aa7 100644 (file)
--- a/src/lisp/writer.cpp
+++ b/src/lisp/writer.cpp
@@ -1,12 +1,10 @@
-//  $Id$
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  SuperTux -  A Jump'n Run
-//  Copyright (C) 2004 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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,38 +12,43 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <iostream>
+#include "lisp/writer.hpp"
 
-#include "writer.hpp"
-#include "physfs/physfs_stream.hpp"
-#include "msg.hpp"
+#include "physfs/ofile_stream.hpp"
+#include "util/log.hpp"
 
-namespace lisp
-{
+namespace lisp {
 
-Writer::Writer(const std::string& filename)
+Writer::Writer(const std::string& filename) :
+  out(),
+  out_owned(),
+  indent_depth(),
+  lists()
 {
   out = new OFileStream(filename);
   out_owned = true;
   indent_depth = 0;
+  out->precision(10);
 }
-  
-Writer::Writer(std::ostream* newout)
+
+Writer::Writer(std::ostream* newout) :
+  out(),
+  out_owned(),
+  indent_depth(),
+  lists()
 {
   out = newout;
   out_owned = false;
   indent_depth = 0;
+  out->precision(10);
 }
 
 Writer::~Writer()
 {
   if(lists.size() > 0) {
-    msg_warning("Not all sections closed in lispwriter");
+    log_warning << "Not all sections closed in lispwriter" << std::endl;
   }
   if(out_owned)
     delete out;
@@ -58,10 +61,15 @@ Writer::write_comment(const std::string& comment)
 }
 
 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);
@@ -71,59 +79,61 @@ void
 Writer::end_list(const std::string& listname)
 {
   if(lists.size() == 0) {
-    msg_warning("Trying to close list '" << listname 
-              << "', which is not open");
+    log_warning << "Trying to close list '" << listname << "', which is not open" << std::endl;
     return;
   }
   if(lists.back() != listname) {
-    msg_warning("trying to close list '" << listname 
-              << "' while list '" << lists.back() << "' is open");
+    log_warning << "trying to close list '" << listname << "' while list '" << lists.back() << "' is open" << std::endl;
     return;
   }
   lists.pop_back();
-  
+
   indent_depth -= 2;
   indent();
   *out << ")\n";
 }
 
 void
-Writer::write_int(const std::string& name, int value)
+Writer::write(const std::string& name, int value)
 {
   indent();
   *out << '(' << name << ' ' << value << ")\n";
 }
 
 void
-Writer::write_float(const std::string& name, float value)
+Writer::write(const std::string& name, float value)
 {
   indent();
   *out << '(' << name << ' ' << value << ")\n";
 }
 
 void
-Writer::write_string(const std::string& name, const std::string& value,
-    bool translatable)
+Writer::write(const std::string& name, const std::string& value,
+              bool translatable)
 {
   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_bool(const std::string& name, bool value)
+Writer::write(const std::string& name, bool value)
 {
   indent();
   *out << '(' << name << ' ' << (value ? "#t" : "#f") << ")\n";
 }
 
 void
-Writer::write_int_vector(const std::string& name,
-    const std::vector<int>& value)
+Writer::write(const std::string& name,
+              const std::vector<int>& value)
 {
   indent();
   *out << '(' << name;
@@ -133,8 +143,8 @@ Writer::write_int_vector(const std::string& name,
 }
 
 void
-Writer::write_int_vector(const std::string& name,
-    const std::vector<unsigned int>& value)
+Writer::write(const std::string& name,
+              const std::vector<unsigned int>& value)
 {
   indent();
   *out << '(' << name;
@@ -144,8 +154,8 @@ Writer::write_int_vector(const std::string& name,
 }
 
 void
-Writer::write_float_vector(const std::string& name,
-                           const std::vector<float>& value)
+Writer::write(const std::string& name,
+              const std::vector<float>& value)
 {
   indent();
   *out << '(' << name;
@@ -155,6 +165,34 @@ Writer::write_float_vector(const std::string& name,
 }
 
 void
+Writer::write(const std::string& name,
+              const std::vector<std::string>& value)
+{
+  indent();
+  *out << '(' << name;
+  for(std::vector<std::string>::const_iterator i = value.begin(); i != value.end(); ++i) {
+    *out << " ";
+    write_escaped_string(*i);
+  }
+  *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)
@@ -162,3 +200,5 @@ Writer::indent()
 }
 
 } // end of namespace lisp
+
+/* EOF */