From b71d968fadf1c63f5959e102382f0a79dbba420a Mon Sep 17 00:00:00 2001
From: Casper <casperneo@uchicago.edu>
Date: Wed, 30 Mar 2022 18:45:11 -0400
Subject: [PATCH] Apply Namer prefix/suffix to other generators (#7197)

* Apply Namer prefix/suffix to other generators

* unnecessary .name

Co-authored-by: Casper Neo <cneo@google.com>
---
 src/idl_gen_dart.cpp  |  2 +-
 src/idl_gen_swift.cpp | 10 +++++-----
 src/idl_namer.h       |  3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/idl_gen_dart.cpp b/src/idl_gen_dart.cpp
index dcf52228c..8b87df07e 100644
--- a/src/idl_gen_dart.cpp
+++ b/src/idl_gen_dart.cpp
@@ -836,7 +836,7 @@ class DartGenerator : public BaseGenerator {
          it != non_deprecated_fields.end(); ++it) {
       const auto &field = *it->second;
       const auto offset = it->first;
-      const std::string add_field = namer_.Method("add_" + field.name);
+      const std::string add_field = namer_.Method("add", field);
       const std::string field_var = namer_.Variable(field);
 
       if (IsScalar(field.value.type.base_type)) {
diff --git a/src/idl_gen_swift.cpp b/src/idl_gen_swift.cpp
index c925c7184..b38481a86 100644
--- a/src/idl_gen_swift.cpp
+++ b/src/idl_gen_swift.cpp
@@ -588,7 +588,7 @@ class SwiftGenerator : public BaseGenerator {
       code_.SetValue("VOFFSET", NumToString(key_field->value.offset));
 
       code_ += "{{ACCESS_TYPE}} static func " +
-               namer_.Method("sort_vector_of_" + struct_def.name) +
+               namer_.Method("sort_vector_of", struct_def) +
                "(offsets:[Offset], "
                "_ fbb: inout FlatBufferBuilder) -> Offset {";
       Indent();
@@ -700,7 +700,7 @@ class SwiftGenerator : public BaseGenerator {
         (IsVector(field.value.type) || IsArray(field.value.type))) {
       const auto field_name = namer_.NamespacedType(*vectortype.struct_def);
       code_ += "public static func " +
-               namer_.Method("start_vector_of_" + field_var) +
+               namer_.Method("start_vector_of", field_var) +
                "(_ size: Int, in builder: inout "
                "FlatBufferBuilder) {";
       Indent();
@@ -778,7 +778,7 @@ class SwiftGenerator : public BaseGenerator {
       code_.SetValue("CONSTANT", "nil");
       code_ += GenReaderMainBody(is_required) + GenOffset() + required_reader +
                "{{ACCESS}}.readBuffer(of: {{VALUETYPE}}.self, at: o) }";
-      code_.SetValue("FIELDVAR", namer_.Variable("mutable_" + field_field));
+      code_.SetValue("FIELDVAR", namer_.Variable("mutable", field_field));
       code_.SetValue("VALUETYPE", GenType(field.value.type) + Mutable());
       code_.SetValue("CONSTANT", "nil");
       code_ += GenReaderMainBody(is_required) + GenOffset() + required_reader +
@@ -865,7 +865,7 @@ class SwiftGenerator : public BaseGenerator {
       code_ +=
           "{{ACCESS}}.directRead(of: {{VALUETYPE}}.self, offset: "
           "{{ACCESS}}.vector(at: o) + index * {{SIZE}}) }";
-      code_.SetValue("FIELDMETHOD", namer_.Method("mutable_" + field.name));
+      code_.SetValue("FIELDMETHOD", namer_.Method("mutable", field));
       code_.SetValue("VALUETYPE", GenType(field.value.type) + Mutable());
       code_ += GenArrayMainBody(nullable) + GenOffset() + const_string +
                GenConstructor("{{ACCESS}}.vector(at: o) + index * {{SIZE}}");
@@ -1459,7 +1459,7 @@ class SwiftGenerator : public BaseGenerator {
           code_ += "let __" + var + " = builder.createVector(ofOffsets: __" +
                    var + "__)";
         } else {
-          code_ += "{{STRUCTNAME}}." + namer_.Method("start_vector_of_" + var) +
+          code_ += "{{STRUCTNAME}}." + namer_.Method("start_vector_of", var) +
                    "(obj." + field + ".count, in: &builder)";
           std::string code;
           GenerateStructArgs(*field_type.struct_def, &code, "", "", "_o", true);
diff --git a/src/idl_namer.h b/src/idl_namer.h
index c1b4ca320..d61481a73 100644
--- a/src/idl_namer.h
+++ b/src/idl_namer.h
@@ -57,6 +57,9 @@ class IdlNamer : public Namer {
   std::string Method(const FieldDef &d, const std::string &suffix) const {
     return Method(d.name, suffix);
   }
+  std::string Method(const std::string &prefix, const StructDef &d) const {
+    return Method(prefix, d.name);
+  }
   std::string Method(const std::string &prefix, const FieldDef &d) const {
     return Method(prefix, d.name);
   }