Groonga - fulltext search engine.

[Groonga-commit] groonga/grnxx [master] Rename grnxx::Charset::open() to grnxx::Charset::get().

susumu.yata null+****@clear*****
Mon Mar 25 09:34:51 JST 2013

• Previous message: [Groonga-commit] [Failed] mroonga/mroonga#368 (master - 579d6b5)
• Next message: [Groonga-commit] groonga/grnxx [master] Add grnxx::Charset::get_char_size().
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

susumu.yata	2013-03-25 09:34:51 +0900 (Mon, 25 Mar 2013)

  New Revision: 4d6b9acf94d488f2d052bccbf14b2da1f5b62994
  https://github.com/groonga/grnxx/commit/4d6b9acf94d488f2d052bccbf14b2da1f5b62994

  Message:
    Rename grnxx::Charset::open() to grnxx::Charset::get().

  Modified files:
    lib/grnxx/charset.cpp
    lib/grnxx/charset.hpp
    lib/grnxx/charset/euc-jp.cpp
    lib/grnxx/charset/euc-jp.hpp
    lib/grnxx/charset/shift_jis.cpp
    lib/grnxx/charset/shift_jis.hpp
    lib/grnxx/charset/utf-8.cpp
    lib/grnxx/charset/utf-8.hpp
    test/test_charset.cpp
    test/test_map.cpp

  Modified: lib/grnxx/charset.cpp (+4 -4)
