[Pingus-CVS] r2649 - branches/pingus_sdl/src/lisp

[grumbel at BerliOS]

Author: grumbel
Date: 2007-01-14 21:00:40 +0100 (Sun, 14 Jan 2007)
New Revision: 2649

Modified:
   branches/pingus_sdl/src/lisp/getters.hpp
   branches/pingus_sdl/src/lisp/parser.cpp
   branches/pingus_sdl/src/lisp/parser.hpp
Log:
- removed gettext code from parser

Modified: branches/pingus_sdl/src/lisp/getters.hpp
===================================================================
--- branches/pingus_sdl/src/lisp/getters.hpp    2007-01-14 19:30:03 UTC (rev 
2648)
+++ branches/pingus_sdl/src/lisp/getters.hpp    2007-01-14 20:00:40 UTC (rev 
2649)
@@ -9,6 +9,7 @@
  * C++ object. This is typically used from the code in the Properties class. 
You
  * can also write custom overloads in your code.
  */
+
 #ifndef __GETTERS_HPP__
 #define __GETTERS_HPP__
 

Modified: branches/pingus_sdl/src/lisp/parser.cpp
===================================================================
--- branches/pingus_sdl/src/lisp/parser.cpp     2007-01-14 19:30:03 UTC (rev 
2648)
+++ branches/pingus_sdl/src/lisp/parser.cpp     2007-01-14 20:00:40 UTC (rev 
2649)
@@ -25,7 +25,6 @@
 #include <string>
 #include <exception>
 
-#include "../tinygettext/tinygettext.hxx"
 #include "physfs/physfs_stream.hpp"
 #include "parser.hpp"
 #include "lisp.hpp"
@@ -56,27 +55,15 @@
 };
 
 Parser::Parser()
-  : lexer(0), dictionary_manager(0), dictionary(0)
+  : lexer(0)
 {
-  dictionary_manager = new TinyGetText::DictionaryManager();
-  dictionary_manager->set_charset("UTF-8");
 }
 
 Parser::~Parser()
 {
   delete lexer;
-  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)
 {
@@ -96,8 +83,6 @@
   std::auto_ptr<Parser> parser (new Parser());
 
   parser->filename = filename;
-  parser->dictionary_manager->add_directory(dirname(filename));
-  parser->dictionary = & (parser->dictionary_manager->get_dictionary());
   parser->lexer = new Lexer(stream);
 
   parser->token = parser->lexer->getNextToken();
@@ -131,12 +116,7 @@
             token = lexer->getNextToken();
             if(token != Lexer::TOKEN_STRING)
               throw ParseError(this, "Expected string after '(_' sequence");
-            if(dictionary) {
-              std::string translation = 
dictionary->translate(lexer->getString());
-              entries.push_back(new Lisp(Lisp::TYPE_STRING, translation));
-            } else {
-              entries.push_back(new Lisp(Lisp::TYPE_STRING, 
lexer->getString()));
-            }
+            entries.push_back(new Lisp(Lisp::TYPE_STRING, lexer->getString()));
             
             token = lexer->getNextToken();
             if(token != Lexer::TOKEN_CLOSE_PAREN)

Modified: branches/pingus_sdl/src/lisp/parser.hpp
===================================================================
--- branches/pingus_sdl/src/lisp/parser.hpp     2007-01-14 19:30:03 UTC (rev 
2648)
+++ branches/pingus_sdl/src/lisp/parser.hpp     2007-01-14 20:00:40 UTC (rev 
2649)
@@ -22,11 +22,6 @@
 #include <string>
 #include "lexer.hpp"
 
-namespace TinyGetText {
-class Dictionary;
-class DictionaryManager;
-}
-
 namespace lisp
 {
 
@@ -48,8 +43,6 @@
   
   std::string filename;
   Lexer* lexer;
-  TinyGetText::DictionaryManager* dictionary_manager;
-  TinyGetText::Dictionary* dictionary;
   Lexer::TokenType token;
 };