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

Update idl_gen_general.cpp

Browse Source 
There is a bug in creating a C# table when it includes a field of type 'BOOL'. The problem is that the generate C# code is as follows:
  "bool SampleValue = 0;"
This will fail to compile, because in C# this fails, it needs to be generated as:
 "bool SampleValue = false;"

The error is in line ~510

Change-Id: I77f6eea0f269b0540dbeb462602fc447cb69237d
This commit is contained in:
reynolma2
2015-03-09 11:35:18 -07:00
committed by Wouter van Oortmerssen
parent 6a0126340a
commit 6df9e1c537
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/idl_gen_general.cpp
View File

@@ -167,6 +167,12 @@ static std::string GenTypeGet(const LanguageParameters &lang,
: GenTypePointer(lang, type); : GenTypePointer(lang, type);
} }
static std::string GenDefaultValue(const Value &value) {
return value.type.base_type == BASE_TYPE_BOOL
? (value.constant == "0" ? "false" : "true")
: value.constant;
}
static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def, static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def,
std::string *code_ptr) { std::string *code_ptr) {
std::string &code = *code_ptr; std::string &code = *code_ptr;
@@ -392,9 +398,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
} else { } else {
code += offset_prefix + getter; code += offset_prefix + getter;
code += "(o + bb_pos) : " + default_cast; code += "(o + bb_pos) : " + default_cast;
code += field.value.type.base_type == BASE_TYPE_BOOL code += GenDefaultValue(field.value);
? (field.value.constant == "0" ? "false" : "true")
: field.value.constant;
} }
} else { } else {
switch (field.value.type.base_type) { switch (field.value.type.base_type) {
@@ -506,8 +510,9 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
code += field.name; code += field.name;
// Java doesn't have defaults, which means this method must always // Java doesn't have defaults, which means this method must always
// supply all arguments, and thus won't compile when fields are added. // supply all arguments, and thus won't compile when fields are added.
if (lang.language != GeneratorOptions::kJava) if (lang.language != GeneratorOptions::kJava) {
code += " = " + field.value.constant; code += " = " + GenDefaultValue(field.value);
}
} }
code += ") {\n builder."; code += ") {\n builder.";
code += FunctionStart(lang, 'S') + "tartObject("; code += FunctionStart(lang, 'S') + "tartObject(";
@@ -554,12 +559,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
code += " " + argname + ") { builder." + FunctionStart(lang, 'A') + "dd"; code += " " + argname + ") { builder." + FunctionStart(lang, 'A') + "dd";
code += GenMethod(lang, field.value.type) + "("; code += GenMethod(lang, field.value.type) + "(";
code += NumToString(it - struct_def.fields.vec.begin()) + ", "; code += NumToString(it - struct_def.fields.vec.begin()) + ", ";
code += argname + ", "; code += argname + ", " + GenDefaultValue(field.value);
if (field.value.type.base_type == BASE_TYPE_BOOL) {
code += field.value.constant == "0" ? "false" : "true";
} else {
code += field.value.constant;
}
code += "); }\n"; code += "); }\n";
if (field.value.type.base_type == BASE_TYPE_VECTOR) { if (field.value.type.base_type == BASE_TYPE_VECTOR) {
auto vector_type = field.value.type.VectorType(); auto vector_type = field.value.type.VectorType();