-// $Id$
-//
// 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
-// 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
// 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 <sstream>
#include <stdexcept>
-#include <fstream>
-#include <cassert>
-#include <iostream>
-
-#include "tinygettext/tinygettext.hpp"
-#include "physfs/physfs_stream.hpp"
-#include "parser.hpp"
-#include "lisp.hpp"
-#include "obstack/obstackpp.hpp"
-
-#include "gameconfig.hpp"
-
-namespace lisp
-{
-
-Parser::Parser(bool translate)
- : lexer(0), dictionary_manager(0), dictionary(0)
+#include <tinygettext/tinygettext.hpp>
+#include <physfs.h>
+
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
+#include "util/gettext.hpp"
+#include "util/obstackpp.hpp"
+#include "physfs/ifile_stream.hpp"
+#include "physfs/ifile_streambuf.hpp"
+#include "supertux/globals.hpp"
+
+#include "supertux/gameconfig.hpp"
+
+namespace lisp {
+
+Parser::Parser(bool translate) :
+ lexer(0),
+ filename(),
+ dictionary_manager(0),
+ dictionary(0),
+ token(),
+ searchpath(),
+ obst()
{
if(translate) {
- dictionary_manager = new TinyGetText::DictionaryManager();
+ dictionary_manager = new tinygettext::DictionaryManager();
dictionary_manager->set_charset("UTF-8");
- if (config && (config->locale != "")) dictionary_manager->set_language(config->locale);
+ if (g_config) {
+ if (g_config->locale != "") {
+ dictionary_manager->set_language(tinygettext::Language::from_name(g_config->locale));
+ }
+ else if(g_dictionary_manager && g_dictionary_manager->get_language()) {
+ // Language set to auto-detect?
+ dictionary_manager->set_language(g_dictionary_manager->get_language());
+ }
+ }
}
obstack_init(&obst);
+ searchpath = PHYSFS_getSearchPath();
}
Parser::~Parser()
obstack_free(&obst, NULL);
delete lexer;
delete dictionary_manager;
+ PHYSFS_freeList(searchpath);
}
static std::string dirname(const std::string& filename)
}
const Lisp*
-Parser::parse(const std::string& filename)
+Parser::parse(const std::string& filename_)
{
- IFileStreambuf ins(filename);
+ IFileStreambuf ins(filename_);
std::istream in(&ins);
if(!in.good()) {
std::stringstream msg;
- msg << "Parser problem: Couldn't open file '" << filename << "'.";
+ msg << "Parser problem: Couldn't open file '" << filename_ << "'.";
throw std::runtime_error(msg.str());
}
if(dictionary_manager) {
- dictionary_manager->add_directory(dirname(filename));
+ std::string rel_dir = dirname (filename_);
+ for(char** i = searchpath; *i != NULL; i++)
+ {
+ std::string abs_dir = std::string (*i) + PHYSFS_getDirSeparator () + rel_dir;
+ dictionary_manager->add_directory (abs_dir);
+ }
dictionary = & (dictionary_manager->get_dictionary());
}
- return parse(in, filename);
+ return parse(in, filename_);
}
const Lisp*
}
if(token == Lexer::TOKEN_SYMBOL &&
- strcmp(lexer->getString(), "_") == 0) {
+ strcmp(lexer->getString(), "_") == 0) {
// evaluate translation function (_ str) in place here
token = lexer->getNextToken();
if(token != Lexer::TOKEN_STRING)
}
case Lexer::TOKEN_INTEGER:
result = new(obst) Lisp(Lisp::TYPE_INTEGER);
- sscanf(lexer->getString(), "%d", &result->v.integer);
+ result->v.integer = atoi(lexer->getString());
break;
case Lexer::TOKEN_REAL:
result = new(obst) Lisp(Lisp::TYPE_REAL);
- sscanf(lexer->getString(), "%f", &result->v.real);
+ result->v.real = strtof(lexer->getString(), NULL);
break;
case Lexer::TOKEN_TRUE:
result = new(obst) Lisp(Lisp::TYPE_BOOLEAN);
default:
// this should never happen
+ result = NULL;
assert(false);
}
}
} // end of namespace lisp
+
+/* EOF */