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

Fixes for JS generator in Xcode

Browse Source
This commit is contained in:
Wouter van Oortmerssen
2015-10-19 16:05:39 -07:00
parent 1917e577a2
commit ace304513f
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/idl_gen_text.cpp
View File

@@ -62,7 +62,7 @@ template<typename T> void Print(T val, Type type, int /*indent*/,
}
if (type.base_type == BASE_TYPE_BOOL) {
text += val ? "true" : "false";
text += val != 0 ? "true" : "false";
} else {
text += NumToString(val);
}

10
src/idl_parser.cpp
View File

@@ -1046,14 +1046,14 @@ void Parser::ParseDecl() {
BaseType basetype) {
auto len = strlen(suffix);
for (auto it = fields.begin(); it != fields.end(); ++it) {
auto &name = (*it)->name;
if (name.length() > len &&
name.compare(name.length() - len, len, suffix) == 0 &&
auto &fname = (*it)->name;
if (fname.length() > len &&
fname.compare(fname.length() - len, len, suffix) == 0 &&
(*it)->value.type.base_type != BASE_TYPE_UTYPE) {
auto field = struct_def.fields.Lookup(
name.substr(0, name.length() - len));
fname.substr(0, fname.length() - len));
if (field && field->value.type.base_type == basetype)
Error("Field " + name +
Error("Field " + fname +
" would clash with generated functions for field " +
field->name);
}