Skip to content

F
flatbuffers
Commit c2411e9c authored by daksenik's avatar daksenik
Browse files
Options

Fixed operator++. Added CreateXXX for vector types.

parent bf26a0ec
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 63 deletions
src/idl_gen_cpp.cpp
View file @ c2411e9c
...@@ -679,6 +679,9 @@ class CppGenerator : public BaseGenerator { ...@@ -679,6 +679,9 @@ class CppGenerator : public BaseGenerator {
// Generate a convenient CreateX function that uses the above builder // Generate a convenient CreateX function that uses the above builder
// to create a table in one go. // to create a table in one go.
std::vector<FieldDef*>vect_pars;
code += "inline flatbuffers::Offset<" + struct_def.name + "> Create"; code += "inline flatbuffers::Offset<" + struct_def.name + "> Create";
code += struct_def.name; code += struct_def.name;
code += "(flatbuffers::FlatBufferBuilder &_fbb"; code += "(flatbuffers::FlatBufferBuilder &_fbb";
...@@ -686,6 +689,7 @@ class CppGenerator : public BaseGenerator { ...@@ -686,6 +689,7 @@ class CppGenerator : public BaseGenerator {
it != struct_def.fields.vec.end(); ++it) { it != struct_def.fields.vec.end(); ++it) {
auto &field = **it; auto &field = **it;
if (!field.deprecated) { if (!field.deprecated) {
if (field.value.type.base_type == BASE_TYPE_STRING || field.value.type.base_type == BASE_TYPE_VECTOR) vect_pars.push_back(*it);
code += ",\n " + GenTypeWire(field.value.type, " ", true); code += ",\n " + GenTypeWire(field.value.type, " ", true);
code += field.name + " = "; code += field.name + " = ";
if (field.value.type.enum_def && IsScalar(field.value.type.base_type)) { if (field.value.type.enum_def && IsScalar(field.value.type.base_type)) {
...@@ -721,81 +725,79 @@ class CppGenerator : public BaseGenerator { ...@@ -721,81 +725,79 @@ class CppGenerator : public BaseGenerator {
code += " return builder_.Finish();\n}\n\n"; code += " return builder_.Finish();\n}\n\n";
//Generate a CreateX function with vector types as parameters //Generate a CreateX function with vector types as parameters
std::vector<FieldDef*>vect_pars_ids; if (vect_pars.size()) {
code += "inline flatbuffers::Offset<" + struct_def.name + "> Create"; code += "inline flatbuffers::Offset<" + struct_def.name + "> Create";
code += struct_def.name; code += struct_def.name;
code += "(flatbuffers::FlatBufferBuilder &_fbb"; code += "(flatbuffers::FlatBufferBuilder &_fbb";
for (auto it = struct_def.fields.vec.begin(); for (auto it = struct_def.fields.vec.begin();
it != struct_def.fields.vec.end(); ++it) { it != struct_def.fields.vec.end(); ++it) {
auto &field = **it; auto &field = **it;
if (!field.deprecated) { if (!field.deprecated) {
if (field.value.type.base_type == BASE_TYPE_STRING) { if (field.value.type.base_type == BASE_TYPE_STRING) {
vect_pars_ids.push_back(*it); code += ",\n const char *";
code += ",\n const char *"; code += field.name + " = \"\"";
code += field.name + " = \"\"";
}
else if (field.value.type.base_type == BASE_TYPE_VECTOR) {
vect_pars_ids.push_back(*it);
code += ",\n std::vector<" + GenTypeWire(field.value.type.VectorType(), "", false) + "> " + field.name;
code += " = std::vector<" + GenTypeWire(field.value.type.VectorType(), "", false) + ">()";
}
else {
code += ",\n " + GenTypeWire(field.value.type, " ", true);
code += field.name + " = ";
if (field.value.type.enum_def && IsScalar(field.value.type.base_type)) {
auto ev = field.value.type.enum_def->ReverseLookup(
static_cast<int>(StringToInt(field.value.constant.c_str())),
false);
if (ev) {
code += WrapInNameSpace(
field.value.type.enum_def->defined_namespace,
GetEnumVal(*field.value.type.enum_def, *ev, parser_.opts));
}
else {
code += GenUnderlyingCast(field, true, field.value.constant);
}
} }
else if (field.value.type.base_type == BASE_TYPE_BOOL) { else if (field.value.type.base_type == BASE_TYPE_VECTOR) {
code += field.value.constant == "0" ? "false" : "true"; code += ",\n std::vector<" + GenTypeWire(field.value.type.VectorType(), "", false) + "> " + field.name;
code += " = std::vector<" + GenTypeWire(field.value.type.VectorType(), "", false) + ">()";
} }
else { else {
code += GenDefaultConstant(field); code += ",\n " + GenTypeWire(field.value.type, " ", true);
code += field.name + " = ";
if (field.value.type.enum_def && IsScalar(field.value.type.base_type)) {
auto ev = field.value.type.enum_def->ReverseLookup(
static_cast<int>(StringToInt(field.value.constant.c_str())),
false);
if (ev) {
code += WrapInNameSpace(
field.value.type.enum_def->defined_namespace,
GetEnumVal(*field.value.type.enum_def, *ev, parser_.opts));
}
else {
code += GenUnderlyingCast(field, true, field.value.constant);
}
}
else if (field.value.type.base_type == BASE_TYPE_BOOL) {
code += field.value.constant == "0" ? "false" : "true";
}
else {
code += GenDefaultConstant(field);
}
} }
} }
} }
} code += ") {\n ";
code += ") {\n "; //getting offsets
//getting offsets
for (auto it = vect_pars_ids.begin(); for (auto it = vect_pars.begin();
it != vect_pars_ids.end(); ++it) { it != vect_pars.end(); ++it) {
auto&field = **it; auto&field = **it;
code += "auto " + field.name + "_off = "; code += "auto " + field.name + "_off = ";
if (field.value.type.base_type == BASE_TYPE_STRING) { if (field.value.type.base_type == BASE_TYPE_STRING) {
code += "_fbb.CreateString(" + field.name + ");\n "; code += "_fbb.CreateString(" + field.name + ");\n ";
} }
else if (field.value.type.base_type == BASE_TYPE_VECTOR) { else if (field.value.type.base_type == BASE_TYPE_VECTOR) {
code += "_fbb.CreateVector<" + GenTypeWire(field.value.type.VectorType(), "", false) + ">(" + field.name + ");\n "; code += "_fbb.CreateVector<" + GenTypeWire(field.value.type.VectorType(), "", false) + ">(" + field.name + ");\n ";
}
} }
}
//... code += struct_def.name + "Builder builder_(_fbb);\n";
code += struct_def.name + "Builder builder_(_fbb);\n"; for (size_t size = struct_def.sortbysize ? sizeof(largest_scalar_t) : 1;
for (size_t size = struct_def.sortbysize ? sizeof(largest_scalar_t) : 1; size; size /= 2) {
size; size /= 2) { for (auto it = struct_def.fields.vec.rbegin();
for (auto it = struct_def.fields.vec.rbegin(); it != struct_def.fields.vec.rend(); ++it) {
it != struct_def.fields.vec.rend(); ++it) { auto &field = **it;
auto &field = **it; if (!field.deprecated && (!struct_def.sortbysize ||
if (!field.deprecated && (!struct_def.sortbysize || size == SizeOf(field.value.type.base_type))) {
size == SizeOf(field.value.type.base_type))) { code += " builder_.add_" + field.name + "(";
code += " builder_.add_" + field.name + "("; code += (field.value.type.base_type == BASE_TYPE_STRING || field.value.type.base_type == BASE_TYPE_VECTOR) ? //if vector or string
code += (!IsScalar(field.value.type.base_type) && (!IsStruct(field.value.type))) ? //if vector or string (field.name + "_off") : field.name;
(field.name + "_off") : field.name; code += ");\n";
code += ");\n"; }
} }
} }
code += " return builder_.Finish();\n}\n\n";
} }
code += " return builder_.Finish();\n}\n\n";
} }
static void GenPadding(const FieldDef &field, std::string &code, static void GenPadding(const FieldDef &field, std::string &code,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment