BigfootDev/flatbuffers-bigfoot
1
0
Fork 0
forked from BigfootDev/flatbuffers
Code Pull Requests Activity

Apply Namer prefix/suffix to other generators (#7197)

Browse Source 
* Apply Namer prefix/suffix to other generators

* unnecessary .name

Co-authored-by: Casper Neo <cneo@google.com>
This commit is contained in:
Casper
2022-03-30 18:45:11 -04:00
committed by GitHub
parent fac0d7be02
commit b71d968fad
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/idl_gen_dart.cpp
View File

@@ -836,7 +836,7 @@ class DartGenerator : public BaseGenerator {
it != non_deprecated_fields.end(); ++it) { it != non_deprecated_fields.end(); ++it) {
const auto &field = *it->second; const auto &field = *it->second;
const auto offset = it->first; 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); const std::string field_var = namer_.Variable(field);
if (IsScalar(field.value.type.base_type)) { if (IsScalar(field.value.type.base_type)) {

10
src/idl_gen_swift.cpp
View File

@@ -588,7 +588,7 @@ class SwiftGenerator : public BaseGenerator {
code_.SetValue("VOFFSET", NumToString(key_field->value.offset)); code_.SetValue("VOFFSET", NumToString(key_field->value.offset));
code_ += "{{ACCESS_TYPE}} static func " + code_ += "{{ACCESS_TYPE}} static func " +
namer_.Method("sort_vector_of_" + struct_def.name) + namer_.Method("sort_vector_of", struct_def) +
"(offsets:[Offset], " "(offsets:[Offset], "
"_ fbb: inout FlatBufferBuilder) -> Offset {"; "_ fbb: inout FlatBufferBuilder) -> Offset {";
Indent(); Indent();
@@ -700,7 +700,7 @@ class SwiftGenerator : public BaseGenerator {
(IsVector(field.value.type) || IsArray(field.value.type))) { (IsVector(field.value.type) || IsArray(field.value.type))) {
const auto field_name = namer_.NamespacedType(*vectortype.struct_def); const auto field_name = namer_.NamespacedType(*vectortype.struct_def);
code_ += "public static func " + code_ += "public static func " +
namer_.Method("start_vector_of_" + field_var) + namer_.Method("start_vector_of", field_var) +
"(_ size: Int, in builder: inout " "(_ size: Int, in builder: inout "
"FlatBufferBuilder) {"; "FlatBufferBuilder) {";
Indent(); Indent();
@@ -778,7 +778,7 @@ class SwiftGenerator : public BaseGenerator {
code_.SetValue("CONSTANT", "nil"); code_.SetValue("CONSTANT", "nil");
code_ += GenReaderMainBody(is_required) + GenOffset() + required_reader + code_ += GenReaderMainBody(is_required) + GenOffset() + required_reader +
"{{ACCESS}}.readBuffer(of: {{VALUETYPE}}.self, at: o) }"; "{{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("VALUETYPE", GenType(field.value.type) + Mutable());
code_.SetValue("CONSTANT", "nil"); code_.SetValue("CONSTANT", "nil");
code_ += GenReaderMainBody(is_required) + GenOffset() + required_reader + code_ += GenReaderMainBody(is_required) + GenOffset() + required_reader +
@@ -865,7 +865,7 @@ class SwiftGenerator : public BaseGenerator {
code_ += code_ +=
"{{ACCESS}}.directRead(of: {{VALUETYPE}}.self, offset: " "{{ACCESS}}.directRead(of: {{VALUETYPE}}.self, offset: "
"{{ACCESS}}.vector(at: o) + index * {{SIZE}}) }"; "{{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_.SetValue("VALUETYPE", GenType(field.value.type) + Mutable());
code_ += GenArrayMainBody(nullable) + GenOffset() + const_string + code_ += GenArrayMainBody(nullable) + GenOffset() + const_string +
GenConstructor("{{ACCESS}}.vector(at: o) + index * {{SIZE}}"); GenConstructor("{{ACCESS}}.vector(at: o) + index * {{SIZE}}");
@@ -1459,7 +1459,7 @@ class SwiftGenerator : public BaseGenerator {
code_ += "let __" + var + " = builder.createVector(ofOffsets: __" + code_ += "let __" + var + " = builder.createVector(ofOffsets: __" +
var + "__)"; var + "__)";
} else { } else {
code_ += "{{STRUCTNAME}}." + namer_.Method("start_vector_of_" + var) + code_ += "{{STRUCTNAME}}." + namer_.Method("start_vector_of", var) +
"(obj." + field + ".count, in: &builder)"; "(obj." + field + ".count, in: &builder)";
std::string code; std::string code;
GenerateStructArgs(*field_type.struct_def, &code, "", "", "_o", true); GenerateStructArgs(*field_type.struct_def, &code, "", "", "_o", true);

3
src/idl_namer.h
View File

@@ -57,6 +57,9 @@ class IdlNamer : public Namer {
std::string Method(const FieldDef &d, const std::string &suffix) const { std::string Method(const FieldDef &d, const std::string &suffix) const {
return Method(d.name, suffix); 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 { std::string Method(const std::string &prefix, const FieldDef &d) const {
return Method(prefix, d.name); return Method(prefix, d.name);
} }