Updated to version 79b7bde of tinygettext

SuperTux · Aug 3, 2014 · 564f07b · 564f07b
1 parent af57bbb
commit 564f07b
Show file tree

Hide file tree

Showing 23 changed files with 106 additions and 74 deletions.
diff --git a/external/tinygettext/.gitignore b/external/tinygettext/.gitignore
@@ -0,0 +1,12 @@
+*.o
+*~
+/.sconsign.dblite
+/CMakeCache.txt
+/CMakeFiles/
+/Makefile
+/cmake_install.cmake
+/libtinygettext.so
+/src/libtinygettext.a
+/test/po_parser_test
+/test/tinygettext_test
+/tinygettext.pc
diff --git a/external/tinygettext/CMakeLists.txt b/external/tinygettext/CMakeLists.txt
@@ -6,12 +6,12 @@
 # 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 distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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
@@ -92,22 +92,22 @@ ENDIF(HAVE_ICONV_CONST)
 
 ## build list of source files
 
-FILE(GLOB TINYGETTEXT_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} tinygettext/*.cpp)
-FILE(GLOB TINYGETTEXT_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} tinygettext/*.hpp)
+FILE(GLOB TINYGETTEXT_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*.cpp)
+FILE(GLOB TINYGETTEXT_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} include/tinygettext/*.hpp)
 
 ## define a target for building the library
 
 ADD_LIBRARY(tinygettext ${TINYGETTEXT_SOURCES})
 
 ## Add tinygettext dir to search path
 
-INCLUDE_DIRECTORIES(${tinygettext_SOURCE_DIR})
+INCLUDE_DIRECTORIES(include/)
 
 ## Debug options
 
 OPTION(WERROR "Stops on first compiler warning in debug mode" OFF)
 IF(CMAKE_COMPILER_IS_GNUCC)
-  ADD_DEFINITIONS(-O3 -Wall -Wextra -Weffc++ -pedantic) 
+  ADD_DEFINITIONS(-std=c++0x -O3 -Wall -Wextra -Weffc++ -pedantic)
   # -ansi fails in MinGW
   OPTION(WARNINGS "Enable long list of warnings for compiler to check" ON)
   IF(WARNINGS)
@@ -119,12 +119,12 @@ IF(CMAKE_COMPILER_IS_GNUCC)
           -Wsign-promo -Wswitch-enum
           -Wcast-align  -Wcast-qual
           -Wdisabled-optimization
-          -Wfloat-equal  
+          -Wfloat-equal
           -Wformat=2
-          -Winit-self 
+          -Winit-self
           -Winvalid-pch  -Wunsafe-loop-optimizations
-          -Wlogical-op 
-          -Wmissing-format-attribute  -Wmissing-include-dirs -Wmissing-noreturn 
+          -Wlogical-op
+          -Wmissing-format-attribute  -Wmissing-include-dirs -Wmissing-noreturn
           -Wpacked
           -Wredundant-decls
           -Wshadow
@@ -143,7 +143,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 ## Extra definitions
 
-ADD_DEFINITIONS(-DVERSION=\\\"${VERSION}\\\")
+ADD_DEFINITIONS(-DVERSION=${VERSION})
 
 ## Generate test executables in the right place
 
@@ -175,3 +175,5 @@ INSTALL(FILES ${TINYGETTEXT_HEADERS}
 	DESTINATION include/tinygettext)
 INSTALL(FILES ${tinygettext_BINARY_DIR}/tinygettext.pc
 	DESTINATION ${LIB_SUBDIR}/pkgconfig)
+
+# EOF #
diff --git a/external/tinygettext/SConstruct b/external/tinygettext/SConstruct
@@ -1,8 +1,14 @@
 # -*- python -*-
 
-env = Environment(CXXFLAGS=['-O0',
+import os
+
+env = Environment(ENV=os.environ,
+                  CXX="g++",
+                  CXXFLAGS=['-O0',
                             '-g3',
+                            '-std=c++0x',
                             '-Wall',
+                            '-Wextra',
                             '-Wcast-qual',
                             '-Wconversion',
                             '-Weffc++',
@@ -12,24 +18,24 @@ env = Environment(CXXFLAGS=['-O0',
                             '-Wno-unused-parameter',
                             '-Wnon-virtual-dtor',
                             '-Wshadow',
-                            '-ansi',
+                            # '-ansi', # conflicts with -std=c++0x
                             '-pedantic',
                             ],
-                  CPPPATH=['tinygettext', '.'])
+                  CPPPATH=['include', 'src'])
 
 # env.ParseConfig("sdl-config --cflags --libs")
 # env['CPPDEFINES'] += HAVE_SDL
 
-libtinygettext = env.StaticLibrary('tinygettext/tinygettext', 
-                                   ['tinygettext/tinygettext.cpp',
-                                    'tinygettext/language.cpp',
-                                    'tinygettext/plural_forms.cpp',
-                                    'tinygettext/dictionary.cpp',
-                                    'tinygettext/dictionary_manager.cpp',
-                                    'tinygettext/unix_file_system.cpp',
-                                    'tinygettext/po_parser.cpp',
-                                    'tinygettext/iconv.cpp',
-                                    'tinygettext/log.cpp'])
+libtinygettext = env.StaticLibrary('src/tinygettext',
+                                   ['src/tinygettext.cpp',
+                                    'src/language.cpp',
+                                    'src/plural_forms.cpp',
+                                    'src/dictionary.cpp',
+                                    'src/dictionary_manager.cpp',
+                                    'src/unix_file_system.cpp',
+                                    'src/po_parser.cpp',
+                                    'src/iconv.cpp',
+                                    'src/log.cpp'])
 
 env.Program('test/tinygettext_test', ['test/tinygettext_test.cpp', libtinygettext])
 env.Program('test/po_parser_test', ['test/po_parser_test.cpp', libtinygettext])

diff --git a/...al/tinygettext/tinygettext/dictionary.hpp → ...ettext/include/tinygettext/dictionary.hpp b/...al/tinygettext/tinygettext/dictionary.hpp → ...ettext/include/tinygettext/dictionary.hpp
@@ -18,9 +18,10 @@
 #ifndef HEADER_TINYGETTEXT_DICTIONARY_HPP
 #define HEADER_TINYGETTEXT_DICTIONARY_HPP
 
-#include <map>
-#include <vector>
 #include <string>
+#include <unordered_map>
+#include <vector>
+
 #include "plural_forms.hpp"
 
 namespace tinygettext {
@@ -31,10 +32,10 @@ namespace tinygettext {
 class Dictionary
 {
 private:
-  typedef std::map<std::string, std::vector<std::string> > Entries;
+  typedef std::unordered_map<std::string, std::vector<std::string> > Entries;
   Entries entries;
 
-  typedef std::map<std::string, Entries> CtxtEntries;
+  typedef std::unordered_map<std::string, Entries> CtxtEntries;
   CtxtEntries ctxt_entries;
 
   std::string charset;

diff --git a/...ettext/tinygettext/dictionary_manager.hpp → ...nclude/tinygettext/dictionary_manager.hpp b/...ettext/tinygettext/dictionary_manager.hpp → ...nclude/tinygettext/dictionary_manager.hpp
@@ -18,11 +18,11 @@
 #ifndef HEADER_TINYGETTEXT_DICTIONARY_MANAGER_HPP
 #define HEADER_TINYGETTEXT_DICTIONARY_MANAGER_HPP
 
-#include <map>
+#include <memory>
 #include <set>
 #include <string>
+#include <unordered_map>
 #include <vector>
-#include <memory>
 
 #include "dictionary.hpp"
 #include "language.hpp"
@@ -37,7 +37,7 @@ class FileSystem;
 class DictionaryManager
 {
 private:
-  typedef std::map<Language, Dictionary*> Dictionaries;
+  typedef std::unordered_map<Language, Dictionary*, Language_hash> Dictionaries;
   Dictionaries dictionaries;
 
   typedef std::vector<std::string> SearchPath;
@@ -51,7 +51,7 @@ class DictionaryManager
 
   Dictionary  empty_dict;
 
-  std::auto_ptr<FileSystem> filesystem;
+  std::unique_ptr<FileSystem> filesystem;
 
   void clear_cache();
 
@@ -85,7 +85,7 @@ class DictionaryManager
   /** Return a set of the available languages in their country code */
   std::set<Language> get_languages();
 
