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

Merge pull request #608 from evolutional/master

Browse Source 
Fix to #360 - Fully qualified names outside of current NS
This commit is contained in:
Wouter van Oortmerssen
2015-12-07 10:33:38 -08:00
parent 163d04a5d2 c9ad6d5496
commit 8e6758d205
25 changed files with 922 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

207
src/idl_gen_general.cpp
View File

@@ -198,7 +198,28 @@ static bool IsEnum(const Type& type) {
return type.enum_def != nullptr && IsInteger(type.base_type);
}
static std::string GenTypeBasic(const LanguageParameters &lang,
// Ensure that a type is prefixed with its namespace whenever it is used
// outside of its namespace.
static std::string WrapInNameSpace(const Parser &parser, const Namespace *ns,
const std::string &name) {
if (parser.namespaces_.back() != ns) {
std::string qualified_name;
for (auto it = ns->components.begin();
it != ns->components.end(); ++it) {
qualified_name += *it + ".";
}
return qualified_name + name;
} else {
return name;
}
}
static std::string WrapInNameSpace(const Parser &parser,
const Definition &def) {
return WrapInNameSpace(parser, def.defined_namespace, def.name);
}
static std::string GenTypeBasic(const LanguageParameters &lang, const Parser &parser,
const Type &type,
bool enableLangOverrides) {
static const char *gtypename[] = {
@@ -210,30 +231,33 @@ static std::string GenTypeBasic(const LanguageParameters &lang,
if (enableLangOverrides) {
if (lang.language == IDLOptions::kCSharp) {
if (IsEnum(type)) return type.enum_def->name;
if (type.base_type == BASE_TYPE_STRUCT) return "Offset<" + type.struct_def->name + ">";
if (IsEnum(type)) return WrapInNameSpace(parser, *type.enum_def);
if (type.base_type == BASE_TYPE_STRUCT) {
return "Offset<" + WrapInNameSpace(parser, *type.struct_def) + ">";
}
}
}
return gtypename[type.base_type * IDLOptions::kMAX + lang.language];
}
static std::string GenTypeBasic(const LanguageParameters &lang, const Type &type) {
return GenTypeBasic(lang, type, true);
static std::string GenTypeBasic(const LanguageParameters &lang, const Parser &parser,
const Type &type) {
return GenTypeBasic(lang, parser, type, true);
}
static std::string GenTypeGet(const LanguageParameters &lang,
static std::string GenTypeGet(const LanguageParameters &lang, const Parser &parser,
const Type &type);
static std::string GenTypePointer(const LanguageParameters &lang,
static std::string GenTypePointer(const LanguageParameters &lang, const Parser &parser,
const Type &type) {
switch (type.base_type) {
case BASE_TYPE_STRING:
return lang.string_type;
case BASE_TYPE_VECTOR:
return GenTypeGet(lang, type.VectorType());
return GenTypeGet(lang, parser, type.VectorType());
case BASE_TYPE_STRUCT:
return type.struct_def->name;
return WrapInNameSpace(parser, *type.struct_def);
case BASE_TYPE_UNION:
// Unions in C# use a generic Table-derived type for better type safety
if (lang.language == IDLOptions::kCSharp) return "TTable";
@@ -243,16 +267,16 @@ static std::string GenTypePointer(const LanguageParameters &lang,
}
}
static std::string GenTypeGet(const LanguageParameters &lang,
static std::string GenTypeGet(const LanguageParameters &lang, const Parser &parser,
const Type &type) {
return IsScalar(type.base_type)
? GenTypeBasic(lang, type)
: GenTypePointer(lang, type);
? GenTypeBasic(lang, parser, type)
: GenTypePointer(lang, parser, type);
}
// Find the destination type the user wants to receive the value in (e.g.
// one size higher signed types for unsigned serialized values in Java).
static Type DestinationType(const LanguageParameters &lang, const Type &type,
static Type DestinationType(const LanguageParameters &lang, const Parser &parser, const Type &type,
bool vectorelem) {
if (lang.language != IDLOptions::kJava) return type;
switch (type.base_type) {
@@ -263,26 +287,27 @@ static Type DestinationType(const LanguageParameters &lang, const Type &type,
case BASE_TYPE_UINT: return Type(BASE_TYPE_LONG);
case BASE_TYPE_VECTOR:
if (vectorelem)
return DestinationType(lang, type.VectorType(), vectorelem);
return DestinationType(lang, parser, type.VectorType(), vectorelem);
// else fall thru:
default: return type;
}
}
static std::string GenOffsetType(const LanguageParameters &lang, const StructDef &struct_def) {
static std::string GenOffsetType(const LanguageParameters &lang, const Parser &parser,
const StructDef &struct_def) {
if(lang.language == IDLOptions::kCSharp) {
return "Offset<" + struct_def.name + ">";
return "Offset<" + WrapInNameSpace(parser, struct_def) + ">";
} else {
return "int";
}
}
static std::string GenOffsetConstruct(const LanguageParameters &lang,
static std::string GenOffsetConstruct(const LanguageParameters &lang, const Parser &parser,
const StructDef &struct_def,
const std::string &variable_name)
{
if(lang.language == IDLOptions::kCSharp) {
return "new Offset<" + struct_def.name + ">(" + variable_name + ")";
return "new Offset<" + WrapInNameSpace(parser, struct_def) + ">(" + variable_name + ")";
}
return variable_name;
}
@@ -296,9 +321,9 @@ static std::string GenVectorOffsetType(const LanguageParameters &lang) {
}
// Generate destination type name
static std::string GenTypeNameDest(const LanguageParameters &lang, const Type &type)
static std::string GenTypeNameDest(const LanguageParameters &lang, const Parser &parser, const Type &type)
{
return GenTypeGet(lang, DestinationType(lang, type, true));
return GenTypeGet(lang, parser, DestinationType(lang, parser, type, true));
}
// Mask to turn serialized value into destination type value.
@@ -318,10 +343,10 @@ static std::string DestinationMask(const LanguageParameters &lang,
}
// Casts necessary to correctly read serialized data
static std::string DestinationCast(const LanguageParameters &lang,
static std::string DestinationCast(const LanguageParameters &lang, const Parser &parser,
const Type &type) {
if (type.base_type == BASE_TYPE_VECTOR) {
return DestinationCast(lang, type.VectorType());
return DestinationCast(lang, parser, type.VectorType());
} else {
switch (lang.language) {
case IDLOptions::kJava:
@@ -331,7 +356,7 @@ static std::string DestinationCast(const LanguageParameters &lang,
case IDLOptions::kCSharp:
// Cast from raw integral types to enum.
if (IsEnum(type)) return "(" + type.enum_def->name + ")";
if (IsEnum(type)) return "(" + WrapInNameSpace(parser, *type.enum_def) + ")";
break;
default:
@@ -345,11 +370,11 @@ static std::string DestinationCast(const LanguageParameters &lang,
// In Java, parameters representing unsigned numbers need to be cast down to their respective type.
// For example, a long holding an unsigned int value would be cast down to int before being put onto the buffer.
// In C#, one cast directly cast an Enum to its underlying type, which is essential before putting it onto the buffer.
static std::string SourceCast(const LanguageParameters &lang,
static std::string SourceCast(const LanguageParameters &lang, const Parser &parser,
const Type &type,
bool castFromDest) {
if (type.base_type == BASE_TYPE_VECTOR) {
return SourceCast(lang, type.VectorType(), castFromDest);
return SourceCast(lang, parser, type.VectorType(), castFromDest);
} else {
switch (lang.language) {
case IDLOptions::kJava:
@@ -360,7 +385,7 @@ static std::string SourceCast(const LanguageParameters &lang,
}
break;
case IDLOptions::kCSharp:
if (IsEnum(type)) return "(" + GenTypeBasic(lang, type, false) + ")";
if (IsEnum(type)) return "(" + GenTypeBasic(lang, parser, type, false) + ")";
break;
default:
break;
@@ -369,24 +394,24 @@ static std::string SourceCast(const LanguageParameters &lang,
return "";
}
static std::string SourceCast(const LanguageParameters &lang,
static std::string SourceCast(const LanguageParameters &lang, const Parser &parser,
const Type &type) {
return SourceCast(lang, type, true);
return SourceCast(lang, parser, type, true);
}
static std::string SourceCastBasic(const LanguageParameters &lang,
static std::string SourceCastBasic(const LanguageParameters &lang, const Parser &parser,
const Type &type,
bool castFromDest) {
return IsScalar(type.base_type) ? SourceCast(lang, type, castFromDest) : "";
return IsScalar(type.base_type) ? SourceCast(lang, parser, type, castFromDest) : "";
}
static std::string SourceCastBasic(const LanguageParameters &lang,
static std::string SourceCastBasic(const LanguageParameters &lang, const Parser &parser,
const Type &type) {
return SourceCastBasic(lang, type, true);
return SourceCastBasic(lang, parser, type, true);
}
static std::string GenEnumDefaultValue(const Value &value) {
static std::string GenEnumDefaultValue(const Parser &parser, const Value &value) {
auto enum_def = value.type.enum_def;
auto vec = enum_def->vals.vec;
auto default_value = StringToInt(value.constant.c_str());
@@ -395,7 +420,7 @@ static std::string GenEnumDefaultValue(const Value &value) {
for (auto it = vec.begin(); it != vec.end(); ++it) {
auto enum_val = **it;
if (enum_val.value == default_value) {
result = enum_def->name + "." + enum_val.name;
result = WrapInNameSpace(parser, *enum_def) + "." + enum_val.name;
break;
}
}
@@ -403,13 +428,14 @@ static std::string GenEnumDefaultValue(const Value &value) {
return result;
}
static std::string GenDefaultValue(const LanguageParameters &lang, const Value &value, bool enableLangOverrides) {
static std::string GenDefaultValue(const LanguageParameters &lang, const Parser &parser,
const Value &value, bool enableLangOverrides) {
if (enableLangOverrides) {
// handles both enum case and vector of enum case
if (lang.language == IDLOptions::kCSharp &&
value.type.enum_def != nullptr &&
value.type.base_type != BASE_TYPE_UNION) {
return GenEnumDefaultValue(value);
return GenEnumDefaultValue(parser, value);
}
}
return value.type.base_type == BASE_TYPE_BOOL
@@ -417,11 +443,13 @@ static std::string GenDefaultValue(const LanguageParameters &lang, const Value &
: value.constant;
}
static std::string GenDefaultValue(const LanguageParameters &lang, const Value &value) {
return GenDefaultValue(lang, value, true);
static std::string GenDefaultValue(const LanguageParameters &lang, const Parser &parser,
const Value &value) {
return GenDefaultValue(lang, parser, value, true);
}
static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Value &value, bool enableLangOverrides) {
static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Parser &parser,
const Value &value, bool enableLangOverrides) {
if (!IsScalar(value.type.base_type)) {
if (enableLangOverrides) {
if (lang.language == IDLOptions::kCSharp) {
@@ -429,7 +457,7 @@ static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Va
case BASE_TYPE_STRING:
return "default(StringOffset)";
case BASE_TYPE_STRUCT:
return "default(Offset<" + value.type.struct_def->name + ">)";
return "default(Offset<" + WrapInNameSpace(parser, *value.type.struct_def) + ">)";
case BASE_TYPE_VECTOR:
return "default(VectorOffset)";
default:
@@ -439,14 +467,15 @@ static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Va
}
return "0";
}
return GenDefaultValue(lang, value, enableLangOverrides);
return GenDefaultValue(lang, parser, value, enableLangOverrides);
}
static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Value &value) {
return GenDefaultValueBasic(lang, value, true);
static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Parser &parser,
const Value &value) {
return GenDefaultValueBasic(lang, parser, value, true);
}
static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def,
static void GenEnum(const LanguageParameters &lang, const Parser &parser, EnumDef &enum_def,
std::string *code_ptr) {
std::string &code = *code_ptr;
if (enum_def.generated) return;
@@ -459,7 +488,7 @@ static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def,
GenComment(enum_def.doc_comment, code_ptr, &lang.comment_config);
code += std::string("public ") + lang.enum_decl + enum_def.name;
if (lang.language == IDLOptions::kCSharp) {
code += lang.inheritance_marker + GenTypeBasic(lang, enum_def.underlying_type, false);
code += lang.inheritance_marker + GenTypeBasic(lang, parser, enum_def.underlying_type, false);
}
code += lang.open_curly;
if (lang.language == IDLOptions::kJava) {
@@ -473,7 +502,7 @@ static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def,
if (lang.language != IDLOptions::kCSharp) {
code += " public static";
code += lang.const_decl;
code += GenTypeBasic(lang, enum_def.underlying_type, false);
code += GenTypeBasic(lang, parser, enum_def.underlying_type, false);
}
code += " " + ev.name + " = ";
code += NumToString(ev.value);
@@ -519,19 +548,19 @@ static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def,
}
// Returns the function name that is able to read a value of the given type.
static std::string GenGetter(const LanguageParameters &lang,
static std::string GenGetter(const LanguageParameters &lang, const Parser &parser,
const Type &type) {
switch (type.base_type) {
case BASE_TYPE_STRING: return "__string";
case BASE_TYPE_STRUCT: return "__struct";
case BASE_TYPE_UNION: return "__union";
case BASE_TYPE_VECTOR: return GenGetter(lang, type.VectorType());
case BASE_TYPE_VECTOR: return GenGetter(lang, parser, type.VectorType());
default: {
std::string getter = "bb." + FunctionStart(lang, 'G') + "et";
if (type.base_type == BASE_TYPE_BOOL) {
getter = "0!=" + getter;
} else if (GenTypeBasic(lang, type, false) != "byte") {
getter += MakeCamel(GenTypeBasic(lang, type, false));
} else if (GenTypeBasic(lang, parser, type, false) != "byte") {
getter += MakeCamel(GenTypeBasic(lang, parser, type, false));
}
return getter;
}
@@ -540,13 +569,13 @@ static std::string GenGetter(const LanguageParameters &lang,
// Direct mutation is only allowed for scalar fields.
// Hence a setter method will only be generated for such fields.
static std::string GenSetter(const LanguageParameters &lang,
static std::string GenSetter(const LanguageParameters &lang, const Parser &parser,
const Type &type) {
if (IsScalar(type.base_type)) {
std::string setter = "bb." + FunctionStart(lang, 'P') + "ut";
if (GenTypeBasic(lang, type, false) != "byte" &&
if (GenTypeBasic(lang, parser, type, false) != "byte" &&
type.base_type != BASE_TYPE_BOOL) {
setter += MakeCamel(GenTypeBasic(lang, type, false));
setter += MakeCamel(GenTypeBasic(lang, parser, type, false));
}
return setter;
} else {
@@ -555,15 +584,15 @@ static std::string GenSetter(const LanguageParameters &lang,
}
// Returns the method name for use with add/put calls.
static std::string GenMethod(const LanguageParameters &lang, const Type &type) {
static std::string GenMethod(const LanguageParameters &lang, const Parser &parser, const Type &type) {
return IsScalar(type.base_type)
? MakeCamel(GenTypeBasic(lang, type, false))
? MakeCamel(GenTypeBasic(lang, parser, type, false))
: (IsStruct(type) ? "Struct" : "Offset");
}
// Recursively generate arguments for a constructor, to deal with nested
// structs.
static void GenStructArgs(const LanguageParameters &lang,
static void GenStructArgs(const LanguageParameters &lang, const Parser &parser,
const StructDef &struct_def,
std::string *code_ptr, const char *nameprefix) {
std::string &code = *code_ptr;
@@ -575,11 +604,11 @@ static void GenStructArgs(const LanguageParameters &lang,
// Generate arguments for a struct inside a struct. To ensure names
// don't clash, and to make it obvious these arguments are constructing
// a nested struct, prefix the name with the field name.
GenStructArgs(lang, *field.value.type.struct_def, code_ptr,
GenStructArgs(lang, parser, *field.value.type.struct_def, code_ptr,
(nameprefix + (field.name + "_")).c_str());
} else {
code += ", ";
code += GenTypeBasic(lang, DestinationType(lang,field.value.type, false));
code += GenTypeBasic(lang, parser, DestinationType(lang, parser, field.value.type, false));
code += " ";
code += nameprefix;
code += MakeCamel(field.name, lang.first_camel_upper);
@@ -590,7 +619,7 @@ static void GenStructArgs(const LanguageParameters &lang,
// Recusively generate struct construction statements of the form:
// builder.putType(name);
// and insert manual padding.
static void GenStructBody(const LanguageParameters &lang,
static void GenStructBody(const LanguageParameters &lang, const Parser &parser,
const StructDef &struct_def,
std::string *code_ptr, const char *nameprefix) {
std::string &code = *code_ptr;
@@ -605,12 +634,12 @@ static void GenStructBody(const LanguageParameters &lang,
code += NumToString(field.padding) + ");\n";
}
if (IsStruct(field.value.type)) {
GenStructBody(lang, *field.value.type.struct_def, code_ptr,
GenStructBody(lang, parser, *field.value.type.struct_def, code_ptr,
(nameprefix + (field.name + "_")).c_str());
} else {
code += " builder." + FunctionStart(lang, 'P') + "ut";
code += GenMethod(lang, field.value.type) + "(";
code += SourceCast(lang, field.value.type);
code += GenMethod(lang, parser, field.value.type) + "(";
code += SourceCast(lang, parser, field.value.type);
auto argname = nameprefix + MakeCamel(field.name, lang.first_camel_upper);
code += argname;
code += ");\n";
@@ -675,11 +704,11 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
auto &field = **it;
if (field.deprecated) continue;
GenComment(field.doc_comment, code_ptr, &lang.comment_config, " ");
std::string type_name = GenTypeGet(lang, field.value.type);
std::string type_name_dest = GenTypeNameDest(lang, field.value.type);
std::string type_name = GenTypeGet(lang, parser, field.value.type);
std::string type_name_dest = GenTypeNameDest(lang, parser, field.value.type);
std::string dest_mask = DestinationMask(lang, field.value.type, true);
std::string dest_cast = DestinationCast(lang, field.value.type);
std::string src_cast = SourceCast(lang, field.value.type);
std::string dest_cast = DestinationCast(lang, parser, field.value.type);
std::string src_cast = SourceCast(lang, parser, field.value.type);
std::string method_start = " public " + type_name_dest + " " +
MakeCamel(field.name, lang.first_camel_upper);
@@ -729,7 +758,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
type_name = type_name_dest;
}
}
std::string getter = dest_cast + GenGetter(lang, field.value.type);
std::string getter = dest_cast + GenGetter(lang, parser, field.value.type);
code += method_start;
std::string default_cast = "";
// only create default casts for c# scalars or vectors of scalars
@@ -754,7 +783,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
} else {
code += offset_prefix + getter;
code += "(o + bb_pos)" + dest_mask + " : " + default_cast;
code += GenDefaultValue(lang, field.value);
code += GenDefaultValue(lang, parser, field.value);
}
} else {
switch (field.value.type.base_type) {
@@ -846,7 +875,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
auto mutator_prefix = MakeCamel("mutate", lang.first_camel_upper);
//a vector mutator also needs the index of the vector element it should mutate
auto mutator_params = (field.value.type.base_type == BASE_TYPE_VECTOR ? "(int j, " : "(") +
GenTypeNameDest(lang, underlying_type) + " " +
GenTypeNameDest(lang, parser, underlying_type) + " " +
field.name + ") { ";
auto setter_index = field.value.type.base_type == BASE_TYPE_VECTOR
? "__vector(o) + j * " + NumToString(InlineSize(underlying_type))
@@ -859,11 +888,11 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
code += mutator_prefix + MakeCamel(field.name, true);
code += mutator_params;
if (struct_def.fixed) {
code += GenSetter(lang, underlying_type) + "(" + setter_index + ", ";
code += GenSetter(lang, parser, underlying_type) + "(" + setter_index + ", ";
code += src_cast + setter_parameter + "); }\n";
} else {
code += "int o = __offset(" + NumToString(field.value.offset) + ");";
code += " if (o != 0) { " + GenSetter(lang, underlying_type);
code += " if (o != 0) { " + GenSetter(lang, parser, underlying_type);
code += "(" + setter_index + ", " + src_cast + setter_parameter + "); return true; } else { return false; } }\n";
}
}
@@ -872,14 +901,14 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
code += "\n";
if (struct_def.fixed) {
// create a struct constructor function
code += " public static " + GenOffsetType(lang, struct_def) + " ";
code += " public static " + GenOffsetType(lang, parser, struct_def) + " ";
code += FunctionStart(lang, 'C') + "reate";
code += struct_def.name + "(FlatBufferBuilder builder";
GenStructArgs(lang, struct_def, code_ptr, "");
GenStructArgs(lang, parser, struct_def, code_ptr, "");
code += ") {\n";
GenStructBody(lang, struct_def, code_ptr, "");
GenStructBody(lang, parser, struct_def, code_ptr, "");
code += " return ";
code += GenOffsetConstruct(lang, struct_def, "builder." + std::string(lang.get_fbb_offset));
code += GenOffsetConstruct(lang, parser, struct_def, "builder." + std::string(lang.get_fbb_offset));
code += ";\n }\n";
} else {
// Generate a method that creates a table in one go. This is only possible
@@ -900,7 +929,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
if (has_no_struct_fields && num_fields) {
// Generate a table constructor of the form:
// public static int createName(FlatBufferBuilder builder, args...)
code += " public static " + GenOffsetType(lang, struct_def) + " ";
code += " public static " + GenOffsetType(lang, parser, struct_def) + " ";
code += FunctionStart(lang, 'C') + "reate" + struct_def.name;
code += "(FlatBufferBuilder builder";
for (auto it = struct_def.fields.vec.begin();
@@ -908,7 +937,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
auto &field = **it;
if (field.deprecated) continue;
code += ",\n ";
code += GenTypeBasic(lang, DestinationType(lang, field.value.type, false));
code += GenTypeBasic(lang, parser, DestinationType(lang, parser, field.value.type, false));
code += " ";
code += field.name;
if (!IsScalar(field.value.type.base_type)) code += "Offset";
@@ -917,7 +946,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
// supply all arguments, and thus won't compile when fields are added.
if (lang.language != IDLOptions::kJava) {
code += " = ";
code += GenDefaultValueBasic(lang, field.value);
code += GenDefaultValueBasic(lang, parser, field.value);
}
}
code += ") {\n builder.";
@@ -961,18 +990,18 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
code += " public static void " + FunctionStart(lang, 'A') + "dd";
code += MakeCamel(field.name);
code += "(FlatBufferBuilder builder, ";
code += GenTypeBasic(lang, DestinationType(lang, field.value.type, false));
code += GenTypeBasic(lang, parser, DestinationType(lang, parser, field.value.type, false));
auto argname = MakeCamel(field.name, false);
if (!IsScalar(field.value.type.base_type)) argname += "Offset";
code += " " + argname + ") { builder." + FunctionStart(lang, 'A') + "dd";
code += GenMethod(lang, field.value.type) + "(";
code += GenMethod(lang, parser, field.value.type) + "(";
code += NumToString(it - struct_def.fields.vec.begin()) + ", ";
code += SourceCastBasic(lang, field.value.type);
code += SourceCastBasic(lang, parser, field.value.type);
code += argname;
if(!IsScalar(field.value.type.base_type) && field.value.type.base_type != BASE_TYPE_UNION && lang.language == IDLOptions::kCSharp) {
code += ".Value";
}
code += ", " + GenDefaultValue(lang, field.value, false);
code += ", " + GenDefaultValue(lang, parser, field.value, false);
code += "); }\n";
if (field.value.type.base_type == BASE_TYPE_VECTOR) {
auto vector_type = field.value.type.VectorType();
@@ -983,7 +1012,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
code += " public static " + GenVectorOffsetType(lang) + " " + FunctionStart(lang, 'C') + "reate";
code += MakeCamel(field.name);
code += "Vector(FlatBufferBuilder builder, ";
code += GenTypeBasic(lang, vector_type) + "[] data) ";
code += GenTypeBasic(lang, parser, vector_type) + "[] data) ";
code += "{ builder." + FunctionStart(lang, 'S') + "tartVector(";
code += NumToString(elem_size);
code += ", data." + FunctionStart(lang, 'L') + "ength, ";
@@ -991,9 +1020,9 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
code += "); for (int i = data.";
code += FunctionStart(lang, 'L') + "ength - 1; i >= 0; i--) builder.";
code += FunctionStart(lang, 'A') + "dd";
code += GenMethod(lang, vector_type);
code += GenMethod(lang, parser, vector_type);
code += "(";
code += SourceCastBasic(lang, vector_type, false);
code += SourceCastBasic(lang, parser, vector_type, false);
code += "data[i]";
if (lang.language == IDLOptions::kCSharp &&
(vector_type.base_type == BASE_TYPE_STRUCT || vector_type.base_type == BASE_TYPE_STRING))
@@ -1011,7 +1040,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
code += "); }\n";
}
}
code += " public static " + GenOffsetType(lang, struct_def) + " ";
code += " public static " + GenOffsetType(lang, parser, struct_def) + " ";
code += FunctionStart(lang, 'E') + "nd" + struct_def.name;
code += "(FlatBufferBuilder builder) {\n int o = builder.";
code += FunctionStart(lang, 'E') + "ndObject();\n";
@@ -1025,11 +1054,11 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
code += "); // " + field.name + "\n";
}
}
code += " return " + GenOffsetConstruct(lang, struct_def, "o") + ";\n }\n";
code += " return " + GenOffsetConstruct(lang, parser, struct_def, "o") + ";\n }\n";
if (parser.root_struct_def_ == &struct_def) {
code += " public static void ";
code += FunctionStart(lang, 'F') + "inish" + struct_def.name;
code += "Buffer(FlatBufferBuilder builder, " + GenOffsetType(lang, struct_def) + " offset) {";
code += "Buffer(FlatBufferBuilder builder, " + GenOffsetType(lang, parser, struct_def) + " offset) {";
code += " builder." + FunctionStart(lang, 'F') + "inish(offset";
if (lang.language == IDLOptions::kCSharp) {
code += ".Value";
@@ -1088,7 +1117,7 @@ bool GenerateGeneral(const Parser &parser,
for (auto it = parser.enums_.vec.begin();
it != parser.enums_.vec.end(); ++it) {
std::string enumcode;
GenEnum(lang, **it, &enumcode);
GenEnum(lang, parser, **it, &enumcode);
if (parser.opts.one_file) {
one_file_code += enumcode;
}