git-svn-id: http://mecab.googlecode.com/svn/trunk@131 22366562-2668-cd24-d2a3-fd8165afafd9

Author: taku@chasen.org

mecab/doc/index.html

@@ -194,7 +194,7 @@ <h2>メーリングリスト</h2>
 
 <h2><a name="news">新着情報</a></h2>
 <ul>
- <li><strong>2013-02-16</strong> MeCab 0.996<br>
+ <li><strong>2013-02-17</strong> MeCab 0.996<br>
    <ul>
     <li>configure script の不備によりこiconvへのリンクに失敗する問題を修正
     <li>ユーザ辞書用CSVファイルのコストと左/右文脈IDを付与し, 新たなCSVファイルを生成する機能の追加

mecab/libtool

@@ -164,7 +164,7 @@ old_postuninstall_cmds=""
 lock_old_archive_extraction=no
 
 # A C compiler.
-LTCC="gcc"
+LTCC="clang++ -Weverything"
 
 # LTCC compiler flags.
 LTCFLAGS="-O3 -Wall "
@@ -275,7 +275,7 @@ finish_eval=""
 hardcode_into_libs=yes
 
 # Compile-time system search path for libraries.
-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.6 /usr/lib/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib "
+sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.6 /usr/lib/x86_64-linux-gnu /lib/x86_64-linux-gnu /lib64 /usr/lib /lib "
 
 # Run-time system search path for libraries.
 sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/i386-linux-gnu/mesa /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/mesa /lib32 /usr/lib32 "
@@ -305,13 +305,13 @@ reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
 old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
 
 # A language specific compiler.
-CC="gcc"
+CC="clang++ -Weverything"
 
 # Is the compiler the GNU compiler?
 with_gcc=yes
 
 # Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
+no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
 
 # Additional compiler flags for building library objects.
 pic_flag=" -fPIC -DPIC"
@@ -10112,7 +10112,7 @@ reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
 old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
 
 # A language specific compiler.
-CC="g++"
+CC="clang++ -Weverything"
 
 # Is the compiler the GNU compiler?
 with_gcc=yes
@@ -10233,7 +10233,7 @@ file_list_spec=""
 hardcode_action=immediate
 
 # The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs="/usr/lib/gcc/x86_64-linux-gnu/4.6 /usr/lib/gcc/x86_64-linux-gnu/4.6/../../../x86_64-linux-gnu /usr/lib/gcc/x86_64-linux-gnu/4.6/../../../../lib /lib/x86_64-linux-gnu /lib/../lib /usr/lib/x86_64-linux-gnu /usr/lib/../lib /usr/lib/gcc/x86_64-linux-gnu/4.6/../../.."
+compiler_lib_search_dirs="/usr/lib/gcc/x86_64-linux-gnu/4.6 /usr/lib/gcc/x86_64-linux-gnu/4.6/../../../x86_64-linux-gnu /lib/x86_64-linux-gnu /lib/../lib64 /usr/lib/x86_64-linux-gnu /usr/lib/gcc/x86_64-linux-gnu/4.6/../../../x86_64-linux-gnu /usr/lib/gcc/x86_64-linux-gnu/4.6/../../.. /lib/x86_64-linux-gnu /lib /usr/lib/x86_64-linux-gnu /usr/lib"
 
 # Dependencies to place before and after the objects being linked to
 # create a shared library.
@@ -10244,6 +10244,6 @@ postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/x86_64-linux-gnu/4.6 -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../.."
+compiler_lib_search_path="-L/usr/lib/gcc/x86_64-linux-gnu/4.6 -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../x86_64-linux-gnu -L/lib/x86_64-linux-gnu -L/lib/../lib64 -L/usr/lib/x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4.6/../../.. -L/lib/x86_64-linux-gnu -L/lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib"
 
 # ### END LIBTOOL TAG CONFIG: CXX

mecab/src/context_id.cpp

@@ -14,14 +14,10 @@ using namespace MeCab;
 
 bool open_map(const char *filename,
               std::map<std::string, int> *cmap,
-              size_t *cmap_size,
               Iconv *iconv) {
   std::ifstream ifs(WPATH(filename));
   CHECK_DIE(ifs) << "no such file or directory: " << filename;
-  CHECK_DIE(cmap);
-  CHECK_DIE(cmap_size);
   cmap->clear();
-  *cmap_size = 0;
   char *col[2];
   std::string line;
   while (std::getline(ifs, line)) {
@@ -32,9 +28,8 @@ bool open_map(const char *filename,
     if (iconv) {
       iconv->convert(&pos);
     }
-    const int id = std::atoi(col[0]);
-    cmap->insert(std::pair<std::string, int>(pos, id));
-    *cmap_size = std::max(static_cast<size_t>(id + 1), *cmap_size);
+    cmap->insert(std::pair<std::string, int>
+                 (pos, std::atoi(col[0])));
   }
   return true;
 }
@@ -44,9 +39,7 @@ bool build(std::map<std::string, int> *cmap,
   int id = 1;  // for BOS/EOS
   for (std::map<std::string, int>::iterator it = cmap->begin();
        it != cmap->end();
-       ++it) {
-    it->second = id++;
-  }
+       ++it) it->second = id++;
   cmap->insert(std::make_pair(bos, 0));
   return true;
 }