-  void set_filesystem(std::auto_ptr<FileSystem> filesystem);
+  void set_filesystem(std::unique_ptr<FileSystem> filesystem);
 
 private:
   DictionaryManager (const DictionaryManager&);

diff --git a/...l/tinygettext/tinygettext/file_system.hpp → ...ttext/include/tinygettext/file_system.hpp b/...l/tinygettext/tinygettext/file_system.hpp → ...ttext/include/tinygettext/file_system.hpp
@@ -30,8 +30,8 @@ class FileSystem
 public:
   virtual ~FileSystem() {}
 
-  virtual std::vector<std::string>    open_directory(const std::string& pathname) =0;
-  virtual std::auto_ptr<std::istream> open_file(const std::string& filename)      =0;
+  virtual std::vector<std::string>      open_directory(const std::string& pathname) =0;
+  virtual std::unique_ptr<std::istream> open_file(const std::string& filename)      =0;
 };
 
 } // namespace tinygettext

diff --git a/external/tinygettext/tinygettext/iconv.hpp → ...tinygettext/include/tinygettext/iconv.hpp b/external/tinygettext/tinygettext/iconv.hpp → ...tinygettext/include/tinygettext/iconv.hpp
diff --git a/...rnal/tinygettext/tinygettext/language.hpp → ...ygettext/include/tinygettext/language.hpp b/...rnal/tinygettext/tinygettext/language.hpp → ...ygettext/include/tinygettext/language.hpp
@@ -19,6 +19,7 @@
 #define HEADER_TINYGETTEXT_LANGUAGE_HPP
 
 #include <string>