===================================================================
--- lib/grnxx/charset.cpp    2013-03-22 21:46:17 +0900 (296ed34)
+++ lib/grnxx/charset.cpp    2013-03-25 09:34:51 +0900 (9824c38)
@@ -44,16 +44,16 @@ StringBuilder &operator<<(StringBuilder &builder, CharsetCode code) {
 Charset::Charset() {}
 Charset::~Charset() {}
 
-const Charset *Charset::open(CharsetCode code) {
+const Charset *Charset::get(CharsetCode code) {
   switch (code) {
     case CHARSET_SHIFT_JIS: {
-      return charset::Shift_JIS::open();
+      return charset::Shift_JIS::get();
     }
     case CHARSET_EUC_JP: {
-      return charset::EUC_JP::open();
+      return charset::EUC_JP::get();
     }
     case CHARSET_UTF_8: {
-      return charset::UTF_8::open();
+      return charset::UTF_8::get();
     }
     case CHARSET_UNKNOWN: {
       break;

  Modified: lib/grnxx/charset.hpp (+1 -1)
===================================================================
--- lib/grnxx/charset.hpp    2013-03-22 21:46:17 +0900 (5ff07c2)
+++ lib/grnxx/charset.hpp    2013-03-25 09:34:51 +0900 (cde85d6)
@@ -41,7 +41,7 @@ class Charset {
   virtual ~Charset();
 
   // Return a reference to a specific charset.
-  static const Charset *open(CharsetCode code);
+  static const Charset *get(CharsetCode code);
 
   // Return the charset code.
   virtual CharsetCode code() const = 0;

  Modified: lib/grnxx/charset/euc-jp.cpp (+1 -1)
===================================================================
--- lib/grnxx/charset/euc-jp.cpp    2013-03-22 21:46:17 +0900 (2e5887c)
+++ lib/grnxx/charset/euc-jp.cpp    2013-03-25 09:34:51 +0900 (214c056)
@@ -20,7 +20,7 @@
 namespace grnxx {
 namespace charset {
 
-const Charset *EUC_JP::open() {
+const Charset *EUC_JP::get() {
   static EUC_JP singleton;
   return &singleton;
 }

  Modified: lib/grnxx/charset/euc-jp.hpp (+1 -1)
===================================================================
--- lib/grnxx/charset/euc-jp.hpp    2013-03-22 21:46:17 +0900 (0475a86)
+++ lib/grnxx/charset/euc-jp.hpp    2013-03-25 09:34:51 +0900 (0aea6ad)
@@ -26,7 +26,7 @@ namespace charset {
 // EUC-JP: Extended_UNIX_Code_Packed_Format_for_Japanese.
 class EUC_JP : public Charset {
  public:
-  static const Charset *open();
+  static const Charset *get();
 
   CharsetCode code() const;
 

  Modified: lib/grnxx/charset/shift_jis.cpp (+1 -1)
===================================================================
--- lib/grnxx/charset/shift_jis.cpp    2013-03-22 21:46:17 +0900 (3fe8060)
+++ lib/grnxx/charset/shift_jis.cpp    2013-03-25 09:34:51 +0900 (25b8d14)
@@ -20,7 +20,7 @@
 namespace grnxx {
 namespace charset {
 
-const Charset *Shift_JIS::open() {
+const Charset *Shift_JIS::get() {
   static Shift_JIS singleton;
   return &singleton;
 }

  Modified: lib/grnxx/charset/shift_jis.hpp (+1 -1)
===================================================================
--- lib/grnxx/charset/shift_jis.hpp    2013-03-22 21:46:17 +0900 (6601678)
+++ lib/grnxx/charset/shift_jis.hpp    2013-03-25 09:34:51 +0900 (5b4ecd4)
@@ -26,7 +26,7 @@ namespace charset {
 // Shift_JIS.
 class Shift_JIS : public Charset {
  public:
-  static const Charset *open();
+  static const Charset *get();
 
   CharsetCode code() const;
 

  Modified: lib/grnxx/charset/utf-8.cpp (+1 -1)
===================================================================
--- lib/grnxx/charset/utf-8.cpp    2013-03-22 21:46:17 +0900 (835611e)
+++ lib/grnxx/charset/utf-8.cpp    2013-03-25 09:34:51 +0900 (dde7a1c)
@@ -22,7 +22,7 @@
 namespace grnxx {
 namespace charset {
 
-const Charset *UTF_8::open() {
+const Charset *UTF_8::get() {
   static UTF_8 singleton;
   return &singleton;
 }

  Modified: lib/grnxx/charset/utf-8.hpp (+1 -1)
===================================================================
--- lib/grnxx/charset/utf-8.hpp    2013-03-22 21:46:17 +0900 (4b642c8)
+++ lib/grnxx/charset/utf-8.hpp    2013-03-25 09:34:51 +0900 (cb6829f)
@@ -26,7 +26,7 @@ namespace charset {
 // UTF-8.
 class UTF_8 : public Charset {
  public:
-  static const Charset *open();
+  static const Charset *get();
 
   CharsetCode code() const;
 

  Modified: test/test_charset.cpp (+6 -6)
===================================================================
--- test/test_charset.cpp    2013-03-22 21:46:17 +0900 (83054d8)
+++ test/test_charset.cpp    2013-03-25 09:34:51 +0900 (00d785d)
@@ -23,7 +23,7 @@
 void test_ascii() {
   const grnxx::Slice query = "Hello, world!";
 
-  const grnxx::Charset *charset = grnxx::Charset::open(grnxx::CHARSET_EUC_JP);
+  const grnxx::Charset *charset = grnxx::Charset::get(grnxx::CHARSET_EUC_JP);
   grnxx::Slice query_left = query;
   while (query_left) {
     const grnxx::Slice next = charset->get_char(query);
@@ -31,7 +31,7 @@ void test_ascii() {
     query_left.remove_prefix(next.size());
   }
 
-  charset = grnxx::Charset::open(grnxx::CHARSET_SHIFT_JIS);
+  charset = grnxx::Charset::get(grnxx::CHARSET_SHIFT_JIS);
   query_left = query;
   while (query_left) {
     const grnxx::Slice next = charset->get_char(query);
@@ -39,7 +39,7 @@ void test_ascii() {
     query_left.remove_prefix(next.size());
   }
 
-  charset = grnxx::Charset::open(grnxx::CHARSET_UTF_8);
+  charset = grnxx::Charset::get(grnxx::CHARSET_UTF_8);
   query_left = query;
   while (query_left) {
     const grnxx::Slice next = charset->get_char(query);
@@ -51,7 +51,7 @@ void test_ascii() {
 void test_euc_jp() {
   const grnxx::Slice query = "\xCA\xB8\xBB\xFA\xCE\xF3";
 
-  const grnxx::Charset *charset = grnxx::Charset::open(grnxx::CHARSET_EUC_JP);
+  const grnxx::Charset *charset = grnxx::Charset::get(grnxx::CHARSET_EUC_JP);
   grnxx::Slice query_left = query;
   while (query_left) {
     const grnxx::Slice next = charset->get_char(query);
@@ -64,7 +64,7 @@ void test_shift_jis() {
   const grnxx::Slice query = "\x95\xB6\x8E\x9A\x97\xF1";
 
   const grnxx::Charset *charset =
-      grnxx::Charset::open(grnxx::CHARSET_SHIFT_JIS);
+      grnxx::Charset::get(grnxx::CHARSET_SHIFT_JIS);
   grnxx::Slice query_left = query;
   while (query_left) {
     const grnxx::Slice next = charset->get_char(query);
@@ -76,7 +76,7 @@ void test_shift_jis() {
 void test_utf_8() {
   const grnxx::Slice query = "\xE6\x96\x87\xE5\xAD\x97\xE5\x88\x97";
 
-  const grnxx::Charset *charset = grnxx::Charset::open(grnxx::CHARSET_UTF_8);
+  const grnxx::Charset *charset = grnxx::Charset::get(grnxx::CHARSET_UTF_8);
   grnxx::Slice query_left = query;
   while (query_left) {
     const grnxx::Slice next = charset->get_char(query);

  Modified: test/test_map.cpp (+2 -2)
===================================================================
--- test/test_map.cpp    2013-03-22 21:46:17 +0900 (224d0c9)
+++ test/test_map.cpp    2013-03-25 09:34:51 +0900 (d7bee52)
@@ -167,7 +167,7 @@ void test_scan() {
   assert(!scan->next());
 
   scan.reset(map->open_scan(
-      query, grnxx::Charset::open(grnxx::CHARSET_UTF_8)));
+      query, grnxx::Charset::get(grnxx::CHARSET_UTF_8)));
 
   assert(scan->next());
   assert(scan->offset() == 0);
@@ -196,7 +196,7 @@ void test_scan() {
   query = "今日は良い天気ですね";
 
   scan.reset(map->open_scan(
-      query, grnxx::Charset::open(grnxx::CHARSET_UTF_8)));
+      query, grnxx::Charset::get(grnxx::CHARSET_UTF_8)));
 
   assert(scan->next());
   assert(scan->offset() == 0);
-------------- next part --------------
HTML����������������������������...
下載 

• Previous message: [Groonga-commit] [Failed] mroonga/mroonga#368 (master - 579d6b5)
• Next message: [Groonga-commit] groonga/grnxx [master] Add grnxx::Charset::get_char_size().
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]