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

Misc fixes from internal integration / clang tidy.

Browse Source 
Change-Id: Ic5e8f6a423b426abb9f8b90d39db0f85f28b94be
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2018-02-08 14:56:16 -08:00
parent 6a1acdc23b
commit b513db86c7
7 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/idl_parser.cpp
View File

@@ -161,7 +161,7 @@ inline CheckedError atot<Offset<void>>(const char *s, Parser &parser,
std::string Namespace::GetFullyQualifiedName(const std::string &name,
size_t max_components) const {
// Early exit if we don't have a defined namespace.
if (components.size() == 0 || !max_components) { return name; }
if (components.empty() || !max_components) { return name; }
std::stringstream stream;
for (size_t i = 0; i < std::min(components.size(), max_components); i++) {
if (i) { stream << "."; }
@@ -648,10 +648,11 @@ CheckedError Parser::ParseField(StructDef &struct_def) {
if (token_ == '=') {
NEXT();
if (!IsScalar(type.base_type) || struct_def.fixed)
ECHECK(ParseSingleValue(field->value));
if (!IsScalar(type.base_type) ||
(struct_def.fixed && field->value.constant != "0"))
return Error(
"default values currently only supported for scalars in tables");
ECHECK(ParseSingleValue(field->value));
}
if (type.enum_def &&
!type.enum_def->is_union &&
@@ -1492,7 +1493,7 @@ CheckedError Parser::ParseEnum(bool is_union, EnumDef **dest) {
}
auto prevsize = enum_def.vals.vec.size();
auto value =
enum_def.vals.vec.size() ? enum_def.vals.vec.back()->value + 1 : 0;
!enum_def.vals.vec.empty() ? enum_def.vals.vec.back()->value + 1 : 0;
auto &ev = *new EnumVal(value_name, value);
if (enum_def.vals.Add(value_name, &ev))
return Error("enum value already exists: " + value_name);