+#include <unordered_map>
 
 namespace tinygettext {
 
@@ -74,16 +75,25 @@ class Language
       variable: {language}_{country}@{modifier} */
   std::string str() const;
 
-  bool operator==(const Language& rhs);
-  bool operator!=(const Language& rhs);
+  bool operator==(const Language& rhs) const;
+  bool operator!=(const Language& rhs) const;
 
   friend bool operator<(const Language& lhs, const Language& rhs);
+  friend struct Language_hash;
 };
 
 inline bool operator<(const Language& lhs, const Language& rhs) {
   return lhs.language_spec < rhs.language_spec;
 }
 
+struct Language_hash
+{
+  size_t operator()(const Language& v) const
+  {
+    return reinterpret_cast<size_t>(v.language_spec);
+  }
+};
+
 } // namespace tinygettext
 
 #endif

diff --git a/external/tinygettext/tinygettext/log.hpp → ...l/tinygettext/include/tinygettext/log.hpp b/external/tinygettext/tinygettext/log.hpp → ...l/tinygettext/include/tinygettext/log.hpp
diff --git a/...al/tinygettext/tinygettext/log_stream.hpp → ...ettext/include/tinygettext/log_stream.hpp b/...al/tinygettext/tinygettext/log_stream.hpp → ...ettext/include/tinygettext/log_stream.hpp
diff --git a/.../tinygettext/tinygettext/plural_forms.hpp → ...text/include/tinygettext/plural_forms.hpp b/.../tinygettext/tinygettext/plural_forms.hpp → ...text/include/tinygettext/plural_forms.hpp
diff --git a/...nal/tinygettext/tinygettext/po_parser.hpp → ...gettext/include/tinygettext/po_parser.hpp b/...nal/tinygettext/tinygettext/po_parser.hpp → ...gettext/include/tinygettext/po_parser.hpp
@@ -50,7 +50,7 @@ class POParser
   void parse();
   void next_line();
   std::string get_string(unsigned int skip);
-  void get_string_line(std::ostringstream& str,unsigned int skip);
+  void get_string_line(std::ostringstream& str, size_t skip);
   bool is_empty_line();
   bool prefix(const char* );
   void error(const std::string& msg) __attribute__((__noreturn__));

diff --git a/...l/tinygettext/tinygettext/tinygettext.hpp → ...ttext/include/tinygettext/tinygettext.hpp b/...l/tinygettext/tinygettext/tinygettext.hpp → ...ttext/include/tinygettext/tinygettext.hpp
diff --git a/...ygettext/tinygettext/unix_file_system.hpp → .../include/tinygettext/unix_file_system.hpp b/...ygettext/tinygettext/unix_file_system.hpp → .../include/tinygettext/unix_file_system.hpp
@@ -28,7 +28,7 @@ class UnixFileSystem : public FileSystem
   UnixFileSystem();
 
   std::vector<std::string>    open_directory(const std::string& pathname);
-  std::auto_ptr<std::istream> open_file(const std::string& filename);
+  std::unique_ptr<std::istream> open_file(const std::string& filename);
 };
 
 } // namespace tinygettext

