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

Update idl_gen_general.cpp

Browse Source
This commit is contained in:
TGIshib
2016-08-27 00:42:06 +03:00
parent 98f9af8ecc
commit 2ff6152204
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/idl_gen_general.cpp
View File

@@ -703,7 +703,7 @@ std::string GenLookupKeyGetter(flatbuffers::FieldDef *key_field) {
auto get_val = GenGetter(key_field->value.type) + auto get_val = GenGetter(key_field->value.type) +
"(" + GenOffsetGetter(key_field) + ")"; "(" + GenOffsetGetter(key_field) + ")";
if (lang_.language == IDLOptions::kCSharp) { if (lang_.language == IDLOptions::kCSharp) {
key_getter += "int comp = " + get_val + ".CompateTo(key);\n"; key_getter += "int comp = " + get_val + ".CompareTo(key);\n";
} else { } else {
key_getter += GenTypeGet(key_field->value.type) + " val = "; key_getter += GenTypeGet(key_field->value.type) + " val = ";
key_getter += get_val + ";\n"; key_getter += get_val + ";\n";
@@ -1212,7 +1212,8 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
code += "); }\n"; code += "); }\n";
} }
} }
if (struct_def.has_key) { if (struct_def.has_key && (lang_.language == IDLOptions::kJava ||
lang_.language == IDLOptions::kCSharp)) {
if (lang_.language == IDLOptions::kJava) { if (lang_.language == IDLOptions::kJava) {
code += "\n @Override\n protected int keysCompare("; code += "\n @Override\n protected int keysCompare(";
code += "Integer o1, Integer o2, ByteBuffer _bb) {"; code += "Integer o1, Integer o2, ByteBuffer _bb) {";
@@ -1234,11 +1235,13 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
code += "ookupByKey(" + GenVectorOffsetType(); code += "ookupByKey(" + GenVectorOffsetType();
code += " vectorOffset, " + GenTypeGet(key_field->value.type); code += " vectorOffset, " + GenTypeGet(key_field->value.type);
code += " key, ByteBuffer bb) {\n"; code += " key, ByteBuffer bb) {\n";
code += " byte[] byteKey = "; if (key_field->value.type.base_type == BASE_TYPE_STRING) {
if (lang_.language == IDLOptions::kJava) code += " byte[] byteKey = ";
code += "key.getBytes(Table.UTF8_CHARSET.get());\n"; if (lang_.language == IDLOptions::kJava)
else code += "key.getBytes(Table.UTF8_CHARSET.get());\n";
code += "System.Text.Encoding.UTF8.GetBytes(key);\n"; else
code += "System.Text.Encoding.UTF8.GetBytes(key);\n";
}
code += " int vectorLocation = " + GenByteBufferLength("bb"); code += " int vectorLocation = " + GenByteBufferLength("bb");
code += " - vectorOffset"; code += " - vectorOffset";
if (lang_.language == IDLOptions::kCSharp) code += ".Value"; if (lang_.language == IDLOptions::kCSharp) code += ".Value";