projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed MN_STRINGSELECT menu item
[supertux.git]
/
src
/
lisp
/
writer.cpp
diff --git
a/src/lisp/writer.cpp
b/src/lisp/writer.cpp
index
3969789
..
d2c7b1c
100644
(file)
--- a/
src/lisp/writer.cpp
+++ b/
src/lisp/writer.cpp
@@
-1,7
+1,7
@@
// $Id$
//
// $Id$
//
-// SuperTux
- A Jump'n Run
-// Copyright (C) 200
4 Matthias Braun <matze@braunis.de
+// SuperTux
+// Copyright (C) 200
6 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
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-23,6
+23,7
@@
#include "writer.hpp"
#include "physfs/physfs_stream.hpp"
#include "writer.hpp"
#include "physfs/physfs_stream.hpp"
+#include "log.hpp"
namespace lisp
{
namespace lisp
{
@@
-32,19
+33,21
@@
Writer::Writer(const std::string& filename)
out = new OFileStream(filename);
out_owned = true;
indent_depth = 0;
out = new OFileStream(filename);
out_owned = true;
indent_depth = 0;
+ out->precision(10);
}
}
-
+
Writer::Writer(std::ostream* newout)
{
out = newout;
out_owned = false;
indent_depth = 0;
Writer::Writer(std::ostream* newout)
{
out = newout;
out_owned = false;
indent_depth = 0;
+ out->precision(10);
}
Writer::~Writer()
{
if(lists.size() > 0) {
}
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;
}
if(out_owned)
delete out;
@@
-57,10
+60,15
@@
Writer::write_comment(const std::string& comment)
}
void
}
void
-Writer::start_list(const std::string& listname)
+Writer::start_list(const std::string& listname
, bool string
)
{
indent();
{
indent();
- *out << '(' << listname << '\n';
+ *out << '(';
+ if(string)
+ write_escaped_string(listname);
+ else
+ *out << listname;
+ *out << '\n';
indent_depth += 2;
lists.push_back(listname);
indent_depth += 2;
lists.push_back(listname);
@@
-70,17
+78,15
@@
void
Writer::end_list(const std::string& listname)
{
if(lists.size() == 0) {
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) {
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();
return;
}
lists.pop_back();
-
+
indent_depth -= 2;
indent();
*out << ")\n";
indent_depth -= 2;
indent();
*out << ")\n";
@@
-107,9
+113,13
@@
Writer::write_string(const std::string& name, const std::string& value,
indent();
*out << '(' << name;
if(translatable) {
indent();
*out << '(' << name;
if(translatable) {
- *out << " (_ \"" << value << "\"))\n";
+ *out << " (_ ";
+ write_escaped_string(value);
+ *out << "))\n";
} else {
} else {
- *out << " \"" << value << "\")\n";
+ *out << " ";
+ write_escaped_string(value);
+ *out << ")\n";
}
}
}
}
@@
-154,6
+164,21
@@
Writer::write_float_vector(const std::string& name,
}
void
}
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)
Writer::indent()
{
for(int i = 0; i<indent_depth; ++i)