#include <cassert>
#include <iostream>
-#include "tinygettext/tinygettext.h"
-#include "parser.h"
-#include "lisp.h"
-#include "file_system.h"
+#include "tinygettext/tinygettext.hpp"
+#include "physfs/physfs_stream.hpp"
+#include "parser.hpp"
+#include "lisp.hpp"
namespace lisp
{
{
if(translate) {
dictionary_manager = new TinyGetText::DictionaryManager();
+ dictionary_manager->set_charset("UTF-8");
}
}
delete dictionary_manager;
}
+static std::string dirname(std::string filename)
+{
+ std::string::size_type p = filename.find_last_of('/');
+ if(p == std::string::npos)
+ return "";
+
+ return filename.substr(0, p+1);
+}
+
Lisp*
Parser::parse(const std::string& filename)
{
- std::ifstream in(filename.c_str());
+ IFileStream in(filename);
if(!in.good()) {
std::stringstream msg;
msg << "Parser problem: Couldn't open file '" << filename << "'.";
}
if(dictionary_manager) {
- dictionary_manager->add_directory(FileSystem::dirname(filename));
+ dictionary_manager->add_directory(dirname(filename));
dictionary = & (dictionary_manager->get_dictionary());
}
// evaluate translation function (_ str) in place here
token = lexer->getNextToken();
if(token != Lexer::TOKEN_STRING)
- throw new std::runtime_error("Expected string after '(_'");
+ throw std::runtime_error("Expected string after '(_'");
result = new Lisp(Lisp::TYPE_STRING);
if(dictionary) {
}
token = lexer->getNextToken();
if(token != Lexer::TOKEN_CLOSE_PAREN)
- throw new std::runtime_error("Expected ')' after '(_ string'");
+ throw std::runtime_error("Expected ')' after '(_ string'");
break;
}