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

[CS] Naming collision if field has same name as table and used as key (#7842)

Browse Source 
* Fix C/C++ Create<Type>Direct with sorted vectors

If a struct has a key the vector has to be sorted. To sort the vector
you can't use "const".

* Changes due to code review

* Improve code readability

* Add generate of JSON schema to string to lib

* option indent_step is supported

* Remove unused variables

* Fix break in test

* Fix style to be consistent with rest of the code

* [TS] Fix reserved words as arguments (#6955)

* [TS] Fix generation of reserved words in object api (#7106)

* [TS] Fix generation of object api

* [TS] Fix MakeCamel -> ConvertCase

* [C#] Fix collision of field name and type name

* [TS] Add test for struct of struct of struct

* Update generated files

* Add missing files

* [TS] Fix query of null/undefined fields in object api

* Fix collision if field name is equal to table name and used as key in an array

---------

Co-authored-by: Derek Bailey <derekbailey@google.com>
This commit is contained in:
tira-misu
2023-03-03 06:42:27 +01:00
committed by GitHub
parent 4a34cd70dc
commit d1e4daa178
3 changed files with 141 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/idl_gen_csharp.cpp
View File

@@ -477,8 +477,9 @@ class CSharpGenerator : public BaseGenerator {
const std::string &offset) const {
// Use the generated type directly, to properly handle default values that
// might not be written to the buffer.
return GetObjectConstructor(struct_def, data_buffer, offset) + "." +
Name(*key_field);
auto name = Name(*key_field);
if (name == struct_def.name) { name += "_"; }
return GetObjectConstructor(struct_def, data_buffer, offset) + "." + name;
}
// Direct mutation is only allowed for scalar fields.
@@ -1303,6 +1304,8 @@ class CSharpGenerator : public BaseGenerator {
// because `key_field` is not set for struct
if (struct_def.has_key && !struct_def.fixed) {
FLATBUFFERS_ASSERT(key_field);
auto name = Name(*key_field);
if (name == struct_def.name) { name += "_"; }
code += "\n public static VectorOffset ";
code += "CreateSortedVectorOf" + struct_def.name;
code += "(FlatBufferBuilder builder, ";
@@ -1332,8 +1335,7 @@ class CSharpGenerator : public BaseGenerator {
"(start + middle), bb);\n";
code += " obj_.__assign(tableOffset, bb);\n";
code +=
" int comp = obj_." + Name(*key_field) + ".CompareTo(key);\n";
code += " int comp = obj_." + name + ".CompareTo(key);\n";
code += " if (comp > 0) {\n";
code += " span = middle;\n";
code += " } else if (comp < 0) {\n";