@@ -61,7 +54,7 @@ bool save(const char* filename,
   }
   return true;
 }
-}  // namespace
+}
 
 namespace MeCab {
 
@@ -70,8 +63,6 @@ void ContextID::clear() {
   right_.clear();
   left_bos_.clear();
   right_bos_.clear();
-  left_size_ = 0;
-  right_size_ = 0;
 }
 
 void ContextID::add(const char *l, const char *r) {
@@ -92,8 +83,8 @@ bool ContextID::save(const char* lfile,
 bool ContextID::open(const char *lfile,
                      const char *rfile,
                      Iconv *iconv) {
-  return (::open_map(lfile, &left_, &left_size_, iconv) &&
-          ::open_map(rfile, &right_, &right_size_, iconv));
+  return (::open_map(lfile, &left_, iconv) &&
+          ::open_map(rfile, &right_, iconv));
 }
 
 bool ContextID::build() {

mecab/src/context_id.h

@@ -16,6 +16,12 @@ class Param;
 class Iconv;
 
 class ContextID {
+ private:
+  std::map<std::string, int>  left_;
+  std::map<std::string, int>  right_;
+  std::string                 left_bos_;
+  std::string                 right_bos_;
+
  public:
   void clear();
   void add(const char *l, const char *r);
@@ -29,8 +35,8 @@ class ContextID {
   int  lid(const char *l) const;
   int  rid(const char *r) const;
 
-  size_t left_size() const { return left_size_; }
-  size_t right_size() const { return right_size_; }
+  size_t left_size() const { return left_.size(); }
+  size_t right_size() const { return right_.size(); }
 
   const std::map<std::string, int>& left_ids()  const { return left_; }
   const std::map<std::string, int>& right_ids() const { return right_; }
@@ -39,16 +45,6 @@ class ContextID {
     return (lid >= 0 && lid < left_size() &&
             rid >= 0 && rid < right_size());
   }
-
-  ContextID() : left_size_(0), right_size_(0) {}
-
- private:
-  std::map<std::string, int>  left_;
-  std::map<std::string, int>  right_;
-  std::string                 left_bos_;
-  std::string                 right_bos_;
-  size_t                      left_size_;
-  size_t                      right_size_;
 };
 }
 #endif

mecab/src/mmap.h

@@ -54,13 +54,6 @@ extern "C" {
 #define O_BINARY 0
 #endif
 
-#if !defined(_WIN32) || defined(__CYGWIN__)
-namespace {
-int open__(const char* name, int flag) { return open(name, flag); }
-int close__(int fd) { return close(fd); }
-}
-#endif
-
 namespace MeCab {
 
 template <class T> class Mmap {
@@ -156,10 +149,10 @@ template <class T> class Mmap {
     else
       CHECK_FALSE(false) << "unknown open mode: " << filename;
 
-    CHECK_FALSE((fd = open__(filename, flag | O_BINARY)) >= 0)
+    CHECK_FALSE((fd = ::open(filename, flag | O_BINARY)) >= 0)
         << "open failed: " << filename;
 
-    CHECK_FALSE(fstat(fd, &st) >= 0)
+    CHECK_FALSE(::fstat(fd, &st) >= 0)
         << "failed to get file size: " << filename;
 
     length = st.st_size;
@@ -169,38 +162,38 @@ template <class T> class Mmap {
     if (flag == O_RDWR) prot |= PROT_WRITE;
     char *p;
     CHECK_FALSE((p = reinterpret_cast<char *>
-                       (mmap(0, length, prot, MAP_SHARED, fd, 0)))
-                      != MAP_FAILED)
+                 (::mmap(0, length, prot, MAP_SHARED, fd, 0)))
+                != MAP_FAILED)
         << "mmap() failed: " << filename;
 
     text = reinterpret_cast<T *>(p);
 #else
     text = new T[length];
-    CHECK_FALSE(read(fd, text, length) >= 0)
+    CHECK_FALSE(::read(fd, text, length) >= 0)
         << "read() failed: " << filename;
 #endif
-    close__(fd);
+    ::close(fd);
     fd = -1;
 
     return true;
   }
 
   void close() {
     if (fd >= 0) {
-      close__(fd);
+      ::close(fd);
       fd = -1;
     }
 
     if (text) {
 #ifdef HAVE_MMAP
-      munmap(reinterpret_cast<char *>(text), length);
+      ::munmap(reinterpret_cast<char *>(text), length);
       text = 0;
 #else
       if (flag == O_RDWR) {
         int fd2;
-        if ((fd2 = open__(fileName.c_str(), O_RDWR)) >= 0) {
-          write(fd2, text, length);
-          close__(fd2);
+        if ((fd2 = ::open(fileName.c_str(), O_RDWR)) >= 0) {
+          ::write(fd2, text, length);
+          ::close(fd2);
         }
       }
       delete [] text;
@@ -210,7 +203,7 @@ template <class T> class Mmap {
     text = 0;
   }
 
-  Mmap(): text(0), fd(-1) {}
+  Mmap() : text(0), fd(-1) {}
 #endif
 
   virtual ~Mmap() { this->close(); }