[Refactor] #3275 jverb関数のシグネチャ改善

既存のシグネチャは入力文字列としてconst char*を受け取る、引数に出力用バッ
ファを指定する、int型引数で処理内容をスイッチする、関数名から処理内容が
わからない、とツッコミが追いつかない状況なのでよりよい形に変更する。

diff --git a/src/cmd-action/cmd-spell.cpp b/src/cmd-action/cmd-spell.cpp
index 3eb24bc..ab5064a 100644 (file)
--- a/src/cmd-action/cmd-spell.cpp
+++ b/src/cmd-action/cmd-spell.cpp
@@ -316,9 +316,6 @@ static int get_spell(PlayerType *player_ptr, SPELL_IDX *sn, concptr prompt, OBJE
     char out_val[160];
     concptr p;
     COMMAND_CODE code;
-#ifdef JP
-    char jverb_buf[128];
-#endif
     int menu_line = (use_menu ? 1 : 0);
 
     /* Get the spell, if available */
@@ -384,8 +381,8 @@ static int get_spell(PlayerType *player_ptr, SPELL_IDX *sn, concptr prompt, OBJE
 
     /* Build a prompt (accept all spells) */
 #ifdef JP
-    jverb(prompt, jverb_buf, JVERB_AND);
-    (void)strnfmt(out_val, 78, "(%s^:%c-%c, '*'で一覧, ESCで中断) どの%sを%s^ますか? ", p, I2A(0), I2A(num - 1), p, jverb_buf);
+    const auto verb = conjugate_jverb(prompt, JVerbConjugationType::AND);
+    (void)strnfmt(out_val, 78, "(%s^:%c-%c, '*'で一覧, ESCで中断) どの%sを%s^ますか? ", p, I2A(0), I2A(num - 1), p, verb.data());
 #else
     (void)strnfmt(out_val, 78, "(%s^s %c-%c, *=List, ESC=exit) %s^ which %s? ", p, I2A(0), I2A(num - 1), prompt, p);
 #endif

diff --git a/src/locale/japanese.cpp b/src/locale/japanese.cpp
index bf5f563..d75dc14 100644 (file)
--- a/src/locale/japanese.cpp
+++ b/src/locale/japanese.cpp
@@ -6,9 +6,11 @@
 
 #include "locale/japanese.h"
 #include "locale/utf-8.h"
+#include "util/enum-converter.h"
 #include "util/string-processor.h"
 #include "view/display-messages.h"
 #include <set>
+#include <sstream>
 
 #ifdef JP
 
@@ -78,13 +80,15 @@ std::string sindarin_to_kana(std::string_view sindarin)
     return kana;
 }
 
-/*! 日本語動詞活用 (打つ＞打って,打ち etc)
- * JVERB_AND: 殴る,蹴る > 殴り,蹴る
- * JVERB_TO:  殴る,蹴る > 殴って蹴る
- * JVERB_OR:  殴る,蹴る > 殴ったり蹴ったり */
-static const struct jverb_table_t {
-    const char *from;
-    const char *to[3];
+/*!
+ * 日本語動詞活用 (打つ＞打って,打ち etc)
+ * AND : 殴る,蹴る > 殴り,蹴る
+ * TO  : 殴る,蹴る > 殴って蹴る
+ * OR  : 殴る,蹴る > 殴ったり蹴ったり
+ */
+static constexpr struct jverb_table_t {
+    std::string_view from;
+    std::string_view to_list[3];
 } jverb_table[] = {
     { "する", { "し", "して", "した" } },
     { "いる", { "いて", "いて", "いた" } },
@@ -114,34 +118,34 @@ static const struct jverb_table_t {
     { "ぶ", { "び", "んで", "んだ" } },
     { "む", { "み", "んで", "んだ" } },
     { "る", { "り", "って", "った" } },
-    { nullptr, { "そして", "ことにより", "ことや" } },
 };
 
 /*!
  * @brief jverb_table_tに従って動詞を活用する
- * @param in 変換元文字列ポインタ
- * @param out 変換先文字列ポインタ
- * @param flag 変換種類を指定(JVERB_AND/JVERB_TO/JVERB_OR)
- * @details
+ * @param in 変換元となる原形動詞
+ * @param type 変換種類を指定(AND/TO/OR)
+ * @return 活用形の動詞
  */
-void jverb(concptr in, char *out, int flag)
+std::string conjugate_jverb(std::string_view in, JVerbConjugationType type)
 {
-    const struct jverb_table_t *p;
-    int in_len = strlen(in);
+    std::stringstream ss;
 
-    strcpy(out, in);
-
-    for (p = jverb_table; p->from; p++) {
-        int from_len = strlen(p->from);
-        if (strncmp(&in[in_len - from_len], p->from, from_len) == 0) {
-            strcpy(&out[in_len - from_len], p->to[flag - 1]);
-            break;
+    for (const auto &[from, to_list] : jverb_table) {
+        const auto stem_length = in.length() - from.length();
+        if (in.substr(stem_length) == from) {
+            ss << in.substr(0, stem_length) << to_list[enum2i(type)];
+            return ss.str();
         }
     }
 
-    if (p->from == nullptr) {
-        strcpy(&out[in_len], p->to[flag - 1]);
-    }
+    constexpr std::string_view conjuctions[3] = {
+        "そして",
+        "ことにより",
+        "ことや",
+    };
+
+    ss << in << conjuctions[enum2i(type)];
+    return ss.str();
 }
 
 static const std::set<std::string_view> kinsoku_list{

diff --git a/src/locale/japanese.h b/src/locale/japanese.h
index 4c2c45b..cb71fc7 100644 (file)
--- a/src/locale/japanese.h
+++ b/src/locale/japanese.h
@@ -6,10 +6,12 @@
 
 #ifdef JP
 
-constexpr int JVERB_AND = 1;
-constexpr int JVERB_TO = 2;
-constexpr int JVERB_OR = 3;
-void jverb(concptr in, char *out, int flag);
+enum class JVerbConjugationType {
+    AND = 0,
+    TO = 1,
+    OR = 2,
+};
+std::string conjugate_jverb(std::string_view in, JVerbConjugationType type);
 
 std::string sindarin_to_kana(std::string_view sindarin);
 bool is_kinsoku(std::string_view ch);

diff --git a/src/lore/lore-util.h b/src/lore/lore-util.h
index c7f0347..ed33bcc 100644 (file)
--- a/src/lore/lore-util.h
+++ b/src/lore/lore-util.h
@@ -26,9 +26,7 @@ enum monster_sex {
 
 class MonsterRaceInfo;
 struct lore_type {
-#ifdef JP
-    char jverb_buf[64];
-#else
+#ifndef JP
     bool sin;
 #endif
     bool nightmare;

diff --git a/src/view/display-lore-attacks.cpp b/src/view/display-lore-attacks.cpp
index 3e8dc60..b2a9d6c 100644 (file)
--- a/src/view/display-lore-attacks.cpp
+++ b/src/view/display-lore-attacks.cpp
@@ -35,23 +35,22 @@ static void display_monster_blow_jp(lore_type *lore_ptr, int attack_numbers, int
 
     /* XXしてYYし/XXしてYYする/XXし/XXする */
     if (lore_ptr->q != nullptr) {
-        jverb(lore_ptr->p, lore_ptr->jverb_buf, JVERB_TO);
+        const auto verb = conjugate_jverb(lore_ptr->p, JVerbConjugationType::TO);
+        hook_c_roff(lore_ptr->pc, verb);
     } else if (attack_numbers != lore_ptr->count - 1) {
-        jverb(lore_ptr->p, lore_ptr->jverb_buf, JVERB_AND);
+        const auto verb = conjugate_jverb(lore_ptr->p, JVerbConjugationType::AND);
+        hook_c_roff(lore_ptr->pc, verb);
     } else {
-        strcpy(lore_ptr->jverb_buf, lore_ptr->p);
+        hook_c_roff(lore_ptr->pc, lore_ptr->p);
     }
 
-    hook_c_roff(lore_ptr->pc, lore_ptr->jverb_buf);
-
     if (lore_ptr->q) {
         if (attack_numbers != lore_ptr->count - 1) {
-            jverb(lore_ptr->q, lore_ptr->jverb_buf, JVERB_AND);
+            const auto verb = conjugate_jverb(lore_ptr->q, JVerbConjugationType::AND);
+            hook_c_roff(lore_ptr->qc, verb);
         } else {
-            strcpy(lore_ptr->jverb_buf, lore_ptr->q);
+            hook_c_roff(lore_ptr->qc, lore_ptr->q);
         }
-
-        hook_c_roff(lore_ptr->qc, lore_ptr->jverb_buf);
     }
 
     if (attack_numbers != lore_ptr->count - 1) {

diff --git a/src/view/display-lore-status.cpp b/src/view/display-lore-status.cpp
index 1150ef9..ac9b224 100644 (file)
--- a/src/view/display-lore-status.cpp
+++ b/src/view/display-lore-status.cpp
@@ -102,8 +102,8 @@ void display_monster_abilities(lore_type *lore_ptr)
     for (int n = 0; n < lore_ptr->vn; n++) {
 #ifdef JP
         if (n != lore_ptr->vn - 1) {
-            jverb(lore_ptr->vp[n], lore_ptr->jverb_buf, JVERB_AND);
-            hook_c_roff(lore_ptr->color[n], lore_ptr->jverb_buf);
+            const auto verb = conjugate_jverb(lore_ptr->vp[n], JVerbConjugationType::AND);
+            hook_c_roff(lore_ptr->color[n], verb);
             hooked_roff("、");
         } else {
             hook_c_roff(lore_ptr->color[n], lore_ptr->vp[n]);

diff --git a/src/view/display-lore.cpp b/src/view/display-lore.cpp
index f26926a..5c5bef3 100644 (file)
--- a/src/view/display-lore.cpp
+++ b/src/view/display-lore.cpp
@@ -647,8 +647,8 @@ void display_monster_sometimes(lore_type *lore_ptr)
     for (int n = 0; n < lore_ptr->vn; n++) {
 #ifdef JP
         if (n != lore_ptr->vn - 1) {
-            jverb(lore_ptr->vp[n], lore_ptr->jverb_buf, JVERB_OR);
-            hook_c_roff(lore_ptr->color[n], lore_ptr->jverb_buf);
+            const auto verb = conjugate_jverb(lore_ptr->vp[n], JVerbConjugationType::OR);
+            hook_c_roff(lore_ptr->color[n], verb);
             hook_c_roff(lore_ptr->color[n], "り");
             hooked_roff("、");
         } else {