BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-03 12:21:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

[C++] flatc --cpp-field-case-style option to permit camel-case field names in C++ (#6669)

Browse Source 
* flatc --cpp-field-case option to permit camel-case field names in C++

* fixed option name; cleaned up tabs

* formatting fixed to conform to CI

* resolved comments

* fixed white space indentation

* per PR comments

* rename snake case option to unchanged for clarity, per PR comments

* cleanup of unchanged case option in C++ codegen, per PR 6669 comments

* incorporated PR feedback from vglavnyy

* cleaned up to pass Travis CI / clang format

* bumped PR to retry transient CI failure

* bumped PR to retry transient CI failure

* bump PR

* assert union type field name length > suffix, per PR 6669 comments
This commit is contained in:
Huw Rogers
2021-06-08 19:23:05 +01:00
committed by GitHub
parent 021177af0d
commit f069396d1b
3 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/idl_gen_cpp.cpp
View File

@@ -233,6 +233,30 @@ class CppGenerator : public BaseGenerator {
return keywords_.find(name) == keywords_.end() ? name : name + "_";
}
std::string Name(const FieldDef &field) const {
// the union type field suffix is immutable.
static size_t union_suffix_len = strlen(UnionTypeFieldSuffix());
const bool is_union_type = field.value.type.base_type == BASE_TYPE_UTYPE;
// early return if no case transformation required
if (opts_.cpp_object_api_field_case_style ==
IDLOptions::CaseStyle_Unchanged)
return EscapeKeyword(field.name);
std::string name = field.name;
// do not change the case style of the union type field suffix
if (is_union_type) {
FLATBUFFERS_ASSERT(name.length() > union_suffix_len);
name.erase(name.length() - union_suffix_len, union_suffix_len);
}
if (opts_.cpp_object_api_field_case_style == IDLOptions::CaseStyle_Upper)
name = MakeCamel(name, true); /* upper */
else if (opts_.cpp_object_api_field_case_style ==
IDLOptions::CaseStyle_Lower)
name = MakeCamel(name, false); /* lower */
// restore the union field type suffix
if (is_union_type) name.append(UnionTypeFieldSuffix(), union_suffix_len);
return EscapeKeyword(name);
}
std::string Name(const Definition &def) const {
return EscapeKeyword(def.name);
}