BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-16 01:07:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ConvertCase instead of Make{Upper,Lower,Snake} implementations (#7127)

Browse Source 
* Unified name case conversion to single method

* Convert bfbs_gen to use ConvertCase

* convert rust to use ConvertCase

* Convert idl_parser to use ConvertCase

* Convert MakeScreamingCamel to ConvertCase

* Replaced MakeCamel with ConvertCase

* minor fixes
This commit is contained in:
Derek Bailey
2022-02-23 16:08:11 -08:00
committed by GitHub
parent 0471fa807c
commit 3694b830a2
20 changed files with 617 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/idl_gen_swift.cpp
View File

@@ -651,7 +651,7 @@ class SwiftGenerator : public BaseGenerator {
}
auto camel_case_name =
MakeCamel(name, false) +
ConvertCase(name, Case::kLowerCamel) +
(IsVector(field.value.type) || IsArray(field.value.type)
? "VectorOffset"
: "Offset");
@@ -669,7 +669,8 @@ class SwiftGenerator : public BaseGenerator {
field.value.type.struct_def->fixed) &&
(IsVector(field.value.type) || IsArray(field.value.type))) {
auto field_name = NameWrappedInNameSpace(*vectortype.struct_def);
code_ += "public static func startVectorOf" + MakeCamel(name, true) +
code_ += "public static func startVectorOf" +
ConvertCase(name, Case::kUpperCamel) +
"(_ size: Int, in builder: inout "
"FlatBufferBuilder) {";
Indent();
@@ -746,7 +747,8 @@ class SwiftGenerator : public BaseGenerator {
code_.SetValue("CONSTANT", "nil");
code_ += GenReaderMainBody(is_required) + GenOffset() + required_reader +
"{{ACCESS}}.readBuffer(of: {{VALUETYPE}}.self, at: o) }";
code_.SetValue("VALUENAME", "mutable" + MakeCamel(name));
code_.SetValue("VALUENAME",
"mutable" + ConvertCase(name, Case::kUpperCamel));
code_.SetValue("VALUETYPE", GenType(field.value.type) + Mutable());
code_.SetValue("CONSTANT", "nil");
code_ += GenReaderMainBody(is_required) + GenOffset() + required_reader +
@@ -834,7 +836,8 @@ class SwiftGenerator : public BaseGenerator {
code_ +=
"{{ACCESS}}.directRead(of: {{VALUETYPE}}.self, offset: "
"{{ACCESS}}.vector(at: o) + index * {{SIZE}}) }";
code_.SetValue("VALUENAME", "mutable" + MakeCamel(Name(field)));
code_.SetValue("VALUENAME",
"mutable" + ConvertCase(Name(field), Case::kUpperCamel));
code_.SetValue("VALUETYPE", GenType(field.value.type) + Mutable());
code_ += GenArrayMainBody(nullable) + GenOffset() + const_string +
GenConstructor("{{ACCESS}}.vector(at: o) + index * {{SIZE}}");
@@ -1435,8 +1438,9 @@ class SwiftGenerator : public BaseGenerator {
code_ += "let __" + name + " = builder.createVector(ofOffsets: __" +
name + "__)";
} else {
code_ += "{{STRUCTNAME}}.startVectorOf" + MakeCamel(name, true) +
"(obj." + name + ".count, in: &builder)";
code_ += "{{STRUCTNAME}}.startVectorOf" +
ConvertCase(name, Case::kUpperCamel) + "(obj." + name +
".count, in: &builder)";
std::string code;
GenerateStructArgs(*field.value.type.struct_def, &code, "", "", "_o",
true);
@@ -1909,11 +1913,11 @@ class SwiftGenerator : public BaseGenerator {
if (isupper(name.front())) {
std::transform(name.begin(), name.end(), name.begin(), CharToLower);
}
return EscapeKeyword(MakeCamel(name, false));
return EscapeKeyword(ConvertCase(name, Case::kLowerCamel));
}
std::string Name(const Definition &def) const {
return EscapeKeyword(MakeCamel(def.name, false));
return EscapeKeyword(ConvertCase(def.name, Case::kLowerCamel));
}
};
} // namespace swift