diff --git a/...al/tinygettext/tinygettext/dictionary.cpp → external/tinygettext/src/dictionary.cpp b/...al/tinygettext/tinygettext/dictionary.cpp → external/tinygettext/src/dictionary.cpp
@@ -16,8 +16,9 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <assert.h>
-#include "log_stream.hpp"
-#include "dictionary.hpp"
+
+#include "tinygettext/log_stream.hpp"
+#include "tinygettext/dictionary.hpp"
 
 namespace tinygettext {
 

diff --git a/...ettext/tinygettext/dictionary_manager.cpp → ...al/tinygettext/src/dictionary_manager.cpp b/...ettext/tinygettext/dictionary_manager.cpp → ...al/tinygettext/src/dictionary_manager.cpp
@@ -15,7 +15,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "dictionary_manager.hpp"
+#include "tinygettext/dictionary_manager.hpp"
 
 #include <memory>
 #include <assert.h>
@@ -24,9 +24,9 @@
 #include <fstream>
 #include <algorithm>
 
-#include "log_stream.hpp"
-#include "po_parser.hpp"
-#include "unix_file_system.hpp"
+#include "tinygettext/log_stream.hpp"
+#include "tinygettext/po_parser.hpp"
+#include "tinygettext/unix_file_system.hpp"
 
 namespace tinygettext {
 
@@ -146,7 +146,7 @@ DictionaryManager::get_dictionary(const Language& language)
         std::string pofile = *p + "/" + best_filename;
         try 
         {
-          std::auto_ptr<std::istream> in = filesystem->open_file(pofile);
+          std::unique_ptr<std::istream> in = filesystem->open_file(pofile);
           if (!in.get())
           {
             log_error << "error: failure opening: " << pofile << std::endl;
@@ -232,9 +232,9 @@ DictionaryManager::add_directory(const std::string& pathname)
 }
 
 void
-DictionaryManager::set_filesystem(std::auto_ptr<FileSystem> filesystem_)
+DictionaryManager::set_filesystem(std::unique_ptr<FileSystem> filesystem_)
 {
-  filesystem = filesystem_;
+  filesystem = std::move(filesystem_);
 }
 
 } // namespace tinygettext

diff --git a/external/tinygettext/tinygettext/iconv.cpp → external/tinygettext/src/iconv.cpp b/external/tinygettext/tinygettext/iconv.cpp → external/tinygettext/src/iconv.cpp
@@ -23,8 +23,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "iconv.hpp"
-#include "log_stream.hpp"
+#include "tinygettext/iconv.hpp"
+#include "tinygettext/log_stream.hpp"
 
 namespace tinygettext {
 

diff --git a/...rnal/tinygettext/tinygettext/language.cpp → external/tinygettext/src/language.cpp b/...rnal/tinygettext/tinygettext/language.cpp → external/tinygettext/src/language.cpp
@@ -15,10 +15,10 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "language.hpp"
+#include "tinygettext/language.hpp"
 
-#include <map>
 #include <assert.h>
+#include <unordered_map>
 #include <vector>
 
 namespace tinygettext {
@@ -285,7 +285,7 @@ LanguageSpec languages[] = {
 std::string
 resolve_language_alias(const std::string& name)
 {
-  typedef std::map<std::string, std::string> Aliases;
+  typedef std::unordered_map<std::string, std::string> Aliases;
   static Aliases language_aliases;
   if (language_aliases.empty())
   {
@@ -363,15 +363,15 @@ resolve_language_alias(const std::string& name)
 Language
 Language::from_spec(const std::string& language, const std::string& country, const std::string& modifier)
 {
-  static std::map<std::string, std::vector<LanguageSpec*> > language_map;
+  static std::unordered_map<std::string, std::vector<LanguageSpec*> > language_map;
 
   if (language_map.empty())
   { // Init language_map
     for(int i = 0; languages[i].language != NULL; ++i)
       language_map[languages[i].language].push_back(&languages[i]);
   }
 
-  std::map<std::string, std::vector<LanguageSpec*> >::iterator i = language_map.find(language);
+  std::unordered_map<std::string, std::vector<LanguageSpec*> >::iterator i = language_map.find(language);
   if (i != language_map.end())
   {
     std::vector<LanguageSpec*>& lst = i->second;
@@ -553,13 +553,13 @@ Language::str() const
 }
 
 bool
-Language::operator==(const Language& rhs)
+Language::operator==(const Language& rhs) const
 {
   return language_spec == rhs.language_spec;
 }
 
 bool
-Language::operator!=(const Language& rhs)
+Language::operator!=(const Language& rhs) const
 {
   return language_spec != rhs.language_spec;
 }