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

fix CScript string.compare (#8547)

Browse Source 
* fix CScript string.compare

Because the default compare sorting rules of c# string are different from those of cpp, the binary file exported by flatc -b cannot use LookupByKey

* run generate_code.py

---------
This commit is contained in:
whiteye
2025-12-01 11:06:41 +08:00
committed by GitHub
parent 7dd38fa23a
commit 97d26ab4ae
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/idl_gen_csharp.cpp
View File

@@ -650,12 +650,22 @@ class CSharpGenerator : public BaseGenerator {
std::string GenKeyGetter(flatbuffers::StructDef& struct_def, std::string GenKeyGetter(flatbuffers::StructDef& struct_def,
flatbuffers::FieldDef* key_field) const { flatbuffers::FieldDef* key_field) const {
// Get the getter for the key of the struct. // Get the getter for the key of the struct.
return GenGetterForLookupByKey(struct_def, key_field, "builder.DataBuffer", if (IsString(key_field->value.type)) {
"builder.DataBuffer.Length - o1.Value") + return "string.CompareOrdinal(" +
".CompareTo(" + GenGetterForLookupByKey(struct_def, key_field, "builder.DataBuffer",
GenGetterForLookupByKey(struct_def, key_field, "builder.DataBuffer", "builder.DataBuffer.Length - o1.Value") +
"builder.DataBuffer.Length - o2.Value") + ", " +
")"; GenGetterForLookupByKey(struct_def, key_field, "builder.DataBuffer",
"builder.DataBuffer.Length - o2.Value") +
")";
} else {
return GenGetterForLookupByKey(struct_def, key_field, "builder.DataBuffer",
"builder.DataBuffer.Length - o1.Value") +
".CompareTo(" +
GenGetterForLookupByKey(struct_def, key_field, "builder.DataBuffer",
"builder.DataBuffer.Length - o2.Value") +
")";
}
} }
// Get the value of a table verification function start // Get the value of a table verification function start
@@ -1585,7 +1595,11 @@ class CSharpGenerator : public BaseGenerator {
"(start + middle), bb);\n"; "(start + middle), bb);\n";
code += " obj_.__assign(tableOffset, bb);\n"; code += " obj_.__assign(tableOffset, bb);\n";
code += " int comp = obj_." + name + ".CompareTo(key);\n"; if (IsString(key_field->value.type)) {
code += " int comp = string.CompareOrdinal(obj_." + name + ", key);\n";
} else {
code += " int comp = obj_." + name + ".CompareTo(key);\n";
}
code += " if (comp > 0) {\n"; code += " if (comp > 0) {\n";
code += " span = middle;\n"; code += " span = middle;\n";
code += " } else if (comp < 0) {\n"; code += " } else if (comp < 0) {\n";

4
tests/MyGame/Example/Monster.cs
View File

@@ -521,7 +521,7 @@ public struct Monster : IFlatbufferObject
public static VectorOffset CreateSortedVectorOfMonster(FlatBufferBuilder builder, Offset<Monster>[] offsets) { public static VectorOffset CreateSortedVectorOfMonster(FlatBufferBuilder builder, Offset<Monster>[] offsets) {
Array.Sort(offsets, Array.Sort(offsets,
(Offset<Monster> o1, Offset<Monster> o2) => (Offset<Monster> o1, Offset<Monster> o2) =>
new Monster().__assign(builder.DataBuffer.Length - o1.Value, builder.DataBuffer).Name.CompareTo(new Monster().__assign(builder.DataBuffer.Length - o2.Value, builder.DataBuffer).Name)); string.CompareOrdinal(new Monster().__assign(builder.DataBuffer.Length - o1.Value, builder.DataBuffer).Name, new Monster().__assign(builder.DataBuffer.Length - o2.Value, builder.DataBuffer).Name));
return builder.CreateVectorOfTables(offsets); return builder.CreateVectorOfTables(offsets);
} }
@@ -533,7 +533,7 @@ public struct Monster : IFlatbufferObject
int middle = span / 2; int middle = span / 2;
int tableOffset = Table.__indirect(vectorLocation + 4 * (start + middle), bb); int tableOffset = Table.__indirect(vectorLocation + 4 * (start + middle), bb);
obj_.__assign(tableOffset, bb); obj_.__assign(tableOffset, bb);
int comp = obj_.Name.CompareTo(key); int comp = string.CompareOrdinal(obj_.Name, key);
if (comp > 0) { if (comp > 0) {
span = middle; span = middle;
} else if (comp < 0) { } else if (comp < 0) {

4
tests/union_value_collsion/union_value_collision_generated.cs
View File

@@ -292,7 +292,7 @@ public struct Collide : IFlatbufferObject
public static VectorOffset CreateSortedVectorOfCollide(FlatBufferBuilder builder, Offset<Collide>[] offsets) { public static VectorOffset CreateSortedVectorOfCollide(FlatBufferBuilder builder, Offset<Collide>[] offsets) {
Array.Sort(offsets, Array.Sort(offsets,
(Offset<Collide> o1, Offset<Collide> o2) => (Offset<Collide> o1, Offset<Collide> o2) =>
new Collide().__assign(builder.DataBuffer.Length - o1.Value, builder.DataBuffer).Collide_.CompareTo(new Collide().__assign(builder.DataBuffer.Length - o2.Value, builder.DataBuffer).Collide_)); string.CompareOrdinal(new Collide().__assign(builder.DataBuffer.Length - o1.Value, builder.DataBuffer).Collide_, new Collide().__assign(builder.DataBuffer.Length - o2.Value, builder.DataBuffer).Collide_));
return builder.CreateVectorOfTables(offsets); return builder.CreateVectorOfTables(offsets);
} }
@@ -304,7 +304,7 @@ public struct Collide : IFlatbufferObject
int middle = span / 2; int middle = span / 2;
int tableOffset = Table.__indirect(vectorLocation + 4 * (start + middle), bb); int tableOffset = Table.__indirect(vectorLocation + 4 * (start + middle), bb);
obj_.__assign(tableOffset, bb); obj_.__assign(tableOffset, bb);
int comp = obj_.Collide_.CompareTo(key); int comp = string.CompareOrdinal(obj_.Collide_, key);
if (comp > 0) { if (comp > 0) {
span = middle; span = middle;
} else if (comp < 0) { } else if (comp < 0) {