Made all C++ files clang-formatted.

Also added missing generated files.

Change-Id: Ifd22a643a08e3f2edfce92812ed57b87fc0e1875

.clang-format

@@ -3,5 +3,11 @@ Language:        Cpp
 BasedOnStyle: Google
 DerivePointerAlignment: false
 PointerAlignment: Right
+IndentPPDirectives: AfterHash
+Cpp11BracedListStyle: false
+AlwaysBreakTemplateDeclarations: false
+AllowShortCaseLabelsOnASingleLine: true
+SpaceAfterTemplateKeyword: false
+AllowShortBlocksOnASingleLine: true
 ...
 

grpc/src/compiler/schema_interface.h

@@ -40,8 +40,8 @@
 #include <vector>
 
 #ifndef GRPC_CUSTOM_STRING
-#include <string>
+#  include <string>
-#define GRPC_CUSTOM_STRING std::string
+#  define GRPC_CUSTOM_STRING std::string
 #endif
 
 namespace grpc {

grpc/tests/grpctest.cpp

@@ -18,41 +18,43 @@
 
 #include <grpc++/grpc++.h>
 
-#include "monster_test_generated.h"
 #include "monster_test.grpc.fb.h"
+#include "monster_test_generated.h"
 
 using namespace MyGame::Example;
 
 // The callback implementation of our server, that derives from the generated
 // code. It implements all rpcs specified in the FlatBuffers schema.
 class ServiceImpl final : public MyGame::Example::MonsterStorage::Service {
-  virtual ::grpc::Status Store(::grpc::ServerContext* context,
+  virtual ::grpc::Status Store(
+      ::grpc::ServerContext *context,
       const flatbuffers::grpc::Message<Monster> *request,
-                               flatbuffers::grpc::Message<Stat> *response)
+      flatbuffers::grpc::Message<Stat> *response) override {
-                               override {
     // Create a response from the incoming request name.
     fbb_.Clear();
-    auto stat_offset = CreateStat(fbb_, fbb_.CreateString("Hello, " +
+    auto stat_offset = CreateStat(
-                                        request->GetRoot()->name()->str()));
+        fbb_, fbb_.CreateString("Hello, " + request->GetRoot()->name()->str()));
     fbb_.Finish(stat_offset);
     // Transfer ownership of the message to gRPC
     *response = fbb_.ReleaseMessage<Stat>();
     return grpc::Status::OK;
   }
-  virtual ::grpc::Status Retrieve(::grpc::ServerContext *context,
+  virtual ::grpc::Status Retrieve(
+      ::grpc::ServerContext *context,
       const flatbuffers::grpc::Message<Stat> *request,
-                               ::grpc::ServerWriter< flatbuffers::grpc::Message<Monster>>* writer)
+      ::grpc::ServerWriter<flatbuffers::grpc::Message<Monster>> *writer)
       override {
-
+    for (int i = 0; i < 10; i++) {
-    for (int i=0; i<10; i++) {
       fbb_.Clear();
       // Create 10 monsters for resposne.
       auto monster_offset =
-       CreateMonster(fbb_, 0, 0, 0, fbb_.CreateString(
+          CreateMonster(fbb_, 0, 0, 0,
-         request->GetRoot()->id()->str() + " No." + std::to_string(i)));
+                        fbb_.CreateString(request->GetRoot()->id()->str() +
+                                          " No." + std::to_string(i)));
       fbb_.Finish(monster_offset);
 
-       flatbuffers::grpc::Message<Monster> monster = fbb_.ReleaseMessage<Monster>();
+      flatbuffers::grpc::Message<Monster> monster =
+          fbb_.ReleaseMessage<Monster>();
 
       // Send monster to client using streaming.
       writer->Write(monster);
@@ -90,7 +92,7 @@ void RunServer() {
   server_instance->Wait();
 }
 
-int main(int /*argc*/, const char * /*argv*/[]) {
+int main(int /*argc*/, const char * /*argv*/ []) {
   // Launch server.
   std::thread server_thread(RunServer);
 
@@ -103,7 +105,6 @@ int main(int /*argc*/, const char * /*argv*/[]) {
                                      grpc::InsecureChannelCredentials());
   auto stub = MyGame::Example::MonsterStorage::NewStub(channel);
 
-
   flatbuffers::grpc::MessageBuilder fbb;
   {
     grpc::ClientContext context;
@@ -138,7 +139,7 @@ int main(int /*argc*/, const char * /*argv*/[]) {
     }
   }
 
-  #if !FLATBUFFERS_GRPC_DISABLE_AUTO_VERIFICATION
+#if !FLATBUFFERS_GRPC_DISABLE_AUTO_VERIFICATION
   {
     // Test that an invalid request errors out correctly
     grpc::ClientContext context;
@@ -149,9 +150,10 @@ int main(int /*argc*/, const char * /*argv*/[]) {
     // matches the protobuf gRPC status code for an unparseable message.
     assert(!status.ok());
     assert(status.error_code() == ::grpc::StatusCode::INTERNAL);
-    assert(strcmp(status.error_message().c_str(), "Message verification failed") == 0);
+    assert(strcmp(status.error_message().c_str(),
+                  "Message verification failed") == 0);
   }
-  #endif
+#endif
 
   server_instance->Shutdown();
 

include/flatbuffers/base.h

@@ -1,6 +1,7 @@
 #ifndef FLATBUFFERS_BASE_H_
 #define FLATBUFFERS_BASE_H_
 
+// clang-format off
 #if defined(FLATBUFFERS_MEMORY_LEAK_TRACKING) && \
     defined(_MSC_VER) && defined(_DEBUG)
   #define _CRTDBG_MAP_ALLOC

include/flatbuffers/code_generators.h

@@ -49,7 +49,7 @@ class CodeWriter {
   // Associates a key with a value.  All subsequent calls to operator+=, where
   // the specified key is contained in {{ and }} delimiters will be replaced by
   // the given value.
-  void SetValue(const std::string& key, const std::string& value) {
+  void SetValue(const std::string &key, const std::string &value) {
     value_map_[key] = value;
   }
 
@@ -71,8 +71,7 @@ class BaseGenerator {
  public:
   virtual bool generate() = 0;
 
-  static std::string NamespaceDir(const Parser &parser,
+  static std::string NamespaceDir(const Parser &parser, const std::string &path,
-                                  const std::string &path,
                                   const Namespace &ns);
 
  protected:
@@ -128,8 +127,7 @@ struct CommentConfig {
 };
 
 extern void GenComment(const std::vector<std::string> &dc,
-                       std::string *code_ptr,
+                       std::string *code_ptr, const CommentConfig *config,
-                       const CommentConfig *config,
                        const char *prefix = "");
 
 }  // namespace flatbuffers

include/flatbuffers/flatc.h

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include "flatbuffers/flatbuffers.h"
-#include "flatbuffers/idl.h"
-#include "flatbuffers/util.h"
 #include <functional>
 #include <limits>
 #include <string>
+#include "flatbuffers/flatbuffers.h"
+#include "flatbuffers/idl.h"
+#include "flatbuffers/util.h"
 
 #ifndef FLATC_H_
-#define FLATC_H_
+#  define FLATC_H_
 
 namespace flatbuffers {
 
@@ -49,12 +49,10 @@ class FlatCompiler {
     MakeRuleFn make_rule;
   };
 
-  typedef void (*WarnFn)(const FlatCompiler *flatc,
+  typedef void (*WarnFn)(const FlatCompiler *flatc, const std::string &warn,
-                         const std::string &warn,
                          bool show_exe_name);
 
-  typedef void (*ErrorFn)(const FlatCompiler *flatc,
+  typedef void (*ErrorFn)(const FlatCompiler *flatc, const std::string &err,
-                          const std::string &err,
                           bool usage, bool show_exe_name);
 
   // Parameters required to initialize the FlatCompiler.
@@ -65,21 +63,20 @@ class FlatCompiler {
           warn_fn(nullptr),
           error_fn(nullptr) {}
 
-    const Generator* generators;
+    const Generator *generators;
     size_t num_generators;
     WarnFn warn_fn;
     ErrorFn error_fn;
   };
 
-  explicit FlatCompiler(const InitParams& params) : params_(params) {}
+  explicit FlatCompiler(const InitParams &params) : params_(params) {}
 
-  int Compile(int argc, const char** argv);
+  int Compile(int argc, const char **argv);
 
-  std::string GetUsageString(const char* program_name) const;
+  std::string GetUsageString(const char *program_name) const;
 
  private:
-  void ParseFile(flatbuffers::Parser &parser,
+  void ParseFile(flatbuffers::Parser &parser, const std::string &filename,
-                 const std::string &filename,
                  const std::string &contents,
                  std::vector<const char *> &include_directories) const;
 
@@ -91,7 +88,6 @@ class FlatCompiler {
   InitParams params_;
 };
 
-
 }  // namespace flatbuffers
 
 #endif  // FLATC_H_

include/flatbuffers/flexbuffers.h

@@ -24,12 +24,12 @@
 #include "flatbuffers/util.h"
 
 #ifdef _MSC_VER
-#include <intrin.h>
+#  include <intrin.h>
 #endif
 
 #if defined(_MSC_VER)
-#pragma warning(push)
+#  pragma warning(push)
-#pragma warning(disable: 4127) // C4127: conditional expression is constant
+#  pragma warning(disable : 4127)  // C4127: conditional expression is constant
 #endif
 
 namespace flexbuffers {
@@ -77,7 +77,8 @@ enum Type {
   TYPE_VECTOR_FLOAT4 = 24,
   TYPE_BLOB = 25,
   TYPE_BOOL = 26,
-  TYPE_VECTOR_BOOL = 36, // To Allow the same type of conversion of type to vector type
+  TYPE_VECTOR_BOOL =
+      36,  // To Allow the same type of conversion of type to vector type
 };
 
 inline bool IsInline(Type t) { return t <= TYPE_FLOAT || t == TYPE_BOOL; }
@@ -87,7 +88,8 @@ inline bool IsTypedVectorElementType(Type t) {
 }
 
 inline bool IsTypedVector(Type t) {
-  return (t >= TYPE_VECTOR_INT && t <= TYPE_VECTOR_STRING) || t == TYPE_VECTOR_BOOL;
+  return (t >= TYPE_VECTOR_INT && t <= TYPE_VECTOR_STRING) ||
+         t == TYPE_VECTOR_BOOL;
 }
 
 inline bool IsFixedTypedVector(Type t) {
@@ -113,7 +115,8 @@ inline Type ToTypedVectorElementType(Type t) {
 inline Type ToFixedTypedVectorElementType(Type t, uint8_t *len) {
   assert(IsFixedTypedVector(t));
   auto fixed_type = t - TYPE_VECTOR_INT2;
-  *len = static_cast<uint8_t>(fixed_type / 3 + 2);  // 3 types each, starting from length 2.
+  *len = static_cast<uint8_t>(fixed_type / 3 +
+                              2);  // 3 types each, starting from length 2.
   return static_cast<Type>(fixed_type % 3 + TYPE_INT);
 }
 
@@ -127,19 +130,20 @@ typedef int8_t quarter;
 // decently quick, but it is the most frequently executed function.
 // We could do an (unaligned) 64-bit read if we ifdef out the platforms for
 // which that doesn't work (or where we'd read into un-owned memory).
-template <typename R, typename T1, typename T2, typename T4, typename T8>
+template<typename R, typename T1, typename T2, typename T4, typename T8>
 R ReadSizedScalar(const uint8_t *data, uint8_t byte_width) {
   return byte_width < 4
-    ? (byte_width < 2 ? static_cast<R>(flatbuffers::ReadScalar<T1>(data))
+             ? (byte_width < 2
+                    ? static_cast<R>(flatbuffers::ReadScalar<T1>(data))
                     : static_cast<R>(flatbuffers::ReadScalar<T2>(data)))
-    : (byte_width < 8 ? static_cast<R>(flatbuffers::ReadScalar<T4>(data))
+             : (byte_width < 8
+                    ? static_cast<R>(flatbuffers::ReadScalar<T4>(data))
                     : static_cast<R>(flatbuffers::ReadScalar<T8>(data)));
 }
 
-
 inline int64_t ReadInt64(const uint8_t *data, uint8_t byte_width) {
-  return ReadSizedScalar<int64_t, int8_t, int16_t, int32_t, int64_t>(data,
+  return ReadSizedScalar<int64_t, int8_t, int16_t, int32_t, int64_t>(
-           byte_width);
+      data, byte_width);
 }
 
 inline uint64_t ReadUInt64(const uint8_t *data, uint8_t byte_width) {
@@ -148,6 +152,7 @@ inline uint64_t ReadUInt64(const uint8_t *data, uint8_t byte_width) {
   // TODO: GCC apparently replaces memcpy by a rep movsb, but only if count is a
   // constant, which here it isn't. Test if memcpy is still faster than
   // the conditionals in ReadSizedScalar. Can also use inline asm.
+  // clang-format off
   #ifdef _MSC_VER
     uint64_t u = 0;
     __movsb(reinterpret_cast<uint8_t *>(&u),
@@ -157,6 +162,7 @@ inline uint64_t ReadUInt64(const uint8_t *data, uint8_t byte_width) {
     return ReadSizedScalar<uint64_t, uint8_t, uint16_t, uint32_t, uint64_t>(
              data, byte_width);
   #endif
+  // clang-format on
 }
 
 inline double ReadDouble(const uint8_t *data, uint8_t byte_width) {
@@ -173,13 +179,14 @@ template<typename T> const uint8_t *Indirect(const uint8_t *offset) {
 }
 
 inline BitWidth WidthU(uint64_t u) {
-  #define FLATBUFFERS_GET_FIELD_BIT_WIDTH(value, width) { \
+#define FLATBUFFERS_GET_FIELD_BIT_WIDTH(value, width)                   \
+  {                                                                     \
     if (!((u) & ~((1ULL << (width)) - 1ULL))) return BIT_WIDTH_##width; \
   }
   FLATBUFFERS_GET_FIELD_BIT_WIDTH(u, 8);
   FLATBUFFERS_GET_FIELD_BIT_WIDTH(u, 16);
   FLATBUFFERS_GET_FIELD_BIT_WIDTH(u, 32);
-  #undef FLATBUFFERS_GET_FIELD_BIT_WIDTH
+#undef FLATBUFFERS_GET_FIELD_BIT_WIDTH
   return BIT_WIDTH_64;
 }
 
@@ -216,15 +223,14 @@ class Sized : public Object {
 
 class String : public Sized {
  public:
-  String(const uint8_t *data, uint8_t byte_width)
+  String(const uint8_t *data, uint8_t byte_width) : Sized(data, byte_width) {}
-    : Sized(data, byte_width) {}
 
   size_t length() const { return size(); }
   const char *c_str() const { return reinterpret_cast<const char *>(data_); }
   std::string str() const { return std::string(c_str(), length()); }
 
   static String EmptyString() {
-    static const uint8_t empty_string[] = { 0/*len*/, 0/*terminator*/ };
+    static const uint8_t empty_string[] = { 0 /*len*/, 0 /*terminator*/ };
     return String(empty_string + 1, 1);
   }
   bool IsTheEmptyString() const { return data_ == EmptyString().data_; }
@@ -236,7 +242,7 @@ class Blob : public Sized {
       : Sized(data_buf, byte_width) {}
 
   static Blob EmptyBlob() {
-    static const uint8_t empty_blob[] = { 0/*len*/ };
+    static const uint8_t empty_blob[] = { 0 /*len*/ };
     return Blob(empty_blob + 1, 1);
   }
   bool IsTheEmptyBlob() const { return data_ == EmptyBlob().data_; }
@@ -245,13 +251,12 @@ class Blob : public Sized {
 
 class Vector : public Sized {
  public:
-  Vector(const uint8_t *data, uint8_t byte_width)
+  Vector(const uint8_t *data, uint8_t byte_width) : Sized(data, byte_width) {}
-    : Sized(data, byte_width) {}
 
   Reference operator[](size_t i) const;
 
   static Vector EmptyVector() {
-    static const uint8_t empty_vector[] = { 0/*len*/ };
+    static const uint8_t empty_vector[] = { 0 /*len*/ };
     return Vector(empty_vector + 1, 1);
   }
   bool IsTheEmptyVector() const { return data_ == EmptyVector().data_; }
@@ -265,7 +270,7 @@ class TypedVector : public Sized {
   Reference operator[](size_t i) const;
 
   static TypedVector EmptyTypedVector() {
-    static const uint8_t empty_typed_vector[] = { 0/*len*/ };
+    static const uint8_t empty_typed_vector[] = { 0 /*len*/ };
     return TypedVector(empty_typed_vector + 1, 1, TYPE_INT);
   }
   bool IsTheEmptyVector() const {
@@ -289,7 +294,7 @@ class FixedTypedVector : public Object {
   Reference operator[](size_t i) const;
 
   static FixedTypedVector EmptyFixedTypedVector() {
-    static const uint8_t fixed_empty_vector[] = { 0/* unused */ };
+    static const uint8_t fixed_empty_vector[] = { 0 /* unused */ };
     return FixedTypedVector(fixed_empty_vector, 1, TYPE_INT, 0);
   }
   bool IsTheEmptyFixedTypedVector() const {
@@ -306,8 +311,7 @@ class FixedTypedVector : public Object {
 
 class Map : public Vector {
  public:
-  Map(const uint8_t *data, uint8_t byte_width)
+  Map(const uint8_t *data, uint8_t byte_width) : Vector(data, byte_width) {}
-    : Vector(data, byte_width) {}
 
   Reference operator[](const char *key) const;
   Reference operator[](const std::string &key) const;
@@ -325,21 +329,21 @@ class Map : public Vector {
 
   static Map EmptyMap() {
     static const uint8_t empty_map[] = {
-      0/*keys_len*/, 0/*keys_offset*/, 1/*keys_width*/, 0/*len*/
+      0 /*keys_len*/, 0 /*keys_offset*/, 1 /*keys_width*/, 0 /*len*/
     };
     return Map(empty_map + 4, 1);
   }
 
-  bool IsTheEmptyMap() const {
+  bool IsTheEmptyMap() const { return data_ == EmptyMap().data_; }
-    return data_ == EmptyMap().data_;
-  }
 };
 
 class Reference {
  public:
   Reference(const uint8_t *data, uint8_t parent_width, uint8_t byte_width,
             Type type)
-    : data_(data), parent_width_(parent_width), byte_width_(byte_width),
+      : data_(data),
+        parent_width_(parent_width),
+        byte_width_(byte_width),
         type_(type) {}
 
   Reference(const uint8_t *data, uint8_t parent_width, uint8_t packed_type)
@@ -352,13 +356,14 @@ class Reference {
 
   bool IsNull() const { return type_ == TYPE_NULL; }
   bool IsBool() const { return type_ == TYPE_BOOL; }
-  bool IsInt() const { return type_ == TYPE_INT ||
+  bool IsInt() const { return type_ == TYPE_INT || type_ == TYPE_INDIRECT_INT; }
-                              type_ == TYPE_INDIRECT_INT; }
+  bool IsUInt() const {
-  bool IsUInt() const { return type_ == TYPE_UINT||
+    return type_ == TYPE_UINT || type_ == TYPE_INDIRECT_UINT;
-                               type_ == TYPE_INDIRECT_UINT;; }
+  }
   bool IsIntOrUint() const { return IsInt() || IsUInt(); }
-  bool IsFloat() const { return type_ == TYPE_FLOAT ||
+  bool IsFloat() const {
-                                type_ == TYPE_INDIRECT_FLOAT; }
+    return type_ == TYPE_FLOAT || type_ == TYPE_INDIRECT_FLOAT;
+  }
   bool IsNumeric() const { return IsIntOrUint() || IsFloat(); }
   bool IsString() const { return type_ == TYPE_STRING; }
   bool IsKey() const { return type_ == TYPE_KEY; }
@@ -367,7 +372,8 @@ class Reference {
   bool IsBlob() const { return type_ == TYPE_BLOB; }
 
   bool AsBool() const {
-    return (type_ == TYPE_BOOL ? ReadUInt64(data_, parent_width_) : AsUInt64()) != 0;
+    return (type_ == TYPE_BOOL ? ReadUInt64(data_, parent_width_)
+                               : AsUInt64()) != 0;
   }
 
   // Reads any type as a int64_t. Never fails, does most sensible conversion.
@@ -377,14 +383,15 @@ class Reference {
     if (type_ == TYPE_INT) {
       // A fast path for the common case.
       return ReadInt64(data_, parent_width_);
-    } else switch (type_) {
+    } else
+      switch (type_) {
         case TYPE_INDIRECT_INT: return ReadInt64(Indirect(), byte_width_);
         case TYPE_UINT: return ReadUInt64(data_, parent_width_);
         case TYPE_INDIRECT_UINT: return ReadUInt64(Indirect(), byte_width_);
-      case TYPE_FLOAT: return static_cast<int64_t>(
+        case TYPE_FLOAT:
-                                ReadDouble(data_, parent_width_));
+          return static_cast<int64_t>(ReadDouble(data_, parent_width_));
-      case TYPE_INDIRECT_FLOAT: return static_cast<int64_t>(
+        case TYPE_INDIRECT_FLOAT:
-                                         ReadDouble(Indirect(), byte_width_));
+          return static_cast<int64_t>(ReadDouble(Indirect(), byte_width_));
         case TYPE_NULL: return 0;
         case TYPE_STRING: return flatbuffers::StringToInt(AsString().c_str());
         case TYPE_VECTOR: return static_cast<int64_t>(AsVector().size());
@@ -399,20 +406,21 @@ class Reference {
   // extension ops in generated code, and use a faster op than ReadInt64.
   int32_t AsInt32() const { return static_cast<int32_t>(AsInt64()); }
   int16_t AsInt16() const { return static_cast<int16_t>(AsInt64()); }
-  int8_t  AsInt8()  const { return static_cast<int8_t> (AsInt64()); }
+  int8_t AsInt8() const { return static_cast<int8_t>(AsInt64()); }
 
   uint64_t AsUInt64() const {
     if (type_ == TYPE_UINT) {
       // A fast path for the common case.
       return ReadUInt64(data_, parent_width_);
-    } else switch (type_) {
+    } else
+      switch (type_) {
         case TYPE_INDIRECT_UINT: return ReadUInt64(Indirect(), byte_width_);
         case TYPE_INT: return ReadInt64(data_, parent_width_);
         case TYPE_INDIRECT_INT: return ReadInt64(Indirect(), byte_width_);
-      case TYPE_FLOAT: return static_cast<uint64_t>(
+        case TYPE_FLOAT:
-                                ReadDouble(data_, parent_width_));
+          return static_cast<uint64_t>(ReadDouble(data_, parent_width_));
-      case TYPE_INDIRECT_FLOAT: return static_cast<uint64_t>(
+        case TYPE_INDIRECT_FLOAT:
-                                  ReadDouble(Indirect(), byte_width_));
+          return static_cast<uint64_t>(ReadDouble(Indirect(), byte_width_));
         case TYPE_NULL: return 0;
         case TYPE_STRING: return flatbuffers::StringToUInt(AsString().c_str());
         case TYPE_VECTOR: return static_cast<uint64_t>(AsVector().size());
@@ -425,27 +433,28 @@ class Reference {
 
   uint32_t AsUInt32() const { return static_cast<uint32_t>(AsUInt64()); }
   uint16_t AsUInt16() const { return static_cast<uint16_t>(AsUInt64()); }
-  uint8_t  AsUInt8()  const { return static_cast<uint8_t> (AsUInt64()); }
+  uint8_t AsUInt8() const { return static_cast<uint8_t>(AsUInt64()); }
 
   double AsDouble() const {
     if (type_ == TYPE_FLOAT) {
       // A fast path for the common case.
       return ReadDouble(data_, parent_width_);
-    } else switch (type_) {
+    } else
+      switch (type_) {
         case TYPE_INDIRECT_FLOAT: return ReadDouble(Indirect(), byte_width_);
-      case TYPE_INT: return static_cast<double>(
+        case TYPE_INT:
-                              ReadInt64(data_, parent_width_));
+          return static_cast<double>(ReadInt64(data_, parent_width_));
-      case TYPE_UINT: return static_cast<double>(
+        case TYPE_UINT:
-                               ReadUInt64(data_, parent_width_));
+          return static_cast<double>(ReadUInt64(data_, parent_width_));
-      case TYPE_INDIRECT_INT: return static_cast<double>(
+        case TYPE_INDIRECT_INT:
-                                       ReadInt64(Indirect(), byte_width_));
+          return static_cast<double>(ReadInt64(Indirect(), byte_width_));
-      case TYPE_INDIRECT_UINT: return static_cast<double>(
+        case TYPE_INDIRECT_UINT:
-                                        ReadUInt64(Indirect(), byte_width_));
+          return static_cast<double>(ReadUInt64(Indirect(), byte_width_));
         case TYPE_NULL: return 0.0;
         case TYPE_STRING: return strtod(AsString().c_str(), nullptr);
         case TYPE_VECTOR: return static_cast<double>(AsVector().size());
-      case TYPE_BOOL: return static_cast<double>(
+        case TYPE_BOOL:
-                               ReadUInt64(data_, parent_width_));
+          return static_cast<double>(ReadUInt64(data_, parent_width_));
         default:
           // Convert strings and other things to float.
           return 0;
@@ -652,9 +661,7 @@ class Reference {
     memcpy(const_cast<char *>(s.c_str()), str, len);
     return true;
   }
-  bool MutateString(const char *str) {
+  bool MutateString(const char *str) { return MutateString(str, strlen(str)); }
-    return MutateString(str, strlen(str));
-  }
   bool MutateString(const std::string &str) {
     return MutateString(str.data(), str.length());
   }
@@ -664,9 +671,11 @@ class Reference {
     return flexbuffers::Indirect(data_, parent_width_);
   }
 
-  template<typename T> bool Mutate(const uint8_t *dest, T t, size_t byte_width,
+  template<typename T>
+  bool Mutate(const uint8_t *dest, T t, size_t byte_width,
               BitWidth value_width) {
-    auto fits = static_cast<size_t>(static_cast<size_t>(1U) << value_width) <= byte_width;
+    auto fits = static_cast<size_t>(static_cast<size_t>(1U) << value_width) <=
+                byte_width;
     if (fits) {
       t = flatbuffers::EndianScalar(t);
       memcpy(const_cast<uint8_t *>(dest), &t, byte_width);
@@ -674,7 +683,8 @@ class Reference {
     return fits;
   }
 
-  template<typename T> bool MutateF(const uint8_t *dest, T t, size_t byte_width,
+  template<typename T>
+  bool MutateF(const uint8_t *dest, T t, size_t byte_width,
                BitWidth value_width) {
     if (byte_width == sizeof(double))
       return Mutate(dest, static_cast<double>(t), byte_width, value_width);
@@ -707,21 +717,25 @@ template<> inline double Reference::As<double>() { return AsDouble(); }
 template<> inline float Reference::As<float>() { return AsFloat(); }
 
 template<> inline String Reference::As<String>() { return AsString(); }
-template<> inline std::string Reference::As<std::string>() { return AsString().str(); }
+template<> inline std::string Reference::As<std::string>() {
+  return AsString().str();
+}
 
 template<> inline Blob Reference::As<Blob>() { return AsBlob(); }
 template<> inline Vector Reference::As<Vector>() { return AsVector(); }
-template<> inline TypedVector Reference::As<TypedVector>() { return AsTypedVector(); }
+template<> inline TypedVector Reference::As<TypedVector>() {
-template<> inline FixedTypedVector Reference::As<FixedTypedVector>() { return AsFixedTypedVector(); }
+  return AsTypedVector();
+}
+template<> inline FixedTypedVector Reference::As<FixedTypedVector>() {
+  return AsFixedTypedVector();
+}
 template<> inline Map Reference::As<Map>() { return AsMap(); }
 
 inline uint8_t PackedType(BitWidth bit_width, Type type) {
   return static_cast<uint8_t>(bit_width | (type << 2));
 }
 
-inline uint8_t NullPackedType() {
+inline uint8_t NullPackedType() { return PackedType(BIT_WIDTH_8, TYPE_NULL); }
-  return PackedType(BIT_WIDTH_8, TYPE_NULL);
-}
 
 // Vector accessors.
 // Note: if you try to access outside of bounds, you get a Null value back
@@ -770,8 +784,7 @@ inline Reference Map::operator[](const char *key) const {
     case 8: comp = KeyCompare<uint64_t>; break;
   }
   auto res = std::bsearch(key, keys.data_, keys.size(), keys.byte_width_, comp);
-  if (!res)
+  if (!res) return Reference(nullptr, 1, NullPackedType());
-    return Reference(nullptr, 1, NullPackedType());
   auto i = (reinterpret_cast<uint8_t *>(res) - keys.data_) / keys.byte_width_;
   return (*static_cast<const Vector *>(this))[i];
 }
@@ -817,8 +830,11 @@ class Builder FLATBUFFERS_FINAL_CLASS {
  public:
   Builder(size_t initial_size = 256,
           BuilderFlag flags = BUILDER_FLAG_SHARE_KEYS)
-      : buf_(initial_size), finished_(false), flags_(flags),
+      : buf_(initial_size),
-        force_min_bit_width_(BIT_WIDTH_8), key_pool(KeyOffsetCompare(buf_)),
+        finished_(false),
+        flags_(flags),
+        force_min_bit_width_(BIT_WIDTH_8),
+        key_pool(KeyOffsetCompare(buf_)),
         string_pool(StringOffsetCompare(buf_)) {
     buf_.clear();
   }
@@ -831,9 +847,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
   }
 
   // Size of the buffer. Does not include unfinished values.
-  size_t GetSize() const {
+  size_t GetSize() const { return buf_.size(); }
-    return buf_.size();
-  }
 
   // Reset all state so we can re-use the buffer.
   void Clear() {
@@ -851,26 +865,42 @@ class Builder FLATBUFFERS_FINAL_CLASS {
   // vectors and elsewhere).
 
   void Null() { stack_.push_back(Value()); }
-  void Null(const char *key) { Key(key); Null(); }
+  void Null(const char *key) {
+    Key(key);
+    Null();
+  }
 
   void Int(int64_t i) { stack_.push_back(Value(i, TYPE_INT, WidthI(i))); }
-  void Int(const char *key, int64_t i) { Key(key); Int(i); }
+  void Int(const char *key, int64_t i) {
+    Key(key);
+    Int(i);
+  }
 
   void UInt(uint64_t u) { stack_.push_back(Value(u, TYPE_UINT, WidthU(u))); }
-  void UInt(const char *key, uint64_t u) { Key(key); Int(u); }
+  void UInt(const char *key, uint64_t u) {
+    Key(key);
+    Int(u);
+  }
 
   void Float(float f) { stack_.push_back(Value(f)); }
-  void Float(const char *key, float f) { Key(key); Float(f); }
+  void Float(const char *key, float f) {
+    Key(key);
+    Float(f);
+  }
 
   void Double(double f) { stack_.push_back(Value(f)); }
-  void Double(const char *key, double d) { Key(key); Double(d); }
+  void Double(const char *key, double d) {
+    Key(key);
+    Double(d);
+  }
 
   void Bool(bool b) { stack_.push_back(Value(b)); }
-  void Bool(const char *key, bool b) { Key(key); Bool(b); }
+  void Bool(const char *key, bool b) {
-
+    Key(key);
-  void IndirectInt(int64_t i) {
+    Bool(b);
-    PushIndirect(i, TYPE_INDIRECT_INT, WidthI(i));
   }
+
+  void IndirectInt(int64_t i) { PushIndirect(i, TYPE_INDIRECT_INT, WidthI(i)); }
   void IndirectInt(const char *key, int64_t i) {
     Key(key);
     IndirectInt(i);
@@ -939,9 +969,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     }
     return sloc;
   }
-  size_t String(const char *str) {
+  size_t String(const char *str) { return String(str, strlen(str)); }
-    return String(str, strlen(str));
-  }
   size_t String(const std::string &str) {
     return String(str.c_str(), str.size());
   }
@@ -974,9 +1002,15 @@ class Builder FLATBUFFERS_FINAL_CLASS {
   // Also some FlatBuffers types?
 
   size_t StartVector() { return stack_.size(); }
-  size_t StartVector(const char *key) { Key(key); return stack_.size(); }
+  size_t StartVector(const char *key) {
+    Key(key);
+    return stack_.size();
+  }
   size_t StartMap() { return stack_.size(); }
-  size_t StartMap(const char *key) { Key(key); return stack_.size(); }
+  size_t StartMap(const char *key) {
+    Key(key);
+    return stack_.size();
+  }
 
   // TODO(wvo): allow this to specify an aligment greater than the natural
   // alignment.
@@ -1000,7 +1034,10 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     }
     // Now sort values, so later we can do a binary seach lookup.
     // We want to sort 2 array elements at a time.
-    struct TwoValue { Value key; Value val; };
+    struct TwoValue {
+      Value key;
+      Value val;
+    };
     // TODO(wvo): strict aliasing?
     // TODO(wvo): allow the caller to indicate the data is already sorted
     // for maximum efficiency? With an assert to check sortedness to make sure
@@ -1011,8 +1048,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     // sorted fashion.
     // std::sort is typically already a lot faster on sorted data though.
     auto dict =
-        reinterpret_cast<TwoValue *>(flatbuffers::vector_data(stack_) +
+        reinterpret_cast<TwoValue *>(flatbuffers::vector_data(stack_) + start);
-                                     start);
     std::sort(dict, dict + len,
               [&](const TwoValue &a, const TwoValue &b) -> bool {
                 auto as = reinterpret_cast<const char *>(
@@ -1020,10 +1056,11 @@ class Builder FLATBUFFERS_FINAL_CLASS {
                 auto bs = reinterpret_cast<const char *>(
                     flatbuffers::vector_data(buf_) + b.key.u_);
                 auto comp = strcmp(as, bs);
-      // If this assertion hits, you've added two keys with the same value to
+                // If this assertion hits, you've added two keys with the same
-      // this map.
+                // value to this map.
-      // TODO: Have to check for pointer equality, as some sort implementation
+                // TODO: Have to check for pointer equality, as some sort
-      // apparently call this function with the same element?? Why?
+                // implementation apparently call this function with the same
+                // element?? Why?
                 assert(comp || &a == &b);
                 return comp < 0;
               });
@@ -1043,7 +1080,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     f();
     return EndVector(start, false, false);
   }
-  template <typename F, typename T> size_t Vector(F f, T &state) {
+  template<typename F, typename T> size_t Vector(F f, T &state) {
     auto start = StartVector();
     f(state);
     return EndVector(start, false, false);
@@ -1053,8 +1090,8 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     f();
     return EndVector(start, false, false);
   }
-  template <typename F, typename T> size_t Vector(const char *key, F f,
+  template<typename F, typename T>
-                                                  T &state) {
+  size_t Vector(const char *key, F f, T &state) {
     auto start = StartVector(key);
     f(state);
     return EndVector(start, false, false);
@@ -1070,8 +1107,8 @@ class Builder FLATBUFFERS_FINAL_CLASS {
       EndVector(start, false, false);
     }
   }
-  template<typename T> void Vector(const char *key, const T *elems,
+  template<typename T>
-                                   size_t len) {
+  void Vector(const char *key, const T *elems, size_t len) {
     Key(key);
     Vector(elems, len);
   }
@@ -1084,7 +1121,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     f();
     return EndVector(start, true, false);
   }
-  template <typename F, typename T> size_t TypedVector(F f, T &state) {
+  template<typename F, typename T> size_t TypedVector(F f, T &state) {
     auto start = StartVector();
     f(state);
     return EndVector(start, true, false);
@@ -1094,8 +1131,8 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     f();
     return EndVector(start, true, false);
   }
-  template <typename F, typename T> size_t TypedVector(const char *key, F f,
+  template<typename F, typename T>
-                                                       T &state) {
+  size_t TypedVector(const char *key, F f, T &state) {
     auto start = StartVector(key);
     f(state);
     return EndVector(start, true, false);
@@ -1110,8 +1147,8 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     return ScalarVector(elems, len, true);
   }
 
-  template<typename T> size_t FixedTypedVector(const char *key, const T *elems,
+  template<typename T>
-                                               size_t len) {
+  size_t FixedTypedVector(const char *key, const T *elems, size_t len) {
     Key(key);
     return FixedTypedVector(elems, len);
   }
@@ -1121,7 +1158,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     f();
     return EndMap(start);
   }
-  template <typename F, typename T> size_t Map(F f, T &state) {
+  template<typename F, typename T> size_t Map(F f, T &state) {
     auto start = StartMap();
     f(state);
     return EndMap(start);
@@ -1131,8 +1168,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     f();
     return EndMap(start);
   }
-  template <typename F, typename T> size_t Map(const char *key, F f,
+  template<typename F, typename T> size_t Map(const char *key, F f, T &state) {
-                                               T &state) {
     auto start = StartMap(key);
     f(state);
     return EndMap(start);
@@ -1160,9 +1196,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
   void Add(const std::string &str) { String(str); }
   void Add(const flexbuffers::String &str) { String(str); }
 
-  template<typename T> void Add(const std::vector<T> &vec) {
+  template<typename T> void Add(const std::vector<T> &vec) { Vector(vec); }
-    Vector(vec);
-  }
 
   template<typename T> void Add(const char *key, const T &t) {
     Key(key);
@@ -1173,9 +1207,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     Map(map);
   }
 
-  template<typename T> void operator+=(const T &t) {
+  template<typename T> void operator+=(const T &t) { Add(t); }
-    Add(t);
-  }
 
   // This function is useful in combination with the Mutate* functions above.
   // It forces elements of vectors and maps to have a minimum size, such that
@@ -1220,8 +1252,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
   }
 
   void WriteBytes(const void *val, size_t size) {
-    buf_.insert(buf_.end(),
+    buf_.insert(buf_.end(), reinterpret_cast<const uint8_t *>(val),
-                reinterpret_cast<const uint8_t *>(val),
                 reinterpret_cast<const uint8_t *>(val) + size);
   }
 
@@ -1235,8 +1266,8 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     switch (byte_width) {
       case 8: Write(f, byte_width); break;
       case 4: Write(static_cast<float>(f), byte_width); break;
-      //case 2: Write(static_cast<half>(f), byte_width); break;
+      // case 2: Write(static_cast<half>(f), byte_width); break;
-      //case 1: Write(static_cast<quarter>(f), byte_width); break;
+      // case 1: Write(static_cast<quarter>(f), byte_width); break;
       default: assert(0);
     }
   }
@@ -1268,8 +1299,10 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     assert(flatbuffers::is_scalar<T>::value);
     return flatbuffers::is_floating_point<T>::value
                ? TYPE_FLOAT
-        : flatbuffers::is_same<T, bool>::value ? TYPE_BOOL
+               : flatbuffers::is_same<T, bool>::value
-            : (flatbuffers::is_unsigned<T>::value ? TYPE_UINT : TYPE_INT);
+                     ? TYPE_BOOL
+                     : (flatbuffers::is_unsigned<T>::value ? TYPE_UINT
+                                                           : TYPE_INT);
   }
 
   struct Value {
@@ -1286,19 +1319,20 @@ class Builder FLATBUFFERS_FINAL_CLASS {
 
     Value() : i_(0), type_(TYPE_NULL), min_bit_width_(BIT_WIDTH_8) {}
 
-    Value(bool b) : u_(static_cast<uint64_t>(b)), type_(TYPE_BOOL), min_bit_width_(BIT_WIDTH_8) {}
+    Value(bool b)
+        : u_(static_cast<uint64_t>(b)),
+          type_(TYPE_BOOL),
+          min_bit_width_(BIT_WIDTH_8) {}
 
     Value(int64_t i, Type t, BitWidth bw)
         : i_(i), type_(t), min_bit_width_(bw) {}
     Value(uint64_t u, Type t, BitWidth bw)
         : u_(u), type_(t), min_bit_width_(bw) {}
 
-    Value(float f)
+    Value(float f) : f_(f), type_(TYPE_FLOAT), min_bit_width_(BIT_WIDTH_32) {}
-      : f_(f), type_(TYPE_FLOAT), min_bit_width_(BIT_WIDTH_32) {}
+    Value(double f) : f_(f), type_(TYPE_FLOAT), min_bit_width_(WidthF(f)) {}
-    Value(double f)
-      : f_(f), type_(TYPE_FLOAT), min_bit_width_(WidthF(f)) {}
 
-    uint8_t StoredPackedType(BitWidth parent_bit_width_= BIT_WIDTH_8) const {
+    uint8_t StoredPackedType(BitWidth parent_bit_width_ = BIT_WIDTH_8) const {
       return PackedType(StoredWidth(parent_bit_width_), type_);
     }
 
@@ -1315,15 +1349,15 @@ class Builder FLATBUFFERS_FINAL_CLASS {
              byte_width <= sizeof(flatbuffers::largest_scalar_t);
              byte_width *= 2) {
           // Where are we going to write this offset?
-          auto offset_loc =
+          auto offset_loc = buf_size +
-            buf_size +
                             flatbuffers::PaddingBytes(buf_size, byte_width) +
                             elem_index * byte_width;
           // Compute relative offset.
           auto offset = offset_loc - u_;
           // Does it fit?
           auto bit_width = WidthU(offset);
-          if (static_cast<size_t>(static_cast<size_t>(1U) << bit_width) == byte_width)
+          if (static_cast<size_t>(static_cast<size_t>(1U) << bit_width) ==
+              byte_width)
             return bit_width;
         }
         assert(false);  // Must match one of the sizes above.
@@ -1343,19 +1377,11 @@ class Builder FLATBUFFERS_FINAL_CLASS {
   void WriteAny(const Value &val, uint8_t byte_width) {
     switch (val.type_) {
       case TYPE_NULL:
-      case TYPE_INT:
+      case TYPE_INT: Write(val.i_, byte_width); break;
-        Write(val.i_, byte_width);
-        break;
       case TYPE_BOOL:
-      case TYPE_UINT:
+      case TYPE_UINT: Write(val.u_, byte_width); break;
-        Write(val.u_, byte_width);
+      case TYPE_FLOAT: WriteDouble(val.f_, byte_width); break;
-        break;
+      default: WriteOffset(val.u_, byte_width); break;
-      case TYPE_FLOAT:
-        WriteDouble(val.f_, byte_width);
-        break;
-      default:
-        WriteOffset(val.u_, byte_width);
-        break;
     }
   }
 
@@ -1369,8 +1395,8 @@ class Builder FLATBUFFERS_FINAL_CLASS {
     return sloc;
   }
 
-  template<typename T> size_t ScalarVector(const T *elems, size_t len,
+  template<typename T>
-                                           bool fixed) {
+  size_t ScalarVector(const T *elems, size_t len, bool fixed) {
     auto vector_type = GetScalarType<T>();
     auto byte_width = sizeof(T);
     auto bit_width = WidthB(byte_width);
@@ -1436,10 +1462,9 @@ class Builder FLATBUFFERS_FINAL_CLASS {
         buf_.push_back(stack_[i].StoredPackedType(bit_width));
       }
     }
-    return Value(static_cast<uint64_t>(vloc), keys
+    return Value(static_cast<uint64_t>(vloc),
-                         ? TYPE_MAP
+                 keys ? TYPE_MAP
-                         : (typed
+                      : (typed ? ToTypedVector(vector_type, fixed ? vec_len : 0)
-                            ? ToTypedVector(vector_type, fixed ? vec_len : 0)
                                : TYPE_VECTOR),
                  bit_width);
   }
@@ -1473,10 +1498,10 @@ class Builder FLATBUFFERS_FINAL_CLASS {
   struct StringOffsetCompare {
     StringOffsetCompare(const std::vector<uint8_t> &buf) : buf_(&buf) {}
     bool operator()(const StringOffset &a, const StringOffset &b) const {
-      auto stra = reinterpret_cast<const char *>(flatbuffers::vector_data(*buf_) +
+      auto stra = reinterpret_cast<const char *>(
-                                                 a.first);
+          flatbuffers::vector_data(*buf_) + a.first);
-      auto strb = reinterpret_cast<const char *>(flatbuffers::vector_data(*buf_) +
+      auto strb = reinterpret_cast<const char *>(
-                                                 b.first);
+          flatbuffers::vector_data(*buf_) + b.first);
       return strncmp(stra, strb, (std::min)(a.second, b.second) + 1) < 0;
     }
     const std::vector<uint8_t> *buf_;
@@ -1491,8 +1516,8 @@ class Builder FLATBUFFERS_FINAL_CLASS {
 
 }  // namespace flexbuffers
 
-#if defined(_MSC_VER)
+#  if defined(_MSC_VER)
-#pragma warning(pop)
+#    pragma warning(pop)
-#endif
+#  endif
 
 #endif  // FLATBUFFERS_FLEXBUFFERS_H_

include/flatbuffers/grpc.h

@@ -30,8 +30,7 @@ namespace grpc {
 // `grpc_slice` and also provides flatbuffers-specific helpers such as `Verify`
 // and `GetRoot`. Since it is backed by a `grpc_slice`, the underlying buffer
 // is refcounted and ownership is be managed automatically.
-template <class T>
+template<class T> class Message {
-class Message {
  public:
   Message() : slice_(grpc_empty_slice()) {}
 
@@ -137,7 +136,7 @@ namespace detail {
 struct SliceAllocatorMember {
   SliceAllocator slice_allocator_;
 };
-}
+}  // namespace detail
 
 // MessageBuilder is a gRPC-specific FlatBufferBuilder that uses SliceAllocator
 // to allocate gRPC buffers.
@@ -155,8 +154,7 @@ class MessageBuilder : private detail::SliceAllocatorMember,
   // GetMessage extracts the subslice of the buffer corresponding to the
   // flatbuffers-encoded region and wraps it in a `Message<T>` to handle buffer
   // ownership.
-  template <class T>
+  template<class T> Message<T> GetMessage() {
-  Message<T> GetMessage() {
     auto buf_data = buf_.buf();       // pointer to memory
     auto buf_size = buf_.capacity();  // size of memory
     auto msg_data = buf_.data();      // pointer to msg
@@ -178,8 +176,7 @@ class MessageBuilder : private detail::SliceAllocatorMember,
     return msg;
   }
 
-  template <class T>
+  template<class T> Message<T> ReleaseMessage() {
-  Message<T> ReleaseMessage() {
     Message<T> msg = GetMessage<T>();
     Reset();
     return msg;
@@ -194,8 +191,7 @@ class MessageBuilder : private detail::SliceAllocatorMember,
 
 namespace grpc {
 
-template <class T>
+template<class T> class SerializationTraits<flatbuffers::grpc::Message<T>> {
-class SerializationTraits<flatbuffers::grpc::Message<T>> {
  public:
   static grpc::Status Serialize(const flatbuffers::grpc::Message<T> &msg,
                                 grpc_byte_buffer **buffer, bool *own_buffer) {
@@ -237,19 +233,19 @@ class SerializationTraits<flatbuffers::grpc::Message<T>> {
       *msg = flatbuffers::grpc::Message<T>(slice, false);
     }
     grpc_byte_buffer_destroy(buffer);
-    #if FLATBUFFERS_GRPC_DISABLE_AUTO_VERIFICATION
+#if FLATBUFFERS_GRPC_DISABLE_AUTO_VERIFICATION
     return ::grpc::Status::OK;
-    #else
+#else
     if (msg->Verify()) {
       return ::grpc::Status::OK;
     } else {
       return ::grpc::Status(::grpc::StatusCode::INTERNAL,
                             "Message verification failed");
     }
-    #endif
+#endif
   }
 };
 
-}  // namespace grpc;
+}  // namespace grpc
 
 #endif  // FLATBUFFERS_GRPC_H_

include/flatbuffers/hash.h

@@ -24,26 +24,22 @@
 
 namespace flatbuffers {
 
-template <typename T>
+template<typename T> struct FnvTraits {
-struct FnvTraits {
   static const T kFnvPrime;
   static const T kOffsetBasis;
 };
 
-template <>
+template<> struct FnvTraits<uint32_t> {
-struct FnvTraits<uint32_t> {
   static const uint32_t kFnvPrime = 0x01000193;
   static const uint32_t kOffsetBasis = 0x811C9DC5;
 };
 
-template <>
+template<> struct FnvTraits<uint64_t> {
-struct FnvTraits<uint64_t> {
   static const uint64_t kFnvPrime = 0x00000100000001b3ULL;
   static const uint64_t kOffsetBasis = 0xcbf29ce484222645ULL;
 };
 
-template <typename T>
+template<typename T> T HashFnv1(const char *input) {
-T HashFnv1(const char *input) {
   T hash = FnvTraits<T>::kOffsetBasis;
   for (const char *c = input; *c; ++c) {
     hash *= FnvTraits<T>::kFnvPrime;
@@ -52,8 +48,7 @@ T HashFnv1(const char *input) {
   return hash;
 }
 
-template <typename T>
+template<typename T> T HashFnv1a(const char *input) {
-T HashFnv1a(const char *input) {
   T hash = FnvTraits<T>::kOffsetBasis;
   for (const char *c = input; *c; ++c) {
     hash ^= static_cast<unsigned char>(*c);
@@ -62,11 +57,10 @@ T HashFnv1a(const char *input) {
   return hash;
 }
 
-template <typename T>
+template<typename T> struct NamedHashFunction {
-struct NamedHashFunction {
   const char *name;
 
-  typedef T (*HashFunction)(const char*);
+  typedef T (*HashFunction)(const char *);
   HashFunction function;
 };
 

include/flatbuffers/idl.h

@@ -18,17 +18,17 @@
 #define FLATBUFFERS_IDL_H_
 
 #include <map>
-#include <stack>
 #include <memory>
+#include <stack>
 
 #include "flatbuffers/base.h"
 #include "flatbuffers/flatbuffers.h"
+#include "flatbuffers/flexbuffers.h"
 #include "flatbuffers/hash.h"
 #include "flatbuffers/reflection.h"
-#include "flatbuffers/flexbuffers.h"
 
 #if !defined(FLATBUFFERS_CPP98_STL)
-  #include <functional>
+#  include <functional>
 #endif  // !defined(FLATBUFFERS_CPP98_STL)
 
 // This file defines the data types representing a parsed IDL (Interface
@@ -39,6 +39,7 @@ namespace flatbuffers {
 // The order of these matters for Is*() functions below.
 // Additionally, Parser::ParseType assumes bool..string is a contiguous range
 // of type tokens.
+// clang-format off
 #define FLATBUFFERS_GEN_TYPES_SCALAR(TD) \
   TD(NONE,   "",       uint8_t,  byte,   byte,    byte,   uint8) \
   TD(UTYPE,  "",       uint8_t,  byte,   byte,    byte,   uint8) /* begin scalar/int */ \
@@ -110,13 +111,12 @@ inline bool IsFloat  (BaseType t) { return t == BASE_TYPE_FLOAT ||
 inline bool IsLong   (BaseType t) { return t == BASE_TYPE_LONG ||
                                            t == BASE_TYPE_ULONG; }
 inline bool IsBool   (BaseType t) { return t == BASE_TYPE_BOOL; }
+// clang-format on
 
 extern const char *const kTypeNames[];
 extern const char kTypeSizes[];
 
-inline size_t SizeOf(BaseType t) {
+inline size_t SizeOf(BaseType t) { return kTypeSizes[t]; }
-  return kTypeSizes[t];
-}
 
 struct StructDef;
 struct EnumDef;
@@ -125,13 +125,12 @@ class Parser;
 // Represents any type in the IDL, which is a combination of the BaseType
 // and additional information for vectors/structs_.
 struct Type {
-  explicit Type(BaseType _base_type = BASE_TYPE_NONE,
+  explicit Type(BaseType _base_type = BASE_TYPE_NONE, StructDef *_sd = nullptr,
-                StructDef *_sd = nullptr, EnumDef *_ed = nullptr)
+                EnumDef *_ed = nullptr)
       : base_type(_base_type),
         element(BASE_TYPE_NONE),
         struct_def(_sd),
-      enum_def(_ed)
+        enum_def(_ed) {}
-  {}
 
   bool operator==(const Type &o) {
     return base_type == o.base_type && element == o.element &&
@@ -151,8 +150,9 @@ struct Type {
 
 // Represents a parsed scalar value, it's type, and field offset.
 struct Value {
-  Value() : constant("0"), offset(static_cast<voffset_t>(
+  Value()
-                                ~(static_cast<voffset_t>(0U)))) {}
+      : constant("0"),
+        offset(static_cast<voffset_t>(~(static_cast<voffset_t>(0U)))) {}
   Type type;
   std::string constant;
   voffset_t offset;
@@ -163,9 +163,7 @@ struct Value {
 template<typename T> class SymbolTable {
  public:
   ~SymbolTable() {
-    for (auto it = vec.begin(); it != vec.end(); ++it) {
+    for (auto it = vec.begin(); it != vec.end(); ++it) { delete *it; }
-      delete *it;
-    }
   }
 
   bool Add(const std::string &name, T *e) {
@@ -201,7 +199,6 @@ template<typename T> class SymbolTable {
 struct Namespace {
   Namespace() : from_table(0) {}
 
-
   // Given a (potentally unqualified) name, return the "fully qualified" name
   // which has a full namespaced descriptor.
   // With max_components you can request less than the number of components
@@ -215,13 +212,16 @@ struct Namespace {
 
 // Base class for all definition types (fields, structs_, enums_).
 struct Definition {
-  Definition() : generated(false), defined_namespace(nullptr),
+  Definition()
-                 serialized_location(0), index(-1), refcount(1) {}
+      : generated(false),
+        defined_namespace(nullptr),
+        serialized_location(0),
+        index(-1),
+        refcount(1) {}
 
-  flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<
+  flatbuffers::Offset<
-    reflection::KeyValue>>>
+      flatbuffers::Vector<flatbuffers::Offset<reflection::KeyValue>>>
-      SerializeAttributes(FlatBufferBuilder *builder,
+  SerializeAttributes(FlatBufferBuilder *builder, const Parser &parser) const;
-                          const Parser &parser) const;
 
   std::string name;
   std::string file;
@@ -237,8 +237,13 @@ struct Definition {
 };
 
 struct FieldDef : public Definition {
-  FieldDef() : deprecated(false), required(false), key(false),
+  FieldDef()
-               native_inline(false), flexbuffer(false), nested_flatbuffer(NULL),
+      : deprecated(false),
+        required(false),
+        key(false),
+        native_inline(false),
+        flexbuffer(false),
+        nested_flatbuffer(NULL),
         padding(0) {}
 
   Offset<reflection::Field> Serialize(FlatBufferBuilder *builder, uint16_t id,
@@ -263,8 +268,7 @@ struct StructDef : public Definition {
         sortbysize(true),
         has_key(false),
         minalign(1),
-      bytesize(0)
+        bytesize(0) {}
-    {}
 
   void PadLastField(size_t min_align) {
     auto padding = PaddingBytes(bytesize, min_align);
@@ -300,8 +304,7 @@ inline size_t InlineAlignment(const Type &type) {
 }
 
 struct EnumVal {
-  EnumVal(const std::string &_name, int64_t _val)
+  EnumVal(const std::string &_name, int64_t _val) : name(_name), value(_val) {}
-    : name(_name), value(_val) {}
 
   Offset<reflection::EnumVal> Serialize(FlatBufferBuilder *builder) const;
 
@@ -315,12 +318,10 @@ struct EnumDef : public Definition {
   EnumDef() : is_union(false), uses_type_aliases(false) {}
 
   EnumVal *ReverseLookup(int enum_idx, bool skip_union_default = true) {
-    for (auto it = vals.vec.begin() + static_cast<int>(is_union &&
+    for (auto it = vals.vec.begin() +
-                                                       skip_union_default);
+                   static_cast<int>(is_union && skip_union_default);
          it != vals.vec.end(); ++it) {
-      if ((*it)->value == enum_idx) {
+      if ((*it)->value == enum_idx) { return *it; }
-        return *it;
-      }
     }
     return nullptr;
   }
@@ -338,8 +339,7 @@ inline bool EqualByName(const Type &a, const Type &b) {
   return a.base_type == b.base_type && a.element == b.element &&
          (a.struct_def == b.struct_def ||
           a.struct_def->name == b.struct_def->name) &&
-         (a.enum_def == b.enum_def ||
+         (a.enum_def == b.enum_def || a.enum_def->name == b.enum_def->name);
-          a.enum_def->name == b.enum_def->name);
 }
 
 struct RPCCall {
@@ -419,7 +419,9 @@ struct IDLOptions {
         use_goog_js_export_format(false),
         output_default_scalars_in_json(false),
         indent_step(2),
-      output_enum_identifiers(true), prefixed_enums(true), scoped_enums(false),
+        output_enum_identifiers(true),
+        prefixed_enums(true),
+        scoped_enums(false),
         include_dependence_headers(true),
         mutable_buffer(false),
         one_file(false),
@@ -481,7 +483,10 @@ class CheckedError {
 
   ~CheckedError() { assert(has_been_checked_); }
 
-  bool Check() { has_been_checked_ = true; return is_error_; }
+  bool Check() {
+    has_been_checked_ = true;
+    return is_error_;
+  }
 
  private:
   bool is_error_;
@@ -490,12 +495,14 @@ class CheckedError {
 
 // Additionally, in GCC we can get these errors statically, for additional
 // assurance:
+// clang-format off
 #ifdef __GNUC__
 #define FLATBUFFERS_CHECKED_ERROR CheckedError \
           __attribute__((warn_unused_result))
 #else
 #define FLATBUFFERS_CHECKED_ERROR CheckedError
 #endif
+// clang-format on
 
 class Parser : public ParserState {
  public:
@@ -581,7 +588,7 @@ class Parser : public ParserState {
 
   StructDef *LookupStruct(const std::string &id) const;
 
-private:
+ private:
   void Message(const std::string &msg);
   void Warning(const std::string &msg);
   FLATBUFFERS_CHECKED_ERROR Error(const std::string &msg);
@@ -606,6 +613,7 @@ private:
   FLATBUFFERS_CHECKED_ERROR ParseAnyValue(Value &val, FieldDef *field,
                                           size_t parent_fieldn,
                                           const StructDef *parent_struct_def);
+  // clang-format off
   #if defined(FLATBUFFERS_CPP98_STL)
     typedef CheckedError (*ParseTableDelimitersBody)(
         const std::string &name, size_t &fieldn, const StructDef *struct_def,
@@ -615,6 +623,7 @@ private:
                                        const StructDef*, void*)>
             ParseTableDelimitersBody;
   #endif  // defined(FLATBUFFERS_CPP98_STL)
+  // clang-format on
   FLATBUFFERS_CHECKED_ERROR ParseTableDelimiters(size_t &fieldn,
                                                  const StructDef *struct_def,
                                                  ParseTableDelimitersBody body,
@@ -623,6 +632,7 @@ private:
                                        std::string *value, uoffset_t *ovalue);
   void SerializeStruct(const StructDef &struct_def, const Value &val);
   void AddVector(bool sortbysize, int count);
+  // clang-format off
   #if defined(FLATBUFFERS_CPP98_STL)
     typedef CheckedError (*ParseVectorDelimitersBody)(size_t &count,
                                                       void *state);
@@ -630,6 +640,7 @@ private:
     typedef std::function<CheckedError(size_t&, void*)>
             ParseVectorDelimitersBody;
   #endif  // defined(FLATBUFFERS_CPP98_STL)
+  // clang-format on
   FLATBUFFERS_CHECKED_ERROR ParseVectorDelimiters(
       size_t &count, ParseVectorDelimitersBody body, void *state);
   FLATBUFFERS_CHECKED_ERROR ParseVector(const Type &type, uoffset_t *ovalue);

include/flatbuffers/minireflect.h

@@ -65,8 +65,7 @@ struct IterationVisitor {
   virtual void EndVector() {}
   virtual void Element(size_t /*i*/, ElementaryType /*type*/,
                        const TypeTable * /*type_table*/,
-                       const uint8_t * /*val*/)
+                       const uint8_t * /*val*/) {}
-  {}
   virtual ~IterationVisitor() {}
 };
 
@@ -75,34 +74,24 @@ inline size_t InlineSize(ElementaryType type, const TypeTable *type_table) {
     case ET_UTYPE:
     case ET_BOOL:
     case ET_CHAR:
-    case ET_UCHAR:
+    case ET_UCHAR: return 1;
-      return 1;
     case ET_SHORT:
-    case ET_USHORT:
+    case ET_USHORT: return 2;
-      return 2;
     case ET_INT:
     case ET_UINT:
     case ET_FLOAT:
-    case ET_STRING:
+    case ET_STRING: return 4;
-      return 4;
     case ET_LONG:
     case ET_ULONG:
-    case ET_DOUBLE:
+    case ET_DOUBLE: return 8;
-      return 8;
     case ET_SEQUENCE:
       switch (type_table->st) {
         case ST_TABLE:
-        case ST_UNION:
+        case ST_UNION: return 4;
-          return 4;
+        case ST_STRUCT: return type_table->values[type_table->num_elems];
-        case ST_STRUCT:
+        default: assert(false); return 1;
-          return type_table->values[type_table->num_elems];
-        default:
-          assert(false);
-          return 1;
       }
-    default:
+    default: assert(false); return 1;
-      assert(false);
-      return 1;
   }
 }
 
@@ -129,10 +118,8 @@ void IterateObject(const uint8_t *obj, const TypeTable *type_table,
                    IterationVisitor *visitor);
 
 inline void IterateValue(ElementaryType type, const uint8_t *val,
-                         const TypeTable *type_table,
+                         const TypeTable *type_table, const uint8_t *prev_val,
-                         const uint8_t *prev_val,
+                         soffset_t vector_index, IterationVisitor *visitor) {
-                         soffset_t vector_index,
-                         IterationVisitor *visitor) {
   switch (type) {
     case ET_UTYPE: {
       auto tval = *reinterpret_cast<const uint8_t *>(val);
@@ -200,9 +187,7 @@ inline void IterateValue(ElementaryType type, const uint8_t *val,
           val += ReadScalar<uoffset_t>(val);
           IterateObject(val, type_table, visitor);
           break;
-        case ST_STRUCT:
+        case ST_STRUCT: IterateObject(val, type_table, visitor); break;
-          IterateObject(val, type_table, visitor);
-          break;
         case ST_UNION: {
           val += ReadScalar<uoffset_t>(val);
           assert(prev_val);
@@ -211,10 +196,10 @@ inline void IterateValue(ElementaryType type, const uint8_t *val,
             auto type_vec = reinterpret_cast<const Vector<uint8_t> *>(prev_val);
             union_type = type_vec->Get(static_cast<uoffset_t>(vector_index));
           }
-          auto type_code_idx = LookupEnum(union_type, type_table->values,
+          auto type_code_idx =
-                                          type_table->num_elems);
+              LookupEnum(union_type, type_table->values, type_table->num_elems);
-          if (type_code_idx >= 0 && type_code_idx <
+          if (type_code_idx >= 0 &&
-              static_cast<int32_t>(type_table->num_elems)) {
+              type_code_idx < static_cast<int32_t>(type_table->num_elems)) {
             auto type_code = type_table->type_codes[type_code_idx];
             switch (type_code.base_type) {
               case ET_SEQUENCE: {
@@ -225,17 +210,14 @@ inline void IterateValue(ElementaryType type, const uint8_t *val,
               case ET_STRING:
                 visitor->String(reinterpret_cast<const String *>(val));
                 break;
-              default:
+              default: visitor->Unknown(val);
-                visitor->Unknown(val);
             }
           } else {
             visitor->Unknown(val);
           }
           break;
         }
-        case ST_ENUM:
+        case ST_ENUM: assert(false); break;
-          assert(false);
-          break;
       }
       break;
     }
@@ -257,9 +239,7 @@ inline void IterateObject(const uint8_t *obj, const TypeTable *type_table,
     auto is_vector = type_code.is_vector != 0;
     auto ref_idx = type_code.sequence_ref;
     const TypeTable *ref = nullptr;
-    if (ref_idx >= 0) {
+    if (ref_idx >= 0) { ref = type_table->type_refs[ref_idx](); }
-      ref = type_table->type_refs[ref_idx]();
-    }
     auto name = type_table->names ? type_table->names[i] : nullptr;
     const uint8_t *val = nullptr;
     if (type_table->st == ST_TABLE) {
@@ -310,24 +290,29 @@ struct ToStringVisitor : public IterationVisitor {
              const char *name, const uint8_t *val) {
     if (!val) return;
     if (set_idx) s += ", ";
-    if (name) { s += name; s += ": "; }
+    if (name) {
+      s += name;
+      s += ": ";
+    }
   }
   template<typename T> void Named(T x, const char *name) {
-    if (name) s+= name;
+    if (name)
-    else s+= NumToString(x);
+      s += name;
+    else
+      s += NumToString(x);
   }
   void UType(uint8_t x, const char *name) { Named(x, name); }
-  void Bool(bool x) { s+= x ? "true" : "false"; }
+  void Bool(bool x) { s += x ? "true" : "false"; }
   void Char(int8_t x, const char *name) { Named(x, name); }
   void UChar(uint8_t x, const char *name) { Named(x, name); }
   void Short(int16_t x, const char *name) { Named(x, name); }
   void UShort(uint16_t x, const char *name) { Named(x, name); }
   void Int(int32_t x, const char *name) { Named(x, name); }
   void UInt(uint32_t x, const char *name) { Named(x, name); }
-  void Long(int64_t x) { s+= NumToString(x); }
+  void Long(int64_t x) { s += NumToString(x); }
-  void ULong(uint64_t x) { s+= NumToString(x); }
+  void ULong(uint64_t x) { s += NumToString(x); }
-  void Float(float x) { s+= NumToString(x); }
+  void Float(float x) { s += NumToString(x); }
-  void Double(double x) { s+= NumToString(x); }
+  void Double(double x) { s += NumToString(x); }
   void String(const struct String *str) {
     EscapeString(str->c_str(), str->size(), &s, true);
   }

include/flatbuffers/reflection.h

@@ -30,14 +30,18 @@ namespace flatbuffers {
 
 // ------------------------- GETTERS -------------------------
 
-inline bool IsScalar (reflection::BaseType t) { return t >= reflection::UType &&
+inline bool IsScalar(reflection::BaseType t) {
-                                                       t <= reflection::Double; }
+  return t >= reflection::UType && t <= reflection::Double;
-inline bool IsInteger(reflection::BaseType t) { return t >= reflection::UType &&
+}
-                                                       t <= reflection::ULong; }
+inline bool IsInteger(reflection::BaseType t) {
-inline bool IsFloat  (reflection::BaseType t) { return t == reflection::Float ||
+  return t >= reflection::UType && t <= reflection::ULong;
-                                                       t == reflection::Double; }
+}
-inline bool IsLong   (reflection::BaseType t) { return t == reflection::Long ||
+inline bool IsFloat(reflection::BaseType t) {
-                                                       t == reflection::ULong; }
+  return t == reflection::Float || t == reflection::Double;
+}
+inline bool IsLong(reflection::BaseType t) {
+  return t == reflection::Long || t == reflection::ULong;
+}
 
 // Size of a basic type, don't use with structs.
 inline size_t GetTypeSize(reflection::BaseType base_type) {
@@ -48,8 +52,7 @@ inline size_t GetTypeSize(reflection::BaseType base_type) {
 
 // Same as above, but now correctly returns the size of a struct if
 // the field (or vector element) is a struct.
-inline size_t GetTypeSizeInline(reflection::BaseType base_type,
+inline size_t GetTypeSizeInline(reflection::BaseType base_type, int type_index,
-                                int type_index,
                                 const reflection::Schema &schema) {
   if (base_type == reflection::Obj &&
       schema.objects()->Get(type_index)->is_struct()) {
@@ -80,16 +83,16 @@ template<typename T> T GetFieldDefaultF(const reflection::Field &field) {
 }
 
 // Get a field, if you know it's an integer, and its exact type.
-template<typename T> T GetFieldI(const Table &table,
+template<typename T>
-                                 const reflection::Field &field) {
+T GetFieldI(const Table &table, const reflection::Field &field) {
   assert(sizeof(T) == GetTypeSize(field.type()->base_type()));
   return table.GetField<T>(field.offset(),
                            static_cast<T>(field.default_integer()));
 }
 
 // Get a field, if you know it's floating point and its exact type.
-template<typename T> T GetFieldF(const Table &table,
+template<typename T>
-                                 const reflection::Field &field) {
+T GetFieldF(const Table &table, const reflection::Field &field) {
   assert(sizeof(T) == GetTypeSize(field.type()->base_type()));
   return table.GetField<T>(field.offset(),
                            static_cast<T>(field.default_real()));
@@ -103,8 +106,8 @@ inline const String *GetFieldS(const Table &table,
 }
 
 // Get a field, if you know it's a vector.
-template<typename T> Vector<T> *GetFieldV(const Table &table,
+template<typename T>
-                                          const reflection::Field &field) {
+Vector<T> *GetFieldV(const Table &table, const reflection::Field &field) {
   assert(field.type()->base_type() == reflection::Vector &&
          sizeof(T) == GetTypeSize(field.type()->element()));
   return table.GetPointer<Vector<T> *>(field.offset());
@@ -119,8 +122,7 @@ inline VectorOfAny *GetFieldAnyV(const Table &table,
 }
 
 // Get a field, if you know it's a table.
-inline Table *GetFieldT(const Table &table,
+inline Table *GetFieldT(const Table &table, const reflection::Field &field) {
-                        const reflection::Field &field) {
   assert(field.type()->base_type() == reflection::Obj ||
          field.type()->base_type() == reflection::Union);
   return table.GetPointer<Table *>(field.offset());
@@ -153,8 +155,7 @@ double GetAnyValueF(reflection::BaseType type, const uint8_t *data);
 // All scalars converted using stringstream, strings as-is, and all other
 // data types provide some level of debug-pretty-printing.
 std::string GetAnyValueS(reflection::BaseType type, const uint8_t *data,
-                         const reflection::Schema *schema,
+                         const reflection::Schema *schema, int type_index);
-                         int type_index);
 
 // Get any table field as a 64bit int, regardless of what type it is.
 inline int64_t GetAnyFieldI(const Table &table,
@@ -165,14 +166,12 @@ inline int64_t GetAnyFieldI(const Table &table,
 }
 
 // Get any table field as a double, regardless of what type it is.
-inline double GetAnyFieldF(const Table &table,
+inline double GetAnyFieldF(const Table &table, const reflection::Field &field) {
-                           const reflection::Field &field) {
   auto field_ptr = table.GetAddressOf(field.offset());
   return field_ptr ? GetAnyValueF(field.type()->base_type(), field_ptr)
                    : field.default_real();
 }
 
-
 // Get any table field as a string, regardless of what type it is.
 // You may pass nullptr for the schema if you don't care to have fields that
 // are of table type pretty-printed.
@@ -186,15 +185,13 @@ inline std::string GetAnyFieldS(const Table &table,
 }
 
 // Get any struct field as a 64bit int, regardless of what type it is.
-inline int64_t GetAnyFieldI(const Struct &st,
+inline int64_t GetAnyFieldI(const Struct &st, const reflection::Field &field) {
-                            const reflection::Field &field) {
   return GetAnyValueI(field.type()->base_type(),
                       st.GetAddressOf(field.offset()));
 }
 
 // Get any struct field as a double, regardless of what type it is.
-inline double GetAnyFieldF(const Struct &st,
+inline double GetAnyFieldF(const Struct &st, const reflection::Field &field) {
-                           const reflection::Field &field) {
   return GetAnyValueF(field.type()->base_type(),
                       st.GetAddressOf(field.offset()));
 }
@@ -228,8 +225,8 @@ inline std::string GetAnyVectorElemS(const VectorOfAny *vec,
 // Get a vector element that's a table/string/vector from a generic vector.
 // Pass Table/String/VectorOfAny as template parameter.
 // Warning: does no typechecking.
-template<typename T> T *GetAnyVectorElemPointer(const VectorOfAny *vec,
+template<typename T>
-                                                size_t i) {
+T *GetAnyVectorElemPointer(const VectorOfAny *vec, size_t i) {
   auto elem_ptr = vec->Data() + sizeof(uoffset_t) * i;
   return (T *)(elem_ptr + ReadScalar<uoffset_t>(elem_ptr));
 }
@@ -239,34 +236,32 @@ template<typename T> T *GetAnyVectorElemPointer(const VectorOfAny *vec,
 // Get elem_size from GetTypeSizeInline().
 // Note: little-endian data on all platforms, use EndianScalar() instead of
 // raw pointer access with scalars).
-template<typename T> T *GetAnyVectorElemAddressOf(const VectorOfAny *vec,
+template<typename T>
-                                                  size_t i,
+T *GetAnyVectorElemAddressOf(const VectorOfAny *vec, size_t i,
                              size_t elem_size) {
   // C-cast to allow const conversion.
   return (T *)(vec->Data() + elem_size * i);
 }
 
 // Similarly, for elements of tables.
-template<typename T> T *GetAnyFieldAddressOf(const Table &table,
+template<typename T>
-                                             const reflection::Field &field) {
+T *GetAnyFieldAddressOf(const Table &table, const reflection::Field &field) {
   return (T *)table.GetAddressOf(field.offset());
 }
 
 // Similarly, for elements of structs.
-template<typename T> T *GetAnyFieldAddressOf(const Struct &st,
+template<typename T>
-                                             const reflection::Field &field) {
+T *GetAnyFieldAddressOf(const Struct &st, const reflection::Field &field) {
   return (T *)st.GetAddressOf(field.offset());
 }
 
 // ------------------------- SETTERS -------------------------
 
 // Set any scalar field, if you know its exact type.
-template<typename T> bool SetField(Table *table, const reflection::Field &field,
+template<typename T>
-                                   T val) {
+bool SetField(Table *table, const reflection::Field &field, T val) {
   reflection::BaseType type = field.type()->base_type();
-  if (!IsScalar(type)) {
+  if (!IsScalar(type)) { return false; }
-    return false;
-  }
   assert(sizeof(T) == GetTypeSize(type));
   T def;
   if (IsInteger(type)) {
@@ -352,7 +347,6 @@ inline void SetAnyVectorElemS(VectorOfAny *vec, reflection::BaseType elem_type,
   SetAnyValueS(elem_type, vec->Data() + GetTypeSize(elem_type) * i, val);
 }
 
-
 // ------------------------- RESIZING SETTERS -------------------------
 
 // "smart" pointer for use with resizing vectors: turns a pointer inside
@@ -366,21 +360,19 @@ template<typename T, typename U> class pointer_inside_vector {
 
   T *operator*() const {
     return reinterpret_cast<T *>(
-             reinterpret_cast<uint8_t *>(
+        reinterpret_cast<uint8_t *>(flatbuffers::vector_data(vec_)) + offset_);
-               flatbuffers::vector_data(vec_)) + offset_);
-  }
-  T *operator->() const {
-    return operator*();
   }
+  T *operator->() const { return operator*(); }
   void operator=(const pointer_inside_vector &piv);
+
  private:
   size_t offset_;
   std::vector<U> &vec_;
 };
 
 // Helper to create the above easily without specifying template args.
-template<typename T, typename U> pointer_inside_vector<T, U> piv(T *ptr,
+template<typename T, typename U>
-                                                          std::vector<U> &vec) {
+pointer_inside_vector<T, U> piv(T *ptr, std::vector<U> &vec) {
   return pointer_inside_vector<T, U>(ptr, vec);
 }
 
@@ -419,16 +411,14 @@ uint8_t *ResizeAnyVector(const reflection::Schema &schema, uoffset_t newsize,
                          uoffset_t elem_size, std::vector<uint8_t> *flatbuf,
                          const reflection::Object *root_table = nullptr);
 
-template <typename T>
+template<typename T>
 void ResizeVector(const reflection::Schema &schema, uoffset_t newsize, T val,
                   const Vector<T> *vec, std::vector<uint8_t> *flatbuf,
                   const reflection::Object *root_table = nullptr) {
   auto delta_elem = static_cast<int>(newsize) - static_cast<int>(vec->size());
-  auto newelems = ResizeAnyVector(schema, newsize,
+  auto newelems = ResizeAnyVector(
-                                  reinterpret_cast<const VectorOfAny *>(vec),
+      schema, newsize, reinterpret_cast<const VectorOfAny *>(vec), vec->size(),
-                                  vec->size(),
+      static_cast<uoffset_t>(sizeof(T)), flatbuf, root_table);
-                                  static_cast<uoffset_t>(sizeof(T)), flatbuf,
-                                  root_table);
   // Set new elements to "val".
   for (int i = 0; i < delta_elem; i++) {
     auto loc = newelems + i * sizeof(T);
@@ -479,10 +469,8 @@ Offset<const Table *> CopyTable(FlatBufferBuilder &fbb,
 // root should point to the root type for this flatbuffer.
 // buf should point to the start of flatbuffer data.
 // length specifies the size of the flatbuffer data.
-bool Verify(const reflection::Schema &schema,
+bool Verify(const reflection::Schema &schema, const reflection::Object &root,
-            const reflection::Object &root,
+            const uint8_t *buf, size_t length);
-            const uint8_t *buf,
-            size_t length);
 
 }  // namespace flatbuffers
 

include/flatbuffers/registry.h

@@ -37,17 +37,15 @@ class Registry {
 
   // Generate text from an arbitrary FlatBuffer by looking up its
   // file_identifier in the registry.
-  bool FlatBufferToText(const uint8_t *flatbuf, size_t len,
+  bool FlatBufferToText(const uint8_t *flatbuf, size_t len, std::string *dest) {
-                        std::string *dest) {
     // Get the identifier out of the buffer.
     // If the buffer is truncated, exit.
-    if (len < sizeof(uoffset_t) +
+    if (len < sizeof(uoffset_t) + FlatBufferBuilder::kFileIdentifierLength) {
-              FlatBufferBuilder::kFileIdentifierLength) {
       lasterror_ = "buffer truncated";
       return false;
     }
-    std::string ident(reinterpret_cast<const char *>(flatbuf) +
+    std::string ident(
-                        sizeof(uoffset_t),
+        reinterpret_cast<const char *>(flatbuf) + sizeof(uoffset_t),
         FlatBufferBuilder::kFileIdentifierLength);
     // Load and parse the schema.
     Parser parser;
@@ -82,9 +80,7 @@ class Registry {
 
   // If schemas used contain include statements, call this function for every
   // directory the parser should search them for.
-  void AddIncludeDirectory(const char *path) {
+  void AddIncludeDirectory(const char *path) { include_paths_.push_back(path); }
-    include_paths_.push_back(path);
-  }
 
   // Returns a human readable error if any of the above functions fail.
   const std::string &GetLastError() { return lasterror_; }

include/flatbuffers/stl_emulation.h

@@ -17,6 +17,8 @@
 #ifndef FLATBUFFERS_STL_EMULATION_H_
 #define FLATBUFFERS_STL_EMULATION_H_
 
+// clang-format off
+
 #include <string>
 #include <type_traits>
 #include <vector>

include/flatbuffers/util.h

@@ -17,32 +17,31 @@
 #ifndef FLATBUFFERS_UTIL_H_
 #define FLATBUFFERS_UTIL_H_
 
-#include <fstream>
+#include <assert.h>
-#include <iomanip>
-#include <string>
-#include <sstream>
 #include <stdint.h>
 #include <stdlib.h>
-#include <assert.h>
+#include <fstream>
+#include <iomanip>
+#include <sstream>
+#include <string>
 #ifdef _WIN32
-#ifndef WIN32_LEAN_AND_MEAN
+#  ifndef WIN32_LEAN_AND_MEAN
-  #define WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
-#endif
+#  endif
-#ifndef NOMINMAX
+#  ifndef NOMINMAX
-  #define NOMINMAX
+#    define NOMINMAX
-#endif
+#  endif
-#include <windows.h>
+#  include <direct.h>
-#include <winbase.h>
+#  include <winbase.h>
-#include <direct.h>
+#  include <windows.h>
 #else
-#include <limits.h>
+#  include <limits.h>
 #endif
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include "flatbuffers/base.h"
 
-
 namespace flatbuffers {
 
 // Convert an integer or floating point value to a string.
@@ -61,18 +60,18 @@ template<> inline std::string NumToString<unsigned char>(unsigned char t) {
   return NumToString(static_cast<int>(t));
 }
 #if defined(FLATBUFFERS_CPP98_STL)
-  template <> inline std::string NumToString<long long>(long long t) {
+template<> inline std::string NumToString<long long>(long long t) {
   char buf[21];  // (log((1 << 63) - 1) / log(10)) + 2
   snprintf(buf, sizeof(buf), "%lld", t);
   return std::string(buf);
-  }
+}
 
-  template <> inline std::string NumToString<unsigned long long>(
+template<>
-      unsigned long long t) {
+inline std::string NumToString<unsigned long long>(unsigned long long t) {
   char buf[22];  // (log((1 << 63) - 1) / log(10)) + 1
   snprintf(buf, sizeof(buf), "%llu", t);
   return std::string(buf);
-  }
+}
 #endif  // defined(FLATBUFFERS_CPP98_STL)
 
 // Special versions for floats/doubles.
@@ -100,10 +99,7 @@ template<> inline std::string NumToString<float>(float t) {
 // For example, IntToStringHex(0x23, 8) returns the string "00000023".
 inline std::string IntToStringHex(int i, int xdigits) {
   std::stringstream ss;
-  ss << std::setw(xdigits)
+  ss << std::setw(xdigits) << std::setfill('0') << std::hex << std::uppercase
-     << std::setfill('0')
-     << std::hex
-     << std::uppercase
      << i;
   return ss.str();
 }
@@ -111,21 +107,25 @@ inline std::string IntToStringHex(int i, int xdigits) {
 // Portable implementation of strtoll().
 inline int64_t StringToInt(const char *str, char **endptr = nullptr,
                            int base = 10) {
+  // clang-format off
   #ifdef _MSC_VER
     return _strtoi64(str, endptr, base);
   #else
     return strtoll(str, endptr, base);
   #endif
+  // clang-format on
 }
 
 // Portable implementation of strtoull().
 inline uint64_t StringToUInt(const char *str, char **endptr = nullptr,
                              int base = 10) {
+  // clang-format off
   #ifdef _MSC_VER
     return _strtoui64(str, endptr, base);
   #else
     return strtoull(str, endptr, base);
   #endif
+  // clang-format on
 }
 
 typedef bool (*LoadFileFunction)(const char *filename, bool binary,
@@ -134,9 +134,8 @@ typedef bool (*FileExistsFunction)(const char *filename);
 
 LoadFileFunction SetLoadFileFunction(LoadFileFunction load_file_function);
 
-FileExistsFunction SetFileExistsFunction(FileExistsFunction
+FileExistsFunction SetFileExistsFunction(
-                                         file_exists_function);
+    FileExistsFunction file_exists_function);
-
 
 // Check if file "name" exists.
 bool FileExists(const char *name);
@@ -239,16 +238,19 @@ inline std::string PosixPath(const char *path) {
 inline void EnsureDirExists(const std::string &filepath) {
   auto parent = StripFileName(filepath);
   if (parent.length()) EnsureDirExists(parent);
+    // clang-format off
   #ifdef _WIN32
     (void)_mkdir(filepath.c_str());
   #else
     mkdir(filepath.c_str(), S_IRWXU|S_IRGRP|S_IXGRP);
   #endif
+  // clang-format on
 }
 
 // Obtains the absolute path from any other path.
 // Returns the input path if the absolute path couldn't be resolved.
 inline std::string AbsolutePath(const std::string &filepath) {
+  // clang-format off
   #ifdef FLATBUFFERS_NO_ABSOLUTE_PATH_RESOLUTION
     return filepath;
   #else
@@ -262,6 +264,7 @@ inline std::string AbsolutePath(const std::string &filepath) {
       ? abs_path
       : filepath;
   #endif // FLATBUFFERS_NO_ABSOLUTE_PATH_RESOLUTION
+  // clang-format on
 }
 
 // To and from UTF-8 unicode conversion functions
@@ -309,9 +312,7 @@ inline int FromUTF8(const char **in) {
   if ((**in << len) & 0x80) return -1;  // Bit after leading 1's must be 0.
   if (!len) return *(*in)++;
   // UTF-8 encoded values with a length are between 2 and 4 bytes.
-  if (len < 2 || len > 4) {
+  if (len < 2 || len > 4) { return -1; }
-    return -1;
-  }
   // Grab initial bits of the code.
   int ucc = *(*in)++ & ((1 << (7 - len)) - 1);
   for (int i = 0; i < len - 1; i++) {
@@ -321,28 +322,20 @@ inline int FromUTF8(const char **in) {
   }
   // UTF-8 cannot encode values between 0xD800 and 0xDFFF (reserved for
   // UTF-16 surrogate pairs).
-  if (ucc >= 0xD800 && ucc <= 0xDFFF) {
+  if (ucc >= 0xD800 && ucc <= 0xDFFF) { return -1; }
-    return -1;
-  }
   // UTF-8 must represent code points in their shortest possible encoding.
   switch (len) {
     case 2:
       // Two bytes of UTF-8 can represent code points from U+0080 to U+07FF.
-      if (ucc < 0x0080 || ucc > 0x07FF) {
+      if (ucc < 0x0080 || ucc > 0x07FF) { return -1; }
-        return -1;
-      }
       break;
     case 3:
       // Three bytes of UTF-8 can represent code points from U+0800 to U+FFFF.
-      if (ucc < 0x0800 || ucc > 0xFFFF) {
+      if (ucc < 0x0800 || ucc > 0xFFFF) { return -1; }
-        return -1;
-      }
       break;
     case 4:
       // Four bytes of UTF-8 can represent code points from U+10000 to U+10FFFF.
-      if (ucc < 0x10000 || ucc > 0x10FFFF) {
+      if (ucc < 0x10000 || ucc > 0x10FFFF) { return -1; }
-        return -1;
-      }
       break;
   }
   return ucc;
@@ -421,7 +414,8 @@ inline bool EscapeString(const char *s, size_t length, std::string *_text,
               text += "\\u";
               text += IntToStringHex(ucc, 4);
             } else if (ucc <= 0x10FFFF) {
-              // Encode Unicode SMP values to a surrogate pair using two \u escapes.
+              // Encode Unicode SMP values to a surrogate pair using two \u
+              // escapes.
               uint32_t base = ucc - 0x10000;
               auto high_surrogate = (base >> 10) + 0xD800;
               auto low_surrogate = (base & 0x03FF) + 0xDC00;

samples/sample_binary.cpp

@@ -20,7 +20,7 @@ using namespace MyGame::Sample;
 
 // Example how to use FlatBuffers to create and read binary buffers.
 
-int main(int /*argc*/, const char * /*argv*/[]) {
+int main(int /*argc*/, const char * /*argv*/ []) {
   // Build up a serialized buffer algorithmically:
   flatbuffers::FlatBufferBuilder builder;
 
@@ -83,8 +83,8 @@ int main(int /*argc*/, const char * /*argv*/[]) {
   (void)inv;
 
   // Get and test the `weapons` FlatBuffers's `vector`.
-  std::string expected_weapon_names[] = {"Sword", "Axe"};
+  std::string expected_weapon_names[] = { "Sword", "Axe" };
-  short expected_weapon_damages[] = {3, 5};
+  short expected_weapon_damages[] = { 3, 5 };
   auto weps = monster->weapons();
   for (unsigned int i = 0; i < weps->size(); i++) {
     assert(weps->Get(i)->name()->str() == expected_weapon_names[i]);
@@ -95,11 +95,10 @@ int main(int /*argc*/, const char * /*argv*/[]) {
 
   // Get and test the `Equipment` union (`equipped` field).
   assert(monster->equipped_type() == Equipment_Weapon);
-  auto equipped = static_cast<const Weapon*>(monster->equipped());
+  auto equipped = static_cast<const Weapon *>(monster->equipped());
   assert(equipped->name()->str() == "Axe");
   assert(equipped->damage() == 5);
   (void)equipped;
 
   printf("The FlatBuffer was successfully created and verified!\n");
 }
-

samples/sample_text.cpp

@@ -23,7 +23,7 @@ using namespace MyGame::Sample;
 
 // This is an example of parsing text straight into a buffer and then
 // generating flatbuffer (JSON) text from the buffer.
-int main(int /*argc*/, const char * /*argv*/[]) {
+int main(int /*argc*/, const char * /*argv*/ []) {
   // load FlatBuffer schema (.fbs) and JSON from disk
   std::string schemafile;
   std::string jsonfile;

src/clang-format.sh

@@ -0,0 +1,2 @@
+clang-format -i -style=file include/flatbuffers/* src/*.cpp tests/test.cpp samples/*.cpp grpc/src/compiler/schema_interface.h grpc/tests/*.cpp
+git checkout include/flatbuffers/reflection_generated.h

src/code_generators.cpp

@@ -20,24 +20,19 @@
 #include "flatbuffers/util.h"
 
 #if defined(_MSC_VER)
-#pragma warning(push)
+#  pragma warning(push)
-#pragma warning(disable: 4127) // C4127: conditional expression is constant
+#  pragma warning(disable : 4127)  // C4127: conditional expression is constant
 #endif
 
 namespace flatbuffers {
 
 void CodeWriter::operator+=(std::string text) {
-
   while (true) {
     auto begin = text.find("{{");
-    if (begin == std::string::npos) {
+    if (begin == std::string::npos) { break; }
-      break;
-    }
 
     auto end = text.find("}}");
-    if (end == std::string::npos || end < begin) {
+    if (end == std::string::npos || end < begin) { break; }
-      break;
-    }
 
     // Write all the text before the first {{ into the stream.
     stream_.write(text.c_str(), begin);
@@ -119,7 +114,6 @@ std::string BaseGenerator::WrapInNameSpace(const Namespace *ns,
   return qualified_name + name;
 }
 
-
 std::string BaseGenerator::WrapInNameSpace(const Definition &def) const {
   return WrapInNameSpace(def.defined_namespace, def.name);
 }
@@ -150,12 +144,12 @@ void GenComment(const std::vector<std::string> &dc, std::string *code_ptr,
   if (config != nullptr && config->first_line != nullptr) {
     code += std::string(prefix) + std::string(config->first_line) + "\n";
   }
-  std::string line_prefix = std::string(prefix) +
+  std::string line_prefix =
-      ((config != nullptr && config->content_line_prefix != nullptr) ?
+      std::string(prefix) +
-       config->content_line_prefix : "///");
+      ((config != nullptr && config->content_line_prefix != nullptr)
-  for (auto it = dc.begin();
+           ? config->content_line_prefix
-       it != dc.end();
+           : "///");
-       ++it) {
+  for (auto it = dc.begin(); it != dc.end(); ++it) {
     code += line_prefix + *it + "\n";
   }
   if (config != nullptr && config->last_line != nullptr) {
@@ -166,5 +160,5 @@ void GenComment(const std::vector<std::string> &dc, std::string *code_ptr,
 }  // namespace flatbuffers
 
 #if defined(_MSC_VER)
-#pragma warning(pop)
+#  pragma warning(pop)
 #endif

src/flatc.cpp

@@ -20,12 +20,10 @@
 
 #define FLATC_VERSION "1.8.0 (" __DATE__ " " __TIME__ ")"
 
-
 namespace flatbuffers {
 
 void FlatCompiler::ParseFile(
-    flatbuffers::Parser &parser,
+    flatbuffers::Parser &parser, const std::string &filename,
-    const std::string &filename,
     const std::string &contents,
     std::vector<const char *> &include_directories) const {
   auto local_include_directory = flatbuffers::StripFileName(filename);
@@ -47,11 +45,11 @@ void FlatCompiler::Error(const std::string &err, bool usage,
   params_.error_fn(this, err, usage, show_exe_name);
 }
 
-std::string FlatCompiler::GetUsageString(const char* program_name) const {
+std::string FlatCompiler::GetUsageString(const char *program_name) const {
   std::stringstream ss;
   ss << "Usage: " << program_name << " [OPTION]... FILE... [-- FILE...]\n";
   for (size_t i = 0; i < params_.num_generators; ++i) {
-    const Generator& g = params_.generators[i];
+    const Generator &g = params_.generators[i];
 
     std::stringstream full_name;
     full_name << std::setw(12) << std::left << g.generator_opt_long;
@@ -60,6 +58,7 @@ std::string FlatCompiler::GetUsageString(const char* program_name) const {
 
     ss << "  " << full_name.str() << " " << name << "    " << help << ".\n";
   }
+  // clang-format off
   ss <<
     "  -o PATH            Prefix PATH to all generated files.\n"
     "  -I PATH            Search for includes in the specified path.\n"
@@ -121,10 +120,11 @@ std::string FlatCompiler::GetUsageString(const char* program_name) const {
     "Output files are named using the base file name of the input,\n"
     "and written to the current directory or the path given by -o.\n"
     "example: " << program_name << " -c -b schema1.fbs schema2.fbs data.json\n";
+  // clang-format on
   return ss.str();
 }
 
-int FlatCompiler::Compile(int argc, const char** argv) {
+int FlatCompiler::Compile(int argc, const char **argv) {
   if (params_.generators == nullptr || params_.num_generators == 0) {
     return 0;
   }
@@ -154,13 +154,13 @@ int FlatCompiler::Compile(int argc, const char** argv) {
         if (++argi >= argc) Error("missing path following: " + arg, true);
         output_path = flatbuffers::ConCatPathFileName(
             flatbuffers::PosixPath(argv[argi]), "");
-      } else if(arg == "-I") {
+      } else if (arg == "-I") {
         if (++argi >= argc) Error("missing path following" + arg, true);
         include_directories_storage.push_back(
             flatbuffers::PosixPath(argv[argi]));
         include_directories.push_back(
             include_directories_storage.back().c_str());
-      } else if(arg == "--conform") {
+      } else if (arg == "--conform") {
         if (++argi >= argc) Error("missing path following" + arg, true);
         conform_to_schema = flatbuffers::PosixPath(argv[argi]);
       } else if (arg == "--conform-includes") {
@@ -173,38 +173,38 @@ int FlatCompiler::Compile(int argc, const char** argv) {
         if (++argi >= argc) Error("missing path following" + arg, true);
         opts.include_prefix = flatbuffers::ConCatPathFileName(
             flatbuffers::PosixPath(argv[argi]), "");
-      } else if(arg == "--keep-prefix") {
+      } else if (arg == "--keep-prefix") {
         opts.keep_include_path = true;
-      } else if(arg == "--strict-json") {
+      } else if (arg == "--strict-json") {
         opts.strict_json = true;
-      } else if(arg == "--allow-non-utf8") {
+      } else if (arg == "--allow-non-utf8") {
         opts.allow_non_utf8 = true;
-      } else if(arg == "--no-js-exports") {
+      } else if (arg == "--no-js-exports") {
         opts.skip_js_exports = true;
-      } else if(arg == "--goog-js-export") {
+      } else if (arg == "--goog-js-export") {
         opts.use_goog_js_export_format = true;
-      } else if(arg == "--go-namespace") {
+      } else if (arg == "--go-namespace") {
         if (++argi >= argc) Error("missing golang namespace" + arg, true);
         opts.go_namespace = argv[argi];
-      } else if(arg == "--go-import") {
+      } else if (arg == "--go-import") {
         if (++argi >= argc) Error("missing golang import" + arg, true);
         opts.go_import = argv[argi];
-      } else if(arg == "--defaults-json") {
+      } else if (arg == "--defaults-json") {
         opts.output_default_scalars_in_json = true;
       } else if (arg == "--unknown-json") {
         opts.skip_unexpected_fields_in_json = true;
-      } else if(arg == "--no-prefix") {
+      } else if (arg == "--no-prefix") {
         opts.prefixed_enums = false;
-      } else if(arg == "--scoped-enums") {
+      } else if (arg == "--scoped-enums") {
         opts.prefixed_enums = false;
         opts.scoped_enums = true;
       } else if (arg == "--no-union-value-namespacing") {
         opts.union_value_namespacing = false;
-      } else if(arg == "--gen-mutable") {
+      } else if (arg == "--gen-mutable") {
         opts.mutable_buffer = true;
-      } else if(arg == "--gen-name-strings") {
+      } else if (arg == "--gen-name-strings") {
         opts.generate_name_strings = true;
-      } else if(arg == "--gen-object-api") {
+      } else if (arg == "--gen-object-api") {
         opts.generate_object_based_api = true;
       } else if (arg == "--cpp-ptr-type") {
         if (++argi >= argc) Error("missing type following" + arg, true);
@@ -220,40 +220,40 @@ int FlatCompiler::Compile(int argc, const char** argv) {
       } else if (arg == "--object-suffix") {
         if (++argi >= argc) Error("missing suffix following" + arg, true);
         opts.object_suffix = argv[argi];
-      } else if(arg == "--gen-all") {
+      } else if (arg == "--gen-all") {
         opts.generate_all = true;
         opts.include_dependence_headers = false;
-      } else if(arg == "--gen-includes") {
+      } else if (arg == "--gen-includes") {
         // Deprecated, remove this option some time in the future.
         printf("warning: --gen-includes is deprecated (it is now default)\n");
-      } else if(arg == "--no-includes") {
+      } else if (arg == "--no-includes") {
         opts.include_dependence_headers = false;
       } else if (arg == "--gen-onefile") {
         opts.one_file = true;
       } else if (arg == "--raw-binary") {
         raw_binary = true;
-      } else if(arg == "--") {  // Separator between text and binary inputs.
+      } else if (arg == "--") {  // Separator between text and binary inputs.
         binary_files_from = filenames.size();
-      } else if(arg == "--proto") {
+      } else if (arg == "--proto") {
         opts.proto_mode = true;
-      } else if(arg == "--schema") {
+      } else if (arg == "--schema") {
         schema_binary = true;
-      } else if(arg == "-M") {
+      } else if (arg == "-M") {
         print_make_rules = true;
-      } else if(arg == "--version") {
+      } else if (arg == "--version") {
         printf("flatc version %s\n", FLATC_VERSION);
         exit(0);
-      } else if(arg == "--grpc") {
+      } else if (arg == "--grpc") {
         grpc_enabled = true;
-      } else if(arg == "--bfbs-comments") {
+      } else if (arg == "--bfbs-comments") {
         opts.binary_schema_comments = true;
-      } else if(arg == "--no-fb-import") {
+      } else if (arg == "--no-fb-import") {
         opts.skip_flatbuffers_import = true;
-      } else if(arg == "--no-ts-reexport") {
+      } else if (arg == "--no-ts-reexport") {
         opts.reexport_ts_modules = false;
-      } else if(arg == "--reflect-types") {
+      } else if (arg == "--reflect-types") {
         opts.mini_reflect = IDLOptions::kTypes;
-      } else if(arg == "--reflect-names") {
+      } else if (arg == "--reflect-names") {
         opts.mini_reflect = IDLOptions::kTypesAndNames;
       } else {
         for (size_t i = 0; i < params_.num_generators; ++i) {
@@ -294,16 +294,15 @@ int FlatCompiler::Compile(int argc, const char** argv) {
 
   std::unique_ptr<flatbuffers::Parser> parser(new flatbuffers::Parser(opts));
 
-  for (auto file_it = filenames.begin();
+  for (auto file_it = filenames.begin(); file_it != filenames.end();
-            file_it != filenames.end();
        ++file_it) {
     auto &filename = *file_it;
     std::string contents;
     if (!flatbuffers::LoadFile(filename.c_str(), true, &contents))
       Error("unable to load file: " + filename);
 
-    bool is_binary = static_cast<size_t>(file_it - filenames.begin()) >=
+    bool is_binary =
-                     binary_files_from;
+        static_cast<size_t>(file_it - filenames.begin()) >= binary_files_from;
     auto ext = flatbuffers::GetExtension(filename);
     auto is_schema = ext == "fbs" || ext == "proto";
     if (is_binary) {
@@ -322,10 +321,9 @@ int FlatCompiler::Compile(int argc, const char** argv) {
                 filename +
                 "\" matches the schema, use --raw-binary to read this file"
                 " anyway.");
-        } else if (!flatbuffers::BufferHasIdentifier(contents.c_str(),
+        } else if (!flatbuffers::BufferHasIdentifier(
-                       parser->file_identifier_.c_str())) {
+                       contents.c_str(), parser->file_identifier_.c_str())) {
-          Error("binary \"" +
+          Error("binary \"" + filename +
-               filename +
                 "\" does not have expected file_identifier \"" +
                 parser->file_identifier_ +
                 "\", use --raw-binary to read this file anyway.");
@@ -346,8 +344,9 @@ int FlatCompiler::Compile(int argc, const char** argv) {
       if (!is_schema && !parser->builder_.GetSize()) {
         // If a file doesn't end in .fbs, it must be json/binary. Ensure we
         // didn't just parse a schema with a different extension.
-        Error("input file is neither json nor a .fbs (schema) file: " +
+        Error(
-              filename, true);
+            "input file is neither json nor a .fbs (schema) file: " + filename,
+            true);
       }
       if (is_schema && !conform_to_schema.empty()) {
         auto err = parser->ConformTo(conform_parser);
@@ -359,8 +358,8 @@ int FlatCompiler::Compile(int argc, const char** argv) {
       }
     }
 
-    std::string filebase = flatbuffers::StripPath(
+    std::string filebase =
-                             flatbuffers::StripExtension(filename));
+        flatbuffers::StripPath(flatbuffers::StripExtension(filename));
 
     for (size_t i = 0; i < params_.num_generators; ++i) {
       parser->opts.lang = params_.generators[i].lang;
@@ -368,18 +367,17 @@ int FlatCompiler::Compile(int argc, const char** argv) {
         if (!print_make_rules) {
           flatbuffers::EnsureDirExists(output_path);
           if ((!params_.generators[i].schema_only || is_schema) &&
-              !params_.generators[i].generate(*parser.get(), output_path, filebase)) {
+              !params_.generators[i].generate(*parser.get(), output_path,
+                                              filebase)) {
             Error(std::string("Unable to generate ") +
-                  params_.generators[i].lang_name +
+                  params_.generators[i].lang_name + " for " + filebase);
-                  " for " +
-                  filebase);
           }
         } else {
           std::string make_rule = params_.generators[i].make_rule(
               *parser.get(), output_path, filename);
           if (!make_rule.empty())
-            printf("%s\n", flatbuffers::WordWrap(
+            printf("%s\n",
-                make_rule, 80, " ", " \\").c_str());
+                   flatbuffers::WordWrap(make_rule, 80, " ", " \\").c_str());
         }
         if (grpc_enabled) {
           if (params_.generators[i].generateGRPC != nullptr) {
@@ -389,8 +387,8 @@ int FlatCompiler::Compile(int argc, const char** argv) {
                     params_.generators[i].lang_name);
             }
           } else {
-            Warn(std::string("GRPC interface generator not implemented for ")
+            Warn(std::string("GRPC interface generator not implemented for ") +
-                 + params_.generators[i].lang_name);
+                 params_.generators[i].lang_name);
           }
         }
       }

src/flatc_main.cpp

@@ -19,26 +19,17 @@
 static const char *g_program_name = nullptr;
 
 static void Warn(const flatbuffers::FlatCompiler *flatc,
-                 const std::string &warn,
+                 const std::string &warn, bool show_exe_name) {
-                 bool show_exe_name) {
   (void)flatc;
-  if (show_exe_name) {
+  if (show_exe_name) { printf("%s: ", g_program_name); }
-    printf("%s: ", g_program_name);
-  }
   printf("warning: %s\n", warn.c_str());
 }
 
 static void Error(const flatbuffers::FlatCompiler *flatc,
-                  const std::string &err,
+                  const std::string &err, bool usage, bool show_exe_name) {
-                  bool usage,
+  if (show_exe_name) { printf("%s: ", g_program_name); }
-                  bool show_exe_name) {
-  if (show_exe_name) {
-    printf("%s: ", g_program_name);
-  }
   printf("error: %s\n", err.c_str());
-  if (usage) {
+  if (usage) { printf("%s", flatc->GetUsageString(g_program_name).c_str()); }
-    printf("%s", flatc->GetUsageString(g_program_name).c_str());
-  }
   exit(1);
 }
 
@@ -46,61 +37,43 @@ int main(int argc, const char *argv[]) {
   g_program_name = argv[0];
 
   const flatbuffers::FlatCompiler::Generator generators[] = {
-    { flatbuffers::GenerateBinary,   "-b", "--binary", "binary", false,
+    { flatbuffers::GenerateBinary, "-b", "--binary", "binary", false, nullptr,
-      nullptr,
       flatbuffers::IDLOptions::kBinary,
       "Generate wire format binaries for any data definitions",
       flatbuffers::BinaryMakeRule },
-    { flatbuffers::GenerateTextFile, "-t", "--json", "text", false,
+    { flatbuffers::GenerateTextFile, "-t", "--json", "text", false, nullptr,
-      nullptr,
       flatbuffers::IDLOptions::kJson,
       "Generate text output for any data definitions",
       flatbuffers::TextMakeRule },
     { flatbuffers::GenerateCPP, "-c", "--cpp", "C++", true,
-      flatbuffers::GenerateCppGRPC,
+      flatbuffers::GenerateCppGRPC, flatbuffers::IDLOptions::kCpp,
-      flatbuffers::IDLOptions::kCpp,
+      "Generate C++ headers for tables/structs", flatbuffers::CPPMakeRule },
-      "Generate C++ headers for tables/structs",
-      flatbuffers::CPPMakeRule },
     { flatbuffers::GenerateGo, "-g", "--go", "Go", true,
-      flatbuffers::GenerateGoGRPC,
+      flatbuffers::GenerateGoGRPC, flatbuffers::IDLOptions::kGo,
-      flatbuffers::IDLOptions::kGo,
+      "Generate Go files for tables/structs", flatbuffers::GeneralMakeRule },
-      "Generate Go files for tables/structs",
-      flatbuffers::GeneralMakeRule },
     { flatbuffers::GenerateGeneral, "-j", "--java", "Java", true,
-      flatbuffers::GenerateJavaGRPC,
+      flatbuffers::GenerateJavaGRPC, flatbuffers::IDLOptions::kJava,
-      flatbuffers::IDLOptions::kJava,
       "Generate Java classes for tables/structs",
       flatbuffers::GeneralMakeRule },
-    { flatbuffers::GenerateJS,       "-s", "--js", "JavaScript", true,
+    { flatbuffers::GenerateJS, "-s", "--js", "JavaScript", true, nullptr,
-      nullptr,
       flatbuffers::IDLOptions::kJs,
-      "Generate JavaScript code for tables/structs",
+      "Generate JavaScript code for tables/structs", flatbuffers::JSMakeRule },
-      flatbuffers::JSMakeRule },
+    { flatbuffers::GenerateJS, "-T", "--ts", "TypeScript", true, nullptr,
-    { flatbuffers::GenerateJS,       "-T", "--ts", "TypeScript", true,
-      nullptr,
       flatbuffers::IDLOptions::kTs,
-      "Generate TypeScript code for tables/structs",
+      "Generate TypeScript code for tables/structs", flatbuffers::JSMakeRule },
-      flatbuffers::JSMakeRule },
+    { flatbuffers::GenerateGeneral, "-n", "--csharp", "C#", true, nullptr,
-    { flatbuffers::GenerateGeneral,  "-n", "--csharp", "C#", true,
-      nullptr,
       flatbuffers::IDLOptions::kCSharp,
-      "Generate C# classes for tables/structs",
+      "Generate C# classes for tables/structs", flatbuffers::GeneralMakeRule },
-      flatbuffers::GeneralMakeRule },
+    { flatbuffers::GeneratePython, "-p", "--python", "Python", true, nullptr,
-    { flatbuffers::GeneratePython,   "-p", "--python", "Python", true,
-      nullptr,
       flatbuffers::IDLOptions::kPython,
       "Generate Python files for tables/structs",
       flatbuffers::GeneralMakeRule },
-    { flatbuffers::GeneratePhp, nullptr, "--php", "PHP", true,
+    { flatbuffers::GeneratePhp, nullptr, "--php", "PHP", true, nullptr,
-      nullptr,
+      flatbuffers::IDLOptions::kPhp, "Generate PHP files for tables/structs",
-      flatbuffers::IDLOptions::kPhp,
-      "Generate PHP files for tables/structs",
-      flatbuffers::GeneralMakeRule },
-   { flatbuffers::GenerateJsonSchema, nullptr, "--jsonschema", "JsonSchema", true,
-      nullptr,
-      flatbuffers::IDLOptions::kJsonSchema,
-      "Generate Json schema",
       flatbuffers::GeneralMakeRule },
+    { flatbuffers::GenerateJsonSchema, nullptr, "--jsonschema", "JsonSchema",
+      true, nullptr, flatbuffers::IDLOptions::kJsonSchema,
+      "Generate Json schema", flatbuffers::GeneralMakeRule },
   };
 
   flatbuffers::FlatCompiler::InitParams params;

src/flathash.cpp

@@ -14,20 +14,16 @@
  * limitations under the License.
  */
 
+#include <stdio.h>
 #include <iostream>
 #include <sstream>
 #include <string>
 #include "flatbuffers/hash.h"
-#include <stdio.h>
 
-enum OutputFormat {
+enum OutputFormat { kDecimal, kHexadecimal, kHexadecimal0x };
-  kDecimal,
-  kHexadecimal,
-  kHexadecimal0x
-};
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
-  const char* name = argv[0];
+  const char *name = argv[0];
   if (argc <= 1) {
     printf("%s HASH [OPTION]... STRING... [-- STRING...]\n", name);
     printf("Available hashing algorithms:\n  32 bit:\n");
@@ -50,7 +46,7 @@ int main(int argc, char* argv[]) {
     return 0;
   }
 
-  const char* hash_algorithm = argv[1];
+  const char *hash_algorithm = argv[1];
 
   flatbuffers::NamedHashFunction<uint32_t>::HashFunction hash_function32 =
       flatbuffers::FindHashFunction32(hash_algorithm);
@@ -66,15 +62,21 @@ int main(int argc, char* argv[]) {
   bool annotate = false;
   bool escape_dash = false;
   for (int i = 2; i < argc; i++) {
-    const char* arg = argv[i];
+    const char *arg = argv[i];
     if (!escape_dash && arg[0] == '-') {
       std::string opt = arg;
-      if (opt == "-d")       output_format = kDecimal;
+      if (opt == "-d")
-      else if (opt == "-x")  output_format = kHexadecimal;
+        output_format = kDecimal;
-      else if (opt == "-0x") output_format = kHexadecimal0x;
+      else if (opt == "-x")
-      else if (opt == "-c")  annotate = true;
+        output_format = kHexadecimal;
-      else if (opt == "--")  escape_dash = true;
+      else if (opt == "-0x")
-      else printf("Unrecognized argument: \"%s\"\n", arg);
+        output_format = kHexadecimal0x;
+      else if (opt == "-c")
+        annotate = true;
+      else if (opt == "--")
+        escape_dash = true;
+      else
+        printf("Unrecognized argument: \"%s\"\n", arg);
     } else {
       std::stringstream ss;
       if (output_format == kDecimal) {
@@ -90,8 +92,7 @@ int main(int argc, char* argv[]) {
       else if (hash_function64)
         ss << hash_function64(arg);
 
-      if (annotate)
+      if (annotate) ss << " /* \"" << arg << "\" */";
-        ss << " /* \"" << arg << "\" */";
 
       ss << "\n";
 
@@ -100,4 +101,3 @@ int main(int argc, char* argv[]) {
   }
   return 0;
 }
-

src/idl_gen_fbs.cpp

@@ -16,10 +16,10 @@
 
 // independent from idl_parser, since this code is not needed for most clients
 
+#include "flatbuffers/code_generators.h"
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
-#include "flatbuffers/code_generators.h"
 
 namespace flatbuffers {
 
@@ -28,8 +28,7 @@ static std::string GenType(const Type &type, bool underlying = false) {
     case BASE_TYPE_STRUCT:
       return type.struct_def->defined_namespace->GetFullyQualifiedName(
           type.struct_def->name);
-    case BASE_TYPE_VECTOR:
+    case BASE_TYPE_VECTOR: return "[" + GenType(type.VectorType()) + "]";
-        return "[" + GenType(type.VectorType()) + "]";
     default:
       if (type.enum_def && !underlying) {
         return type.enum_def->defined_namespace->GetFullyQualifiedName(
@@ -69,6 +68,7 @@ std::string GenerateFBS(const Parser &parser, const std::string &file_name) {
   std::string schema;
   schema += "// Generated from " + file_name + ".proto\n\n";
   if (parser.opts.include_dependence_headers) {
+    // clang-format off
     #ifdef FBS_GEN_INCLUDES  // TODO: currently all in one file.
     int num_includes = 0;
     for (auto it = parser.included_files_.begin();
@@ -82,6 +82,7 @@ std::string GenerateFBS(const Parser &parser, const std::string &file_name) {
     }
     if (num_includes) schema += "\n";
     #endif
+    // clang-format on
   }
   // Generate code for all the enum declarations.
   const Namespace *last_namespace = nullptr;
@@ -92,8 +93,8 @@ std::string GenerateFBS(const Parser &parser, const std::string &file_name) {
     GenComment(enum_def.doc_comment, &schema, nullptr);
     schema += "enum " + enum_def.name + " : ";
     schema += GenType(enum_def.underlying_type, true) + " {\n";
-    for (auto it = enum_def.vals.vec.begin();
+    for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
-         it != enum_def.vals.vec.end(); ++it) {
+         ++it) {
       auto &ev = **it;
       GenComment(ev.doc_comment, &schema, nullptr, "  ");
       schema += "  " + ev.name + " = " + NumToString(ev.value) + ",\n";
@@ -101,8 +102,8 @@ std::string GenerateFBS(const Parser &parser, const std::string &file_name) {
     schema += "}\n\n";
   }
   // Generate code for all structs/tables.
-  for (auto it = parser.structs_.vec.begin();
+  for (auto it = parser.structs_.vec.begin(); it != parser.structs_.vec.end();
-           it != parser.structs_.vec.end(); ++it) {
+       ++it) {
     StructDef &struct_def = **it;
     GenNameSpace(*struct_def.defined_namespace, &schema, &last_namespace);
     GenComment(struct_def.doc_comment, &schema, nullptr);
@@ -123,12 +124,10 @@ std::string GenerateFBS(const Parser &parser, const std::string &file_name) {
   return schema;
 }
 
-bool GenerateFBS(const Parser &parser,
+bool GenerateFBS(const Parser &parser, const std::string &path,
-                 const std::string &path,
                  const std::string &file_name) {
   return SaveFile((path + file_name + ".fbs").c_str(),
                   GenerateFBS(parser, file_name), false);
 }
 
 }  // namespace flatbuffers
-

src/idl_gen_general.cpp

@@ -16,13 +16,13 @@
 
 // independent from idl_parser, since this code is not needed for most clients
 
+#include "flatbuffers/code_generators.h"
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
-#include "flatbuffers/code_generators.h"
 
 #if defined(FLATBUFFERS_CPP98_STL)
-  #include <cctype>
+#  include <cctype>
 #endif  // defined(FLATBUFFERS_CPP98_STL)
 
 namespace flatbuffers {
@@ -74,7 +74,7 @@ struct LanguageParameters {
   CommentConfig comment_config;
 };
 
-const LanguageParameters& GetLangParams(IDLOptions::Language lang) {
+const LanguageParameters &GetLangParams(IDLOptions::Language lang) {
   static LanguageParameters language_parameters[] = {
     {
         IDLOptions::kJava,
@@ -100,7 +100,8 @@ const LanguageParameters& GetLangParams(IDLOptions::Language lang) {
         "",
         "",
         "",
-      "import java.nio.*;\nimport java.lang.*;\nimport java.util.*;\nimport com.google.flatbuffers.*;\n",
+        "import java.nio.*;\nimport java.lang.*;\nimport "
+        "java.util.*;\nimport com.google.flatbuffers.*;\n",
         "\n@SuppressWarnings(\"unused\")\n",
         {
             "/**",
@@ -157,8 +158,7 @@ class GeneralGenerator : public BaseGenerator {
                    const std::string &file_name)
       : BaseGenerator(parser, path, file_name, "", "."),
         lang_(GetLangParams(parser_.opts.lang)),
-        cur_name_space_( nullptr ) {
+        cur_name_space_(nullptr) {}
-  }
 
   GeneralGenerator &operator=(const GeneralGenerator &);
   bool generate() {
@@ -169,14 +169,14 @@ class GeneralGenerator : public BaseGenerator {
          ++it) {
       std::string enumcode;
       auto &enum_def = **it;
-      if (!parser_.opts.one_file)
+      if (!parser_.opts.one_file) cur_name_space_ = enum_def.defined_namespace;
-        cur_name_space_ = enum_def.defined_namespace;
       GenEnum(enum_def, &enumcode);
       if (parser_.opts.one_file) {
         one_file_code += enumcode;
       } else {
-        if (!SaveType(enum_def.name, *enum_def.defined_namespace,
+        if (!SaveType(enum_def.name, *enum_def.defined_namespace, enumcode,
-                      enumcode, false)) return false;
+                      false))
+          return false;
       }
     }
 
@@ -190,14 +190,15 @@ class GeneralGenerator : public BaseGenerator {
       if (parser_.opts.one_file) {
         one_file_code += declcode;
       } else {
-        if (!SaveType(struct_def.name, *struct_def.defined_namespace,
+        if (!SaveType(struct_def.name, *struct_def.defined_namespace, declcode,
-                      declcode, true)) return false;
+                      true))
+          return false;
       }
     }
 
     if (parser_.opts.one_file) {
-      return SaveType(file_name_, *parser_.current_namespace_,
+      return SaveType(file_name_, *parser_.current_namespace_, one_file_code,
-                      one_file_code, true);
+                      true);
     }
     return true;
   }
@@ -210,8 +211,11 @@ class GeneralGenerator : public BaseGenerator {
 
     std::string code;
     if (lang_.language == IDLOptions::kCSharp) {
-      code = "// <auto-generated>\n"
+      code =
-             "//  " + std::string(FlatBuffersGeneratedWarning()) + "\n"
+          "// <auto-generated>\n"
+          "//  " +
+          std::string(FlatBuffersGeneratedWarning()) +
+          "\n"
           "// </auto-generated>\n\n";
     } else {
       code = "// " + std::string(FlatBuffersGeneratedWarning()) + "\n\n";
@@ -241,19 +245,21 @@ class GeneralGenerator : public BaseGenerator {
     return std::string() + (lang_.language == IDLOptions::kJava
                                 ? static_cast<char>(tolower(upper))
                                 : upper);
-}
+  }
 
-std::string GenNullableAnnotation(const Type& t) {
+  std::string GenNullableAnnotation(const Type &t) {
-  return lang_.language == IDLOptions::kJava 
+    return lang_.language == IDLOptions::kJava && parser_.opts.gen_nullable &&
-    && parser_.opts.gen_nullable 
+                   !IsScalar(DestinationType(t, true).base_type)
-    && !IsScalar(DestinationType(t, true).base_type) ? " @Nullable ": "";
+               ? " @Nullable "
-}
+               : "";
+  }
 
-static bool IsEnum(const Type& type) {
+  static bool IsEnum(const Type &type) {
     return type.enum_def != nullptr && IsInteger(type.base_type);
-}
+  }
 
-std::string GenTypeBasic(const Type &type, bool enableLangOverrides) {
+  std::string GenTypeBasic(const Type &type, bool enableLangOverrides) {
+    // clang-format off
   static const char *java_typename[] = {
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, \
         CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
@@ -269,6 +275,7 @@ std::string GenTypeBasic(const Type &type, bool enableLangOverrides) {
       FLATBUFFERS_GEN_TYPES(FLATBUFFERS_TD)
     #undef FLATBUFFERS_TD
   };
+    // clang-format on
 
     if (enableLangOverrides) {
       if (lang_.language == IDLOptions::kCSharp) {
@@ -285,102 +292,92 @@ std::string GenTypeBasic(const Type &type, bool enableLangOverrides) {
       assert(lang_.language == IDLOptions::kCSharp);
       return csharp_typename[type.base_type];
     }
-}
+  }
 
-std::string GenTypeBasic(const Type &type) {
+  std::string GenTypeBasic(const Type &type) {
     return GenTypeBasic(type, true);
-}
+  }
 
-std::string GenTypePointer(const Type &type) {
+  std::string GenTypePointer(const Type &type) {
     switch (type.base_type) {
-    case BASE_TYPE_STRING:
+      case BASE_TYPE_STRING: return lang_.string_type;
-      return lang_.string_type;
+      case BASE_TYPE_VECTOR: return GenTypeGet(type.VectorType());
-    case BASE_TYPE_VECTOR:
+      case BASE_TYPE_STRUCT: return WrapInNameSpace(*type.struct_def);
-      return GenTypeGet(type.VectorType());
-    case BASE_TYPE_STRUCT:
-      return WrapInNameSpace(*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";
         // fall through
-    default:
+      default: return "Table";
-      return "Table";
+    }
   }
-}
 
-std::string GenTypeGet(const Type &type) {
+  std::string GenTypeGet(const Type &type) {
-  return IsScalar(type.base_type)
+    return IsScalar(type.base_type) ? GenTypeBasic(type) : GenTypePointer(type);
-    ? GenTypeBasic(type)
+  }
-    : GenTypePointer(type);
-}
 
-// Find the destination type the user wants to receive the value in (e.g.
+  // 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).
+  // one size higher signed types for unsigned serialized values in Java).
-Type DestinationType(const Type &type, bool vectorelem) {
+  Type DestinationType(const Type &type, bool vectorelem) {
     if (lang_.language != IDLOptions::kJava) return type;
     switch (type.base_type) {
-    // We use int for both uchar/ushort, since that generally means less casting
+      // We use int for both uchar/ushort, since that generally means less
-    // than using short for uchar.
+      // casting than using short for uchar.
       case BASE_TYPE_UCHAR: return Type(BASE_TYPE_INT);
       case BASE_TYPE_USHORT: return Type(BASE_TYPE_INT);
       case BASE_TYPE_UINT: return Type(BASE_TYPE_LONG);
       case BASE_TYPE_VECTOR:
-      if (vectorelem)
+        if (vectorelem) return DestinationType(type.VectorType(), vectorelem);
-        return DestinationType(type.VectorType(), vectorelem);
         // else fall thru
       default: return type;
     }
-}
+  }
 
-std::string GenOffsetType(const StructDef &struct_def) {
+  std::string GenOffsetType(const StructDef &struct_def) {
-  if(lang_.language == IDLOptions::kCSharp) {
+    if (lang_.language == IDLOptions::kCSharp) {
       return "Offset<" + WrapInNameSpace(struct_def) + ">";
     } else {
       return "int";
     }
-}
+  }
 
-std::string GenOffsetConstruct(const StructDef &struct_def,
+  std::string GenOffsetConstruct(const StructDef &struct_def,
-                                      const std::string &variable_name)
+                                 const std::string &variable_name) {
-{
+    if (lang_.language == IDLOptions::kCSharp) {
-  if(lang_.language == IDLOptions::kCSharp) {
+      return "new Offset<" + WrapInNameSpace(struct_def) + ">(" +
-    return "new Offset<" + WrapInNameSpace(struct_def) + ">(" + variable_name +
+             variable_name + ")";
-           ")";
     }
     return variable_name;
-}
+  }
 
-std::string GenVectorOffsetType() {
+  std::string GenVectorOffsetType() {
-  if(lang_.language == IDLOptions::kCSharp) {
+    if (lang_.language == IDLOptions::kCSharp) {
       return "VectorOffset";
     } else {
       return "int";
     }
-}
+  }
 
-// Generate destination type name
+  // Generate destination type name
-std::string GenTypeNameDest(const Type &type)
+  std::string GenTypeNameDest(const Type &type) {
-{
     return GenTypeGet(DestinationType(type, true));
-}
+  }
 
-// Mask to turn serialized value into destination type value.
+  // Mask to turn serialized value into destination type value.
-std::string DestinationMask(const Type &type, bool vectorelem) {
+  std::string DestinationMask(const Type &type, bool vectorelem) {
     if (lang_.language != IDLOptions::kJava) return "";
     switch (type.base_type) {
       case BASE_TYPE_UCHAR: return " & 0xFF";
       case BASE_TYPE_USHORT: return " & 0xFFFF";
       case BASE_TYPE_UINT: return " & 0xFFFFFFFFL";
       case BASE_TYPE_VECTOR:
-      if (vectorelem)
+        if (vectorelem) return DestinationMask(type.VectorType(), vectorelem);
-        return DestinationMask(type.VectorType(), vectorelem);
         // else fall thru
       default: return "";
     }
-}
+  }
 
-// Casts necessary to correctly read serialized data
+  // Casts necessary to correctly read serialized data
-std::string DestinationCast(const Type &type) {
+  std::string DestinationCast(const Type &type) {
     if (type.base_type == BASE_TYPE_VECTOR) {
       return DestinationCast(type.VectorType());
     } else {
@@ -395,55 +392,53 @@ std::string DestinationCast(const Type &type) {
           if (IsEnum(type)) return "(" + WrapInNameSpace(*type.enum_def) + ")";
           break;
 
-    default:
+        default: break;
-      break;
       }
     }
     return "";
-}
+  }
 
-// Cast statements for mutator method parameters.
+  // Cast statements for mutator method parameters.
-// In Java, parameters representing unsigned numbers need to be cast down to
+  // In Java, parameters representing unsigned numbers need to be cast down to
-// their respective type. For example, a long holding an unsigned int value
+  // 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
+  // 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
+  // directly cast an Enum to its underlying type, which is essential before
-// putting it onto the buffer.
+  // putting it onto the buffer.
-std::string SourceCast(const Type &type, bool castFromDest) {
+  std::string SourceCast(const Type &type, bool castFromDest) {
     if (type.base_type == BASE_TYPE_VECTOR) {
       return SourceCast(type.VectorType(), castFromDest);
     } else {
       switch (lang_.language) {
         case IDLOptions::kJava:
           if (castFromDest) {
-          if (type.base_type == BASE_TYPE_UINT) return "(int)";
+            if (type.base_type == BASE_TYPE_UINT)
-          else if (type.base_type == BASE_TYPE_USHORT) return "(short)";
+              return "(int)";
-          else if (type.base_type == BASE_TYPE_UCHAR) return "(byte)";
+            else if (type.base_type == BASE_TYPE_USHORT)
+              return "(short)";
+            else if (type.base_type == BASE_TYPE_UCHAR)
+              return "(byte)";
           }
           break;
         case IDLOptions::kCSharp:
           if (IsEnum(type)) return "(" + GenTypeBasic(type, false) + ")";
           break;
-      default:
+        default: break;
-        break;
       }
     }
     return "";
-}
+  }
 
-std::string SourceCast(const Type &type) {
+  std::string SourceCast(const Type &type) { return SourceCast(type, true); }
-  return SourceCast(type, true);
-}
 
-std::string SourceCastBasic(const Type &type, bool castFromDest) {
+  std::string SourceCastBasic(const Type &type, bool castFromDest) {
     return IsScalar(type.base_type) ? SourceCast(type, castFromDest) : "";
-}
+  }
 
-std::string SourceCastBasic(const Type &type) {
+  std::string SourceCastBasic(const Type &type) {
     return SourceCastBasic(type, true);
-}
+  }
 
-
+  std::string GenEnumDefaultValue(const Value &value) {
-std::string GenEnumDefaultValue(const Value &value) {
     auto enum_def = value.type.enum_def;
     auto vec = enum_def->vals.vec;
     auto default_value = StringToInt(value.constant.c_str());
@@ -458,9 +453,9 @@ std::string GenEnumDefaultValue(const Value &value) {
     }
 
     return result;
-}
+  }
 
-std::string GenDefaultValue(const Value &value, bool enableLangOverrides) {
+  std::string GenDefaultValue(const Value &value, bool enableLangOverrides) {
     if (enableLangOverrides) {
       // handles both enum case and vector of enum case
       if (lang_.language == IDLOptions::kCSharp &&
@@ -474,10 +469,8 @@ std::string GenDefaultValue(const Value &value, bool enableLangOverrides) {
     switch (value.type.base_type) {
       case BASE_TYPE_FLOAT: return value.constant + "f";
       case BASE_TYPE_BOOL: return value.constant == "0" ? "false" : "true";
-    case BASE_TYPE_ULONG:
+      case BASE_TYPE_ULONG: {
-    {
+        if (lang_.language != IDLOptions::kJava) return value.constant;
-      if (lang_.language != IDLOptions::kJava)
-        return value.constant;
         // Converts the ulong into its bits signed equivalent
         uint64_t defaultValue = StringToUInt(value.constant.c_str());
         return NumToString(static_cast<int64_t>(defaultValue)) + longSuffix;
@@ -486,39 +479,37 @@ std::string GenDefaultValue(const Value &value, bool enableLangOverrides) {
       case BASE_TYPE_LONG: return value.constant + longSuffix;
       default: return value.constant;
     }
-}
+  }
 
-std::string GenDefaultValue(const Value &value) {
+  std::string GenDefaultValue(const Value &value) {
     return GenDefaultValue(value, true);
-}
+  }
 
-std::string GenDefaultValueBasic(const Value &value, bool enableLangOverrides) {
+  std::string GenDefaultValueBasic(const Value &value,
+                                   bool enableLangOverrides) {
     if (!IsScalar(value.type.base_type)) {
       if (enableLangOverrides) {
         if (lang_.language == IDLOptions::kCSharp) {
           switch (value.type.base_type) {
-        case BASE_TYPE_STRING:
+            case BASE_TYPE_STRING: return "default(StringOffset)";
-          return "default(StringOffset)";
             case BASE_TYPE_STRUCT:
-          return "default(Offset<" + WrapInNameSpace(*value.type.struct_def) +
+              return "default(Offset<" +
-                 ">)";
+                     WrapInNameSpace(*value.type.struct_def) + ">)";
-        case BASE_TYPE_VECTOR:
+            case BASE_TYPE_VECTOR: return "default(VectorOffset)";
-          return "default(VectorOffset)";
+            default: break;
-        default:
-          break;
           }
         }
       }
       return "0";
     }
     return GenDefaultValue(value, enableLangOverrides);
-}
+  }
 
-std::string GenDefaultValueBasic(const Value &value) {
+  std::string GenDefaultValueBasic(const Value &value) {
     return GenDefaultValueBasic(value, true);
-}
+  }
 
-void GenEnum(EnumDef &enum_def, std::string *code_ptr) {
+  void GenEnum(EnumDef &enum_def, std::string *code_ptr) {
     std::string &code = *code_ptr;
     if (enum_def.generated) return;
 
@@ -537,8 +528,7 @@ void GenEnum(EnumDef &enum_def, std::string *code_ptr) {
     if (lang_.language == IDLOptions::kJava) {
       code += "  private " + enum_def.name + "() { }\n";
     }
-  for (auto it = enum_def.vals.vec.begin();
+    for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
-       it != enum_def.vals.vec.end();
          ++it) {
       auto &ev = **it;
       GenComment(ev.doc_comment, code_ptr, &lang_.comment_config, "  ");
@@ -563,14 +553,14 @@ void GenEnum(EnumDef &enum_def, std::string *code_ptr) {
       // Average distance between values above which we consider a table
       // "too sparse". Change at will.
       static const int kMaxSparseness = 5;
-    if (range / static_cast<int64_t>(enum_def.vals.vec.size()) < kMaxSparseness) {
+      if (range / static_cast<int64_t>(enum_def.vals.vec.size()) <
+          kMaxSparseness) {
         code += "\n  public static";
         code += lang_.const_decl;
         code += lang_.string_type;
         code += "[] names = { ";
         auto val = enum_def.vals.vec.front()->value;
-      for (auto it = enum_def.vals.vec.begin();
+        for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
-        it != enum_def.vals.vec.end();
              ++it) {
           while (val++ != (*it)->value) code += "\"\", ";
           code += "\"" + (*it)->name + "\", ";
@@ -591,10 +581,10 @@ void GenEnum(EnumDef &enum_def, std::string *code_ptr) {
     // Java does not need the closing semi-colon on class definitions.
     code += (lang_.language != IDLOptions::kJava) ? ";" : "";
     code += "\n\n";
-}
+  }
 
-// Returns the function name that is able to read a value of the given type.
+  // Returns the function name that is able to read a value of the given type.
-std::string GenGetter(const Type &type) {
+  std::string GenGetter(const Type &type) {
     switch (type.base_type) {
       case BASE_TYPE_STRING: return lang_.accessor_prefix + "__string";
       case BASE_TYPE_STRUCT: return lang_.accessor_prefix + "__struct";
@@ -611,10 +601,10 @@ std::string GenGetter(const Type &type) {
         return getter;
       }
     }
-}
+  }
 
-// Returns the function name that is able to read a value of the given type.
+  // Returns the function name that is able to read a value of the given type.
-std::string GenGetterForLookupByKey(flatbuffers::FieldDef *key_field,
+  std::string GenGetterForLookupByKey(flatbuffers::FieldDef *key_field,
                                       const std::string &data_buffer,
                                       const char *num = nullptr) {
     auto type = key_field->value.type;
@@ -624,14 +614,14 @@ std::string GenGetterForLookupByKey(flatbuffers::FieldDef *key_field,
     if (GenTypeBasic(type, false) != "byte") {
       getter += MakeCamel(GenTypeBasic(type, false));
     }
-  getter = dest_cast + getter + "(" + GenOffsetGetter(key_field, num) + ")"
+    getter = dest_cast + getter + "(" + GenOffsetGetter(key_field, num) + ")" +
-    + dest_mask;
+             dest_mask;
     return getter;
-}
+  }
 
-// Direct mutation is only allowed for scalar fields.
+  // Direct mutation is only allowed for scalar fields.
-// Hence a setter method will only be generated for such fields.
+  // Hence a setter method will only be generated for such fields.
-std::string GenSetter(const Type &type) {
+  std::string GenSetter(const Type &type) {
     if (IsScalar(type.base_type)) {
       std::string setter =
           lang_.accessor_prefix + "bb." + FunctionStart('P') + "ut";
@@ -643,23 +633,21 @@ std::string GenSetter(const Type &type) {
     } else {
       return "";
     }
-}
+  }
 
-// Returns the method name for use with add/put calls.
+  // Returns the method name for use with add/put calls.
-std::string GenMethod(const Type &type) {
+  std::string GenMethod(const Type &type) {
-  return IsScalar(type.base_type)
+    return IsScalar(type.base_type) ? MakeCamel(GenTypeBasic(type, false))
-    ? MakeCamel(GenTypeBasic(type, false))
                                     : (IsStruct(type) ? "Struct" : "Offset");
-}
+  }
 
-// Recursively generate arguments for a constructor, to deal with nested
+  // Recursively generate arguments for a constructor, to deal with nested
-// structs.
+  // structs.
-void GenStructArgs(const StructDef &struct_def, std::string *code_ptr,
+  void GenStructArgs(const StructDef &struct_def, std::string *code_ptr,
                      const char *nameprefix) {
     std::string &code = *code_ptr;
     for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
+         it != struct_def.fields.vec.end(); ++it) {
-       ++it) {
       auto &field = **it;
       if (IsStruct(field.value.type)) {
         // Generate arguments for a struct inside a struct. To ensure names
@@ -675,12 +663,12 @@ void GenStructArgs(const StructDef &struct_def, std::string *code_ptr,
         code += MakeCamel(field.name, lang_.first_camel_upper);
       }
     }
-}
+  }
 
-// Recusively generate struct construction statements of the form:
+  // Recusively generate struct construction statements of the form:
-// builder.putType(name);
+  // builder.putType(name);
-// and insert manual padding.
+  // and insert manual padding.
-void GenStructBody(const StructDef &struct_def, std::string *code_ptr,
+  void GenStructBody(const StructDef &struct_def, std::string *code_ptr,
                      const char *nameprefix) {
     std::string &code = *code_ptr;
     code += "    builder." + FunctionStart('P') + "rep(";
@@ -700,37 +688,41 @@ void GenStructBody(const StructDef &struct_def, std::string *code_ptr,
         code += "    builder." + FunctionStart('P') + "ut";
         code += GenMethod(field.value.type) + "(";
         code += SourceCast(field.value.type);
-      auto argname = nameprefix + MakeCamel(field.name, lang_.first_camel_upper);
+        auto argname =
+            nameprefix + MakeCamel(field.name, lang_.first_camel_upper);
         code += argname;
         code += ");\n";
       }
     }
-}
+  }
 
-std::string GenByteBufferLength(const char *bb_name) {
+  std::string GenByteBufferLength(const char *bb_name) {
     std::string bb_len = bb_name;
-  if (lang_.language == IDLOptions::kCSharp) bb_len += ".Length";
+    if (lang_.language == IDLOptions::kCSharp)
-  else bb_len += ".capacity()";
+      bb_len += ".Length";
+    else
+      bb_len += ".capacity()";
     return bb_len;
-}
+  }
 
-std::string GenOffsetGetter(flatbuffers::FieldDef *key_field,
+  std::string GenOffsetGetter(flatbuffers::FieldDef *key_field,
                               const char *num = nullptr) {
     std::string key_offset = "";
     key_offset += lang_.accessor_prefix_static + "__offset(" +
                   NumToString(key_field->value.offset) + ", ";
     if (num) {
       key_offset += num;
-    key_offset += (lang_.language == IDLOptions::kCSharp ?
+      key_offset +=
-      ".Value, builder.DataBuffer)" : ", _bb)");
+          (lang_.language == IDLOptions::kCSharp ? ".Value, builder.DataBuffer)"
+                                                 : ", _bb)");
     } else {
       key_offset += GenByteBufferLength("bb");
       key_offset += " - tableOffset, bb)";
     }
     return key_offset;
-}
+  }
 
-std::string GenLookupKeyGetter(flatbuffers::FieldDef *key_field) {
+  std::string GenLookupKeyGetter(flatbuffers::FieldDef *key_field) {
     std::string key_getter = "      ";
     key_getter += "int tableOffset = " + lang_.accessor_prefix_static;
     key_getter += "__indirect(vectorLocation + 4 * (start + middle)";
@@ -751,43 +743,41 @@ std::string GenLookupKeyGetter(flatbuffers::FieldDef *key_field) {
       }
     }
     return key_getter;
-}
+  }
 
-
+  std::string GenKeyGetter(flatbuffers::FieldDef *key_field) {
-std::string GenKeyGetter(flatbuffers::FieldDef *key_field) {
     std::string key_getter = "";
-  auto data_buffer = (lang_.language == IDLOptions::kCSharp) ?
+    auto data_buffer =
-    "builder.DataBuffer" : "_bb";
+        (lang_.language == IDLOptions::kCSharp) ? "builder.DataBuffer" : "_bb";
     if (key_field->value.type.base_type == BASE_TYPE_STRING) {
-    if (lang_.language == IDLOptions::kJava)
+      if (lang_.language == IDLOptions::kJava) key_getter += " return ";
-      key_getter += " return ";
       key_getter += lang_.accessor_prefix_static;
       key_getter += FunctionStart('C') + "ompareStrings(";
       key_getter += GenOffsetGetter(key_field, "o1") + ", ";
       key_getter += GenOffsetGetter(key_field, "o2") + ", " + data_buffer + ")";
-    if (lang_.language == IDLOptions::kJava)
+      if (lang_.language == IDLOptions::kJava) key_getter += ";";
-      key_getter += ";";
+    } else {
-  }
-  else {
       auto field_getter = GenGetterForLookupByKey(key_field, data_buffer, "o1");
       if (lang_.language == IDLOptions::kCSharp) {
         key_getter += field_getter;
         field_getter = GenGetterForLookupByKey(key_field, data_buffer, "o2");
         key_getter += ".CompareTo(" + field_getter + ")";
-    }
+      } else {
-    else {
+        key_getter +=
-      key_getter += "\n    " + GenTypeNameDest(key_field->value.type) + " val_1 = ";
+            "\n    " + GenTypeNameDest(key_field->value.type) + " val_1 = ";
-      key_getter += field_getter + ";\n    " + GenTypeNameDest(key_field->value.type);
+        key_getter +=
+            field_getter + ";\n    " + GenTypeNameDest(key_field->value.type);
         key_getter += " val_2 = ";
         field_getter = GenGetterForLookupByKey(key_field, data_buffer, "o2");
         key_getter += field_getter + ";\n";
-      key_getter += "    return val_1 > val_2 ? 1 : val_1 < val_2 ? -1 : 0;\n ";
+        key_getter +=
+            "    return val_1 > val_2 ? 1 : val_1 < val_2 ? -1 : 0;\n ";
       }
     }
     return key_getter;
-}
+  }
 
-void GenStruct(StructDef &struct_def, std::string *code_ptr) {
+  void GenStruct(StructDef &struct_def, std::string *code_ptr) {
     if (struct_def.generated) return;
     std::string &code = *code_ptr;
 
@@ -826,16 +816,19 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
     if (!struct_def.fixed) {
       // Generate a special accessor for the table that when used as the root
       // of a FlatBuffer
-    std::string method_name = FunctionStart('G') + "etRootAs" + struct_def.name;
+      std::string method_name =
-    std::string method_signature = "  public static " + struct_def.name + " " +
+          FunctionStart('G') + "etRootAs" + struct_def.name;
-                                   method_name;
+      std::string method_signature =
+          "  public static " + struct_def.name + " " + method_name;
 
       // create convenience method that doesn't require an existing object
       code += method_signature + "(ByteBuffer _bb) ";
-    code += "{ return " + method_name + "(_bb, new " + struct_def.name+ "()); }\n";
+      code += "{ return " + method_name + "(_bb, new " + struct_def.name +
+              "()); }\n";
 
       // create method that allows object reuse
-    code += method_signature + "(ByteBuffer _bb, " + struct_def.name + " obj) { ";
+      code +=
+          method_signature + "(ByteBuffer _bb, " + struct_def.name + " obj) { ";
       code += lang_.set_bb_byteorder;
       code += "return (obj.__assign(_bb." + FunctionStart('G') + "etInt(_bb.";
       code += lang_.get_bb_position;
@@ -859,11 +852,11 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
     code += "  public void __init(int _i, ByteBuffer _bb) ";
     code += "{ " + lang_.accessor_prefix + "bb_pos = _i; ";
     code += lang_.accessor_prefix + "bb = _bb; }\n";
-  code += "  public " + struct_def.name + " __assign(int _i, ByteBuffer _bb) ";
+    code +=
+        "  public " + struct_def.name + " __assign(int _i, ByteBuffer _bb) ";
     code += "{ __init(_i, _bb); return this; }\n\n";
     for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
+         it != struct_def.fields.vec.end(); ++it) {
-       ++it) {
       auto &field = **it;
       if (field.deprecated) continue;
       GenComment(field.doc_comment, code_ptr, &lang_.comment_config, "  ");
@@ -871,8 +864,7 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
       std::string type_name_dest = GenTypeNameDest(field.value.type);
       std::string conditional_cast = "";
       std::string optional = "";
-    if (lang_.language == IDLOptions::kCSharp &&
+      if (lang_.language == IDLOptions::kCSharp && !struct_def.fixed &&
-        !struct_def.fixed &&
           (field.value.type.base_type == BASE_TYPE_STRUCT ||
            field.value.type.base_type == BASE_TYPE_UNION ||
            (field.value.type.base_type == BASE_TYPE_VECTOR &&
@@ -883,7 +875,8 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
       std::string dest_mask = DestinationMask(field.value.type, true);
       std::string dest_cast = DestinationCast(field.value.type);
       std::string src_cast = SourceCast(field.value.type);
-    std::string method_start = "  public " + GenNullableAnnotation(field.value.type) +
+      std::string method_start = "  public " +
+                                 GenNullableAnnotation(field.value.type) +
                                  type_name_dest + optional + " " +
                                  MakeCamel(field.name, lang_.first_camel_upper);
       std::string obj = lang_.language == IDLOptions::kCSharp
@@ -991,7 +984,7 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
                 code += type_name + " obj, ";
               getter = obj + ".__assign";
             }
-          code += "int j)" + offset_prefix + conditional_cast + getter +"(";
+            code += "int j)" + offset_prefix + conditional_cast + getter + "(";
             auto index = lang_.accessor_prefix + "__vector(o) + j * " +
                          NumToString(InlineSize(vectortype));
             if (vectortype.base_type == BASE_TYPE_STRUCT) {
@@ -1004,8 +997,11 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
             }
             code += ")" + dest_mask + " : ";
 
-          code += field.value.type.element == BASE_TYPE_BOOL ? "false" :
+            code +=
-            (IsScalar(field.value.type.element) ? default_cast + "0" : "null");
+                field.value.type.element == BASE_TYPE_BOOL
+                    ? "false"
+                    : (IsScalar(field.value.type.element) ? default_cast + "0"
+                                                          : "null");
             break;
           }
           case BASE_TYPE_UNION:
@@ -1018,14 +1014,14 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
               code += "(obj, o) : null";
             }
             break;
-        default:
+          default: assert(0);
-          assert(0);
         }
       }
       code += member_suffix;
       code += "}\n";
       if (field.value.type.base_type == BASE_TYPE_VECTOR) {
-      code += "  public int " + MakeCamel(field.name, lang_.first_camel_upper);
+        code +=
+            "  public int " + MakeCamel(field.name, lang_.first_camel_upper);
         code += "Length";
         code += lang_.getter_prefix;
         code += offset_prefix;
@@ -1064,7 +1060,8 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
             code += "AsByteBuffer() { return ";
             code += lang_.accessor_prefix + "__vector_as_bytebuffer(";
             code += NumToString(field.value.offset) + ", ";
-          code += NumToString(field.value.type.base_type == BASE_TYPE_STRING
+            code +=
+                NumToString(field.value.type.base_type == BASE_TYPE_STRING
                                 ? 1
                                 : InlineSize(field.value.type.VectorType()));
             code += "); }\n";
@@ -1077,24 +1074,26 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
             code += NumToString(field.value.offset);
             code += "); }\n";
             break;
-        default:
+          default: break;
-          break;
         }
       }
       // generate object accessors if is nested_flatbuffer
       if (field.nested_flatbuffer) {
         auto nested_type_name = WrapInNameSpace(*field.nested_flatbuffer);
-    auto nested_method_name = MakeCamel(field.name, lang_.first_camel_upper)
+        auto nested_method_name =
-      + "As" + nested_type_name;
+            MakeCamel(field.name, lang_.first_camel_upper) + "As" +
+            nested_type_name;
         auto get_nested_method_name = nested_method_name;
         if (lang_.language == IDLOptions::kCSharp) {
           get_nested_method_name = "Get" + nested_method_name;
-      conditional_cast = "(" + nested_type_name + lang_.optional_suffix + ")";
+          conditional_cast =
+              "(" + nested_type_name + lang_.optional_suffix + ")";
         }
         if (lang_.language != IDLOptions::kCSharp) {
           code += "  public " + nested_type_name + lang_.optional_suffix + " ";
           code += nested_method_name + "() { return ";
-      code += get_nested_method_name + "(new " + nested_type_name + "()); }\n";
+          code +=
+              get_nested_method_name + "(new " + nested_type_name + "()); }\n";
         } else {
           obj = "(new " + nested_type_name + "())";
         }
@@ -1103,7 +1102,7 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
         if (lang_.language != IDLOptions::kCSharp)
           code += nested_type_name + " obj";
         code += ") { int o = " + lang_.accessor_prefix + "__offset(";
-    code += NumToString(field.value.offset) +"); ";
+        code += NumToString(field.value.offset) + "); ";
         code += "return o != 0 ? " + conditional_cast + obj + ".__assign(";
         code += lang_.accessor_prefix;
         code += "__indirect(" + lang_.accessor_prefix + "__vector(o)), ";
@@ -1122,10 +1121,12 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
         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
+        auto mutator_params =
-        ? "(int j, "
+            (field.value.type.base_type == BASE_TYPE_VECTOR ? "(int j, "
-        : "(") + GenTypeNameDest(underlying_type) + " " + field.name + ") { ";
+                                                            : "(") +
-      auto setter_index = field.value.type.base_type == BASE_TYPE_VECTOR
+            GenTypeNameDest(underlying_type) + " " + field.name + ") { ";
+        auto setter_index =
+            field.value.type.base_type == BASE_TYPE_VECTOR
                 ? lang_.accessor_prefix + "__vector(o) + j * " +
                       NumToString(InlineSize(underlying_type))
                 : (struct_def.fixed
@@ -1163,8 +1164,8 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
       code += ") {\n";
       GenStructBody(struct_def, code_ptr, "");
       code += "    return ";
-    code += GenOffsetConstruct(struct_def,
+      code += GenOffsetConstruct(
-                               "builder." + std::string(lang_.get_fbb_offset));
+          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
@@ -1211,8 +1212,7 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
         code += FunctionStart('S') + "tartObject(";
         code += NumToString(struct_def.fields.vec.size()) + ");\n";
         for (size_t size = struct_def.sortbysize ? sizeof(largest_scalar_t) : 1;
-           size;
+             size; size /= 2) {
-           size /= 2) {
           for (auto it = struct_def.fields.vec.rbegin();
                it != struct_def.fields.vec.rend(); ++it) {
             auto &field = **it;
@@ -1264,7 +1264,7 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
         }
         code += ", ";
         if (lang_.language == IDLOptions::kJava)
-        code += SourceCastBasic( field.value.type );
+          code += SourceCastBasic(field.value.type);
         code += GenDefaultValue(field.value, false);
         code += "); }\n";
         if (field.value.type.base_type == BASE_TYPE_VECTOR) {
@@ -1296,7 +1296,8 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
             code += "); return ";
             code += "builder." + FunctionStart('E') + "ndVector(); }\n";
           }
-        // Generate a method to start a vector, data to be added manually after.
+          // Generate a method to start a vector, data to be added manually
+          // after.
           code += "  public static void " + FunctionStart('S') + "tart";
           code += MakeCamel(field.name);
           code += "Vector(FlatBufferBuilder builder, int numElems) ";
@@ -1311,8 +1312,7 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
       code += "(FlatBufferBuilder builder) {\n    int o = builder.";
       code += FunctionStart('E') + "ndObject();\n";
       for (auto it = struct_def.fields.vec.begin();
-         it != struct_def.fields.vec.end();
+           it != struct_def.fields.vec.end(); ++it) {
-         ++it) {
         auto &field = **it;
         if (!field.deprecated && field.required) {
           code += "    builder." + FunctionStart('R') + "equired(o, ";
@@ -1324,12 +1324,11 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
       if (parser_.root_struct_def_ == &struct_def) {
         code += "  public static void ";
         code += FunctionStart('F') + "inish" + struct_def.name;
-      code += "Buffer(FlatBufferBuilder builder, " + GenOffsetType(struct_def);
+        code +=
+            "Buffer(FlatBufferBuilder builder, " + GenOffsetType(struct_def);
         code += " offset) {";
         code += " builder." + FunctionStart('F') + "inish(offset";
-      if (lang_.language == IDLOptions::kCSharp) {
+        if (lang_.language == IDLOptions::kCSharp) { code += ".Value"; }
-        code += ".Value";
-      }
 
         if (parser_.file_identifier_.length())
           code += ", \"" + parser_.file_identifier_ + "\"";
@@ -1344,15 +1343,15 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
         code += "Integer o1, Integer o2, ByteBuffer _bb) {";
         code += GenKeyGetter(key_field);
         code += " }\n";
-    }
+      } else {
-    else {
         code += "\n  public static VectorOffset ";
         code += "CreateSortedVectorOf" + struct_def.name;
         code += "(FlatBufferBuilder builder, ";
         code += "Offset<" + struct_def.name + ">";
         code += "[] offsets) {\n";
         code += "    Array.Sort(offsets, (Offset<" + struct_def.name +
-        "> o1, Offset<" + struct_def.name + "> o2) => " + GenKeyGetter(key_field);
+                "> o1, Offset<" + struct_def.name + "> o2) => " +
+                GenKeyGetter(key_field);
         code += ");\n";
         code += "    return builder.CreateVectorOfTables(offsets);\n  }\n";
       }
@@ -1391,9 +1390,10 @@ void GenStruct(StructDef &struct_def, std::string *code_ptr) {
     // Java does not need the closing semi-colon on class definitions.
     code += (lang_.language != IDLOptions::kJava) ? ";" : "";
     code += "\n\n";
-}
+  }
-    const LanguageParameters& lang_;
+  const LanguageParameters &lang_;
-    // This tracks the current namespace used to determine if a type need to be prefixed by its namespace
+  // This tracks the current namespace used to determine if a type need to be
+  // prefixed by its namespace
   const Namespace *cur_name_space_;
 };
 }  // namespace general
@@ -1424,9 +1424,8 @@ std::string GeneralMakeRule(const Parser &parser, const std::string &path,
        ++it) {
     auto &struct_def = **it;
     if (make_rule != "") make_rule += " ";
-    std::string directory =
+    std::string directory = BaseGenerator::NamespaceDir(
-        BaseGenerator::NamespaceDir(parser, path,
+        parser, path, *struct_def.defined_namespace);
-                                    *struct_def.defined_namespace);
     make_rule += directory + struct_def.name + lang.file_extension;
   }
 
@@ -1438,36 +1437,31 @@ std::string GeneralMakeRule(const Parser &parser, const std::string &path,
   return make_rule;
 }
 
-std::string BinaryFileName(const Parser &parser,
+std::string BinaryFileName(const Parser &parser, const std::string &path,
-                           const std::string &path,
                            const std::string &file_name) {
   auto ext = parser.file_extension_.length() ? parser.file_extension_ : "bin";
   return path + file_name + "." + ext;
 }
 
-bool GenerateBinary(const Parser &parser,
+bool GenerateBinary(const Parser &parser, const std::string &path,
-                    const std::string &path,
                     const std::string &file_name) {
   return !parser.builder_.GetSize() ||
          flatbuffers::SaveFile(
              BinaryFileName(parser, path, file_name).c_str(),
              reinterpret_cast<char *>(parser.builder_.GetBufferPointer()),
-           parser.builder_.GetSize(),
+             parser.builder_.GetSize(), true);
-           true);
 }
 
-std::string BinaryMakeRule(const Parser &parser,
+std::string BinaryMakeRule(const Parser &parser, const std::string &path,
-                           const std::string &path,
                            const std::string &file_name) {
   if (!parser.builder_.GetSize()) return "";
-  std::string filebase = flatbuffers::StripPath(
+  std::string filebase =
-      flatbuffers::StripExtension(file_name));
+      flatbuffers::StripPath(flatbuffers::StripExtension(file_name));
-  std::string make_rule = BinaryFileName(parser, path, filebase) + ": " +
+  std::string make_rule =
-      file_name;
+      BinaryFileName(parser, path, filebase) + ": " + file_name;
-  auto included_files = parser.GetIncludedFilesRecursive(
+  auto included_files =
-      parser.root_struct_def_->file);
+      parser.GetIncludedFilesRecursive(parser.root_struct_def_->file);
-  for (auto it = included_files.begin();
+  for (auto it = included_files.begin(); it != included_files.end(); ++it) {
-       it != included_files.end(); ++it) {
     make_rule += " " + *it;
   }
   return make_rule;

src/idl_gen_go.cpp

@@ -16,21 +16,21 @@
 
 // independent from idl_parser, since this code is not needed for most clients
 
-#include <string>
 #include <sstream>
+#include <string>
 
+#include "flatbuffers/code_generators.h"
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
-#include "flatbuffers/code_generators.h"
 
 #ifdef _WIN32
-#include <direct.h>
+#  include <direct.h>
-#define PATH_SEPARATOR "\\"
+#  define PATH_SEPARATOR "\\"
-#define mkdir(n, m) _mkdir(n)
+#  define mkdir(n, m) _mkdir(n)
 #else
-#include <sys/stat.h>
+#  include <sys/stat.h>
-#define PATH_SEPARATOR "/"
+#  define PATH_SEPARATOR "/"
 #endif
 
 namespace flatbuffers {
@@ -44,9 +44,10 @@ namespace go {
 
 // see https://golang.org/ref/spec#Keywords
 static const char *g_golang_keywords[] = {
-  "break", "default", "func", "interface", "select", "case", "defer", "go",
+  "break",  "default", "func",        "interface", "select", "case", "defer",
-  "map", "struct", "chan", "else", "goto", "package", "switch", "const",
+  "go",     "map",     "struct",      "chan",      "else",   "goto", "package",
-  "fallthrough", "if", "range", "type", "continue", "for", "import", "return", "var",
+  "switch", "const",   "fallthrough", "if",        "range",  "type", "continue",
+  "for",    "import",  "return",      "var",
 };
 
 static std::string GenGetter(const Type &type);
@@ -57,23 +58,20 @@ static void GenReceiver(const StructDef &struct_def, std::string *code_ptr);
 static std::string GenTypeBasic(const Type &type);
 static std::string GenTypeGet(const Type &type);
 static std::string TypeName(const FieldDef &field);
-static std::string GoIdentity(const std::string& name) {
+static std::string GoIdentity(const std::string &name) {
-  for (size_t i=0; i<sizeof(g_golang_keywords)/sizeof(g_golang_keywords[0]); i++) {
+  for (size_t i = 0;
-    if (name == g_golang_keywords[i]) {
+       i < sizeof(g_golang_keywords) / sizeof(g_golang_keywords[0]); i++) {
-      return MakeCamel(name + "_", false);
+    if (name == g_golang_keywords[i]) { return MakeCamel(name + "_", false); }
-    }
   }
 
   return MakeCamel(name, false);
 }
 
-
 // Most field accessors need to retrieve and test the field offset first,
 // this is the prefix code for that.
 std::string OffsetPrefix(const FieldDef &field) {
   return "{\n\to := flatbuffers.UOffsetT(rcv._tab.Offset(" +
-         NumToString(field.value.offset) +
+         NumToString(field.value.offset) + "))\n\tif o != 0 {\n";
-         "))\n\tif o != 0 {\n";
 }
 
 // Begin a class declaration.
@@ -185,8 +183,7 @@ static void GenTableAccessor(const StructDef &struct_def,
 }
 
 // Get the length of a vector.
-static void GetVectorLen(const StructDef &struct_def,
+static void GetVectorLen(const StructDef &struct_def, const FieldDef &field,
-                         const FieldDef &field,
                          std::string *code_ptr) {
   std::string &code = *code_ptr;
 
@@ -198,8 +195,7 @@ static void GetVectorLen(const StructDef &struct_def,
 }
 
 // Get a [ubyte] vector as a byte slice.
-static void GetUByteSlice(const StructDef &struct_def,
+static void GetUByteSlice(const StructDef &struct_def, const FieldDef &field,
-                          const FieldDef &field,
                           std::string *code_ptr) {
   std::string &code = *code_ptr;
 
@@ -219,7 +215,7 @@ static void GetScalarFieldOfStruct(const StructDef &struct_def,
   GenReceiver(struct_def, code_ptr);
   code += " " + MakeCamel(field.name);
   code += "() " + TypeName(field) + " {\n";
-  code +="\treturn " + getter;
+  code += "\treturn " + getter;
   code += "(rcv._tab.Pos + flatbuffers.UOffsetT(";
   code += NumToString(field.value.offset) + "))\n}\n";
 }
@@ -284,8 +280,7 @@ static void GetStructFieldOfTable(const StructDef &struct_def,
 }
 
 // Get the value of a string.
-static void GetStringField(const StructDef &struct_def,
+static void GetStringField(const StructDef &struct_def, const FieldDef &field,
-                           const FieldDef &field,
                            std::string *code_ptr) {
   std::string &code = *code_ptr;
   GenReceiver(struct_def, code_ptr);
@@ -297,8 +292,7 @@ static void GetStringField(const StructDef &struct_def,
 }
 
 // Get the value of a union from an object.
-static void GetUnionField(const StructDef &struct_def,
+static void GetUnionField(const StructDef &struct_def, const FieldDef &field,
-                          const FieldDef &field,
                           std::string *code_ptr) {
   std::string &code = *code_ptr;
   GenReceiver(struct_def, code_ptr);
@@ -375,22 +369,19 @@ static void BeginBuilderArgs(const StructDef &struct_def,
 // Recursively generate arguments for a constructor, to deal with nested
 // structs.
 static void StructBuilderArgs(const StructDef &struct_def,
-                              const char *nameprefix,
+                              const char *nameprefix, std::string *code_ptr) {
-                              std::string *code_ptr) {
   for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
+       it != struct_def.fields.vec.end(); ++it) {
-       ++it) {
     auto &field = **it;
     if (IsStruct(field.value.type)) {
       // 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.
       StructBuilderArgs(*field.value.type.struct_def,
-                        (nameprefix + (field.name + "_")).c_str(),
+                        (nameprefix + (field.name + "_")).c_str(), code_ptr);
-                        code_ptr);
     } else {
       std::string &code = *code_ptr;
-      code += (std::string)", " + nameprefix;
+      code += (std::string) ", " + nameprefix;
       code += GoIdentity(field.name);
       code += " " + GenTypeBasic(field.value.type);
     }
@@ -406,21 +397,18 @@ static void EndBuilderArgs(std::string *code_ptr) {
 // Recursively generate struct construction statements and instert manual
 // padding.
 static void StructBuilderBody(const StructDef &struct_def,
-                              const char *nameprefix,
+                              const char *nameprefix, std::string *code_ptr) {
-                              std::string *code_ptr) {
   std::string &code = *code_ptr;
   code += "\tbuilder.Prep(" + NumToString(struct_def.minalign) + ", ";
   code += NumToString(struct_def.bytesize) + ")\n";
   for (auto it = struct_def.fields.vec.rbegin();
-       it != struct_def.fields.vec.rend();
+       it != struct_def.fields.vec.rend(); ++it) {
-       ++it) {
     auto &field = **it;
     if (field.padding)
       code += "\tbuilder.Pad(" + NumToString(field.padding) + ")\n";
     if (IsStruct(field.value.type)) {
       StructBuilderBody(*field.value.type.struct_def,
-                        (nameprefix + (field.name + "_")).c_str(),
+                        (nameprefix + (field.name + "_")).c_str(), code_ptr);
-                        code_ptr);
     } else {
       code += "\tbuilder.Prepend" + GenMethod(field) + "(";
       code += nameprefix + GoIdentity(field.name) + ")\n";
@@ -447,8 +435,7 @@ static void GetStartOfTable(const StructDef &struct_def,
 
 // Set the value of a table's field.
 static void BuildFieldOfTable(const StructDef &struct_def,
-                              const FieldDef &field,
+                              const FieldDef &field, const size_t offset,
-                              const size_t offset,
                               std::string *code_ptr) {
   std::string &code = *code_ptr;
   code += "func " + struct_def.name + "Add" + MakeCamel(field.name);
@@ -476,8 +463,7 @@ static void BuildFieldOfTable(const StructDef &struct_def,
 
 // Set the value of one of the members of a table's vector.
 static void BuildVectorOfTable(const StructDef &struct_def,
-                               const FieldDef &field,
+                               const FieldDef &field, std::string *code_ptr) {
-                               std::string *code_ptr) {
   std::string &code = *code_ptr;
   code += "func " + struct_def.name + "Start";
   code += MakeCamel(field.name);
@@ -508,8 +494,7 @@ static void GenReceiver(const StructDef &struct_def, std::string *code_ptr) {
 
 // Generate a struct field getter, conditioned on its child type(s).
 static void GenStructAccessor(const StructDef &struct_def,
-                              const FieldDef &field,
+                              const FieldDef &field, std::string *code_ptr) {
-                              std::string *code_ptr) {
   GenComment(field.doc_comment, code_ptr, nullptr, "");
   if (IsScalar(field.value.type.base_type)) {
     if (struct_def.fixed) {
@@ -526,9 +511,7 @@ static void GenStructAccessor(const StructDef &struct_def,
           GetStructFieldOfTable(struct_def, field, code_ptr);
         }
         break;
-      case BASE_TYPE_STRING:
+      case BASE_TYPE_STRING: GetStringField(struct_def, field, code_ptr); break;
-        GetStringField(struct_def, field, code_ptr);
-        break;
       case BASE_TYPE_VECTOR: {
         auto vectortype = field.value.type.VectorType();
         if (vectortype.base_type == BASE_TYPE_STRUCT) {
@@ -538,11 +521,8 @@ static void GenStructAccessor(const StructDef &struct_def,
         }
         break;
       }
-      case BASE_TYPE_UNION:
+      case BASE_TYPE_UNION: GetUnionField(struct_def, field, code_ptr); break;
-        GetUnionField(struct_def, field, code_ptr);
+      default: assert(0);
-        break;
-      default:
-        assert(0);
     }
   }
   if (field.value.type.base_type == BASE_TYPE_VECTOR) {
@@ -582,8 +562,7 @@ static void MutateScalarFieldOfTable(const StructDef &struct_def,
 }
 
 // Generate a struct field setter, conditioned on its child type(s).
-static void GenStructMutator(const StructDef &struct_def,
+static void GenStructMutator(const StructDef &struct_def, const FieldDef &field,
-                              const FieldDef &field,
                              std::string *code_ptr) {
   GenComment(field.doc_comment, code_ptr, nullptr, "");
   if (IsScalar(field.value.type.base_type)) {
@@ -601,8 +580,7 @@ static void GenTableBuilders(const StructDef &struct_def,
   GetStartOfTable(struct_def, code_ptr);
 
   for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
+       it != struct_def.fields.vec.end(); ++it) {
-       ++it) {
     auto &field = **it;
     if (field.deprecated) continue;
 
@@ -617,8 +595,7 @@ static void GenTableBuilders(const StructDef &struct_def,
 }
 
 // Generate struct or table methods.
-static void GenStruct(const StructDef &struct_def,
+static void GenStruct(const StructDef &struct_def, std::string *code_ptr) {
-                      std::string *code_ptr) {
   if (struct_def.generated) return;
 
   GenComment(struct_def.doc_comment, code_ptr, nullptr);
@@ -636,8 +613,7 @@ static void GenStruct(const StructDef &struct_def,
 
   // Generate struct fields accessors
   for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
+       it != struct_def.fields.vec.end(); ++it) {
-       ++it) {
     auto &field = **it;
     if (field.deprecated) continue;
 
@@ -661,8 +637,7 @@ static void GenEnum(const EnumDef &enum_def, std::string *code_ptr) {
 
   GenComment(enum_def.doc_comment, code_ptr, nullptr);
   BeginEnum(code_ptr);
-  for (auto it = enum_def.vals.vec.begin();
+  for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
-       it != enum_def.vals.vec.end();
        ++it) {
     auto &ev = **it;
     GenComment(ev.doc_comment, code_ptr, nullptr, "\t");
@@ -671,8 +646,7 @@ static void GenEnum(const EnumDef &enum_def, std::string *code_ptr) {
   EndEnum(code_ptr);
 
   BeginEnumNames(enum_def, code_ptr);
-  for (auto it = enum_def.vals.vec.begin();
+  for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
-       it != enum_def.vals.vec.end();
        ++it) {
     auto &ev = **it;
     EnumNameMember(enum_def, ev, code_ptr);
@@ -686,8 +660,7 @@ static std::string GenGetter(const Type &type) {
     case BASE_TYPE_STRING: return "rcv._tab.ByteVector";
     case BASE_TYPE_UNION: return "rcv._tab.Union";
     case BASE_TYPE_VECTOR: return GenGetter(type.VectorType());
-    default:
+    default: return "rcv._tab.Get" + MakeCamel(GenTypeGet(type));
-      return "rcv._tab.Get" + MakeCamel(GenTypeGet(type));
   }
 }
 
@@ -700,34 +673,30 @@ static std::string GenMethod(const FieldDef &field) {
 
 static std::string GenTypeBasic(const Type &type) {
   static const char *ctypename[] = {
+  // clang-format off
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, \
       CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
       #GTYPE,
       FLATBUFFERS_GEN_TYPES(FLATBUFFERS_TD)
     #undef FLATBUFFERS_TD
+    // clang-format on
   };
   return ctypename[type.base_type];
 }
 
 static std::string GenTypePointer(const Type &type) {
   switch (type.base_type) {
-    case BASE_TYPE_STRING:
+    case BASE_TYPE_STRING: return "[]byte";
-      return "[]byte";
+    case BASE_TYPE_VECTOR: return GenTypeGet(type.VectorType());
-    case BASE_TYPE_VECTOR:
+    case BASE_TYPE_STRUCT: return type.struct_def->name;
-      return GenTypeGet(type.VectorType());
-    case BASE_TYPE_STRUCT:
-      return type.struct_def->name;
     case BASE_TYPE_UNION:
       // fall through
-    default:
+    default: return "*flatbuffers.Table";
-      return "*flatbuffers.Table";
   }
 }
 
 static std::string GenTypeGet(const Type &type) {
-  return IsScalar(type.base_type)
+  return IsScalar(type.base_type) ? GenTypeBasic(type) : GenTypePointer(type);
-    ? GenTypeBasic(type)
-    : GenTypePointer(type);
 }
 
 static std::string TypeName(const FieldDef &field) {
@@ -749,7 +718,8 @@ class GoGenerator : public BaseGenerator {
  public:
   GoGenerator(const Parser &parser, const std::string &path,
               const std::string &file_name, const std::string &go_namespace)
-      : BaseGenerator(parser, path, file_name, "" /* not used*/, "" /* not used */) {
+      : BaseGenerator(parser, path, file_name, "" /* not used*/,
+                      "" /* not used */) {
     std::istringstream iss(go_namespace);
     std::string component;
     while (std::getline(iss, component, '.')) {
@@ -802,8 +772,8 @@ class GoGenerator : public BaseGenerator {
     if (needs_imports) {
       code += "import (\n";
       if (!parser_.opts.go_import.empty()) {
-        code += "\tflatbuffers \"" + parser_.opts.go_import +"\"\n";
+        code += "\tflatbuffers \"" + parser_.opts.go_import + "\"\n";
-      } else{
+      } else {
         code += "\tflatbuffers \"github.com/google/flatbuffers/go\"\n";
       }
       code += ")\n\n";
@@ -815,12 +785,12 @@ class GoGenerator : public BaseGenerator {
                 bool needs_imports) {
     if (!classcode.length()) return true;
 
-    Namespace& ns = go_namespace_.components.empty() ? *def.defined_namespace : go_namespace_;
+    Namespace &ns = go_namespace_.components.empty() ? *def.defined_namespace
+                                                     : go_namespace_;
     std::string code = "";
     BeginFile(LastNamespacePart(ns), needs_imports, &code);
     code += classcode;
-    std::string filename =
+    std::string filename = NamespaceDir(ns) + def.name + ".go";
-        NamespaceDir(ns) + def.name + ".go";
     return SaveFile(filename.c_str(), code, false);
   }
 

src/idl_gen_grpc.cpp

@@ -16,18 +16,19 @@
 
 // independent from idl_parser, since this code is not needed for most clients
 
+#include "flatbuffers/code_generators.h"
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
-#include "flatbuffers/code_generators.h"
 
 #include "src/compiler/cpp_generator.h"
 #include "src/compiler/go_generator.h"
 #include "src/compiler/java_generator.h"
 
 #if defined(_MSC_VER)
-#pragma warning(push)
+#  pragma warning(push)
-#pragma warning(disable: 4512) // C4512: 'class' : assignment operator could not be generated
+#  pragma warning(disable : 4512)  // C4512: 'class' : assignment operator could
+                                   // not be generated
 #endif
 
 namespace flatbuffers {
@@ -36,8 +37,7 @@ class FlatBufMethod : public grpc_generator::Method {
  public:
   enum Streaming { kNone, kClient, kServer, kBiDi };
 
-  FlatBufMethod(const RPCCall *method)
+  FlatBufMethod(const RPCCall *method) : method_(method) {
-    : method_(method) {
     streaming_ = kNone;
     auto val = method_->attributes.Lookup("streaming");
     if (val) {
@@ -47,12 +47,8 @@ class FlatBufMethod : public grpc_generator::Method {
     }
   }
 
-  grpc::string GetLeadingComments(const grpc::string) const {
+  grpc::string GetLeadingComments(const grpc::string) const { return ""; }
-    return "";
+  grpc::string GetTrailingComments(const grpc::string) const { return ""; }
-  }
-  grpc::string GetTrailingComments(const grpc::string) const {
-    return "";
-  }
   std::vector<grpc::string> GetAllComments() const {
     return method_->rpc_comment;
   }
@@ -63,16 +59,13 @@ class FlatBufMethod : public grpc_generator::Method {
     return "flatbuffers::grpc::Message<" + sd.name + ">";
   }
 
-  std::string get_input_type_name() const {
+  std::string get_input_type_name() const { return (*method_->request).name; }
-    return (*method_->request).name;
+  std::string get_output_type_name() const { return (*method_->response).name; }
-  }
-  std::string get_output_type_name() const {
-    return (*method_->response).name;
-  }
 
-  bool get_module_and_message_path_input(
+  bool get_module_and_message_path_input(grpc::string * /*str*/,
-      grpc::string * /*str*/, grpc::string /*generator_file_name*/,
+                                         grpc::string /*generator_file_name*/,
-      bool /*generate_in_pb2_grpc*/, grpc::string /*import_prefix*/) const {
+                                         bool /*generate_in_pb2_grpc*/,
+                                         grpc::string /*import_prefix*/) const {
     return true;
   }
 
@@ -82,13 +75,9 @@ class FlatBufMethod : public grpc_generator::Method {
     return true;
   }
 
-  std::string input_type_name() const {
+  std::string input_type_name() const { return GRPCType(*method_->request); }
-    return GRPCType(*method_->request);
-  }
 
-  std::string output_type_name() const {
+  std::string output_type_name() const { return GRPCType(*method_->response); }
-    return GRPCType(*method_->response);
-  }
 
   bool NoStreaming() const { return streaming_ == kNone; }
   bool ClientStreaming() const { return streaming_ == kClient; }
@@ -104,12 +93,8 @@ class FlatBufService : public grpc_generator::Service {
  public:
   FlatBufService(const ServiceDef *service) : service_(service) {}
 
-  grpc::string GetLeadingComments(const grpc::string) const {
+  grpc::string GetLeadingComments(const grpc::string) const { return ""; }
-    return "";
+  grpc::string GetTrailingComments(const grpc::string) const { return ""; }
-  }
-  grpc::string GetTrailingComments(const grpc::string) const {
-    return "";
-  }
   std::vector<grpc::string> GetAllComments() const {
     return service_->doc_comment;
   }
@@ -131,8 +116,7 @@ class FlatBufService : public grpc_generator::Service {
 
 class FlatBufPrinter : public grpc_generator::Printer {
  public:
-  FlatBufPrinter(std::string *str)
+  FlatBufPrinter(std::string *str) : str_(str), escape_char_('$'), indent_(0) {}
-    : str_(str), escape_char_('$'), indent_(0) {}
 
   void Print(const std::map<std::string, std::string> &vars,
              const char *string_template) {
@@ -155,15 +139,13 @@ class FlatBufPrinter : public grpc_generator::Printer {
   }
 
   void Print(const char *s) {
-    if (s == nullptr || std::strlen(s) == 0) {
+    if (s == nullptr || std::strlen(s) == 0) { return; }
-      return;
-    }
     // Add this string, but for each part separated by \n, add indentation.
     for (;;) {
       // Current indentation.
       str_->insert(str_->end(), indent_ * 2, ' ');
       // See if this contains more than one line.
-      const char * lf = strchr(s, '\n');
+      const char *lf = strchr(s, '\n');
       if (lf) {
         (*str_) += std::string(s, lf + 1);
         s = lf + 1;
@@ -176,7 +158,10 @@ class FlatBufPrinter : public grpc_generator::Printer {
   }
 
   void Indent() { indent_++; }
-  void Outdent() { indent_--; assert(indent_ >= 0); }
+  void Outdent() {
+    indent_--;
+    assert(indent_ >= 0);
+  }
 
  private:
   std::string *str_;
@@ -186,23 +171,15 @@ class FlatBufPrinter : public grpc_generator::Printer {
 
 class FlatBufFile : public grpc_generator::File {
  public:
-  enum Language {
+  enum Language { kLanguageGo, kLanguageCpp, kLanguageJava };
-    kLanguageGo,
-    kLanguageCpp,
-    kLanguageJava
-  };
 
-  FlatBufFile(
+  FlatBufFile(const Parser &parser, const std::string &file_name,
-      const Parser &parser, const std::string &file_name, Language language)
+              Language language)
       : parser_(parser), file_name_(file_name), language_(language) {}
   FlatBufFile &operator=(const FlatBufFile &);
 
-  grpc::string GetLeadingComments(const grpc::string) const {
+  grpc::string GetLeadingComments(const grpc::string) const { return ""; }
-    return "";
+  grpc::string GetTrailingComments(const grpc::string) const { return ""; }
-  }
-  grpc::string GetTrailingComments(const grpc::string) const {
-    return "";
-  }
   std::vector<grpc::string> GetAllComments() const {
     return std::vector<grpc::string>();
   }
@@ -243,13 +220,13 @@ class FlatBufFile : public grpc_generator::File {
   };
 
   std::unique_ptr<const grpc_generator::Service> service(int i) const {
-    return std::unique_ptr<const grpc_generator::Service> (
+    return std::unique_ptr<const grpc_generator::Service>(
         new FlatBufService(parser_.services_.vec[i]));
   }
 
-  std::unique_ptr<grpc_generator::Printer> CreatePrinter(std::string *str) const {
+  std::unique_ptr<grpc_generator::Printer> CreatePrinter(
-    return std::unique_ptr<grpc_generator::Printer>(
+      std::string *str) const {
-          new FlatBufPrinter(str));
+    return std::unique_ptr<grpc_generator::Printer>(new FlatBufPrinter(str));
   }
 
  private:
@@ -263,7 +240,9 @@ class GoGRPCGenerator : public flatbuffers::BaseGenerator {
   GoGRPCGenerator(const Parser &parser, const std::string &path,
                   const std::string &file_name)
       : BaseGenerator(parser, path, file_name, "", "" /*Unused*/),
-      parser_(parser), path_(path), file_name_(file_name) {}
+        parser_(parser),
+        path_(path),
+        file_name_(file_name) {}
 
   bool generate() {
     FlatBufFile file(parser_, file_name_, FlatBufFile::kLanguageGo);
@@ -273,10 +252,11 @@ class GoGRPCGenerator : public flatbuffers::BaseGenerator {
       auto service = file.service(i);
       const Definition *def = parser_.services_.vec[i];
       p.package_name = LastNamespacePart(*(def->defined_namespace));
-      std::string output = grpc_go_generator::GenerateServiceSource(&file, service.get(), &p);
+      std::string output =
-      std::string filename = NamespaceDir(*def->defined_namespace) + def->name + "_grpc.go";
+          grpc_go_generator::GenerateServiceSource(&file, service.get(), &p);
-      if (!flatbuffers::SaveFile(filename.c_str(), output, false))
+      std::string filename =
-        return false;
+          NamespaceDir(*def->defined_namespace) + def->name + "_grpc.go";
+      if (!flatbuffers::SaveFile(filename.c_str(), output, false)) return false;
     }
     return true;
   }
@@ -286,25 +266,22 @@ class GoGRPCGenerator : public flatbuffers::BaseGenerator {
   const std::string &path_, &file_name_;
 };
 
-bool GenerateGoGRPC(const Parser &parser,
+bool GenerateGoGRPC(const Parser &parser, const std::string &path,
-                    const std::string &path,
                     const std::string &file_name) {
   int nservices = 0;
-  for (auto it = parser.services_.vec.begin();
+  for (auto it = parser.services_.vec.begin(); it != parser.services_.vec.end();
-       it != parser.services_.vec.end(); ++it) {
+       ++it) {
     if (!(*it)->generated) nservices++;
   }
   if (!nservices) return true;
   return GoGRPCGenerator(parser, path, file_name).generate();
 }
 
-bool GenerateCppGRPC(const Parser &parser,
+bool GenerateCppGRPC(const Parser &parser, const std::string &path,
-                  const std::string &path,
                      const std::string &file_name) {
-
   int nservices = 0;
-  for (auto it = parser.services_.vec.begin();
+  for (auto it = parser.services_.vec.begin(); it != parser.services_.vec.end();
-       it != parser.services_.vec.end(); ++it) {
+       ++it) {
     if (!(*it)->generated) nservices++;
   }
   if (!nservices) return true;
@@ -335,8 +312,8 @@ bool GenerateCppGRPC(const Parser &parser,
 
 class JavaGRPCGenerator : public flatbuffers::BaseGenerator {
  public:
-  JavaGRPCGenerator(const Parser& parser, const std::string& path,
+  JavaGRPCGenerator(const Parser &parser, const std::string &path,
-                    const std::string& file_name)
+                    const std::string &file_name)
       : BaseGenerator(parser, path, file_name, "", "." /*separator*/),
         parser_(parser),
         path_(path),
@@ -347,7 +324,7 @@ class JavaGRPCGenerator : public flatbuffers::BaseGenerator {
     grpc_java_generator::Parameters p;
     for (int i = 0; i < file.service_count(); i++) {
       auto service = file.service(i);
-      const Definition* def = parser_.services_.vec[i];
+      const Definition *def = parser_.services_.vec[i];
       p.package_name =
           def->defined_namespace->GetFullyQualifiedName("");  // file.package();
       std::string output =
@@ -360,12 +337,12 @@ class JavaGRPCGenerator : public flatbuffers::BaseGenerator {
   }
 
  protected:
-  const Parser& parser_;
+  const Parser &parser_;
   const std::string &path_, &file_name_;
 };
 
-bool GenerateJavaGRPC(const Parser& parser, const std::string& path,
+bool GenerateJavaGRPC(const Parser &parser, const std::string &path,
-                      const std::string& file_name) {
+                      const std::string &file_name) {
   int nservices = 0;
   for (auto it = parser.services_.vec.begin(); it != parser.services_.vec.end();
        ++it) {
@@ -378,5 +355,5 @@ bool GenerateJavaGRPC(const Parser& parser, const std::string& path,
 }  // namespace flatbuffers
 
 #if defined(_MSC_VER)
-#pragma warning(pop)
+#  pragma warning(pop)
 #endif

src/idl_gen_js.cpp

@@ -15,14 +15,14 @@
  */
 
 // independent from idl_parser, since this code is not needed for most clients
-#include <unordered_set>
-#include <unordered_map>
 #include <cassert>
+#include <unordered_map>
+#include <unordered_set>
 
+#include "flatbuffers/code_generators.h"
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
-#include "flatbuffers/code_generators.h"
 
 namespace flatbuffers {
 
@@ -39,7 +39,7 @@ struct ReexportDescription {
   std::string target_namespace;
 };
 
-const JsLanguageParameters& GetJsLangParams(IDLOptions::Language lang) {
+const JsLanguageParameters &GetJsLangParams(IDLOptions::Language lang) {
   static JsLanguageParameters js_language_parameters[] = {
     {
         IDLOptions::kJs,
@@ -77,9 +77,7 @@ class JsGenerator : public BaseGenerator {
   JsGenerator(const Parser &parser, const std::string &path,
               const std::string &file_name)
       : BaseGenerator(parser, path, file_name, "", "."),
-        lang_(GetJsLangParams(parser_.opts.lang))
+        lang_(GetJsLangParams(parser_.opts.lang)){};
-  {
-  };
   // Iterate through all definitions we haven't generate code for (enums,
   // structs, and tables) and output them to a single file.
   bool generate() {
@@ -133,8 +131,7 @@ class JsGenerator : public BaseGenerator {
 
   // Generate reexports, which might not have been explicitly imported using the
   // "export import" trick
-  void generateReexports(std::string *code_ptr,
+  void generateReexports(std::string *code_ptr, const reexport_map &reexports,
-                         const reexport_map &reexports,
                          imported_fileset imported_files) {
     if (!parser_.opts.reexport_ts_modules ||
         lang_.language != IDLOptions::kTs) {
@@ -164,8 +161,7 @@ class JsGenerator : public BaseGenerator {
   }
 
   // Generate code for all enums.
-  void generateEnums(std::string *enum_code_ptr,
+  void generateEnums(std::string *enum_code_ptr, std::string *exports_code_ptr,
-                     std::string *exports_code_ptr,
                      reexport_map &reexports) {
     for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
          ++it) {
@@ -193,31 +189,29 @@ class JsGenerator : public BaseGenerator {
 
     std::set<std::string> namespaces;
 
-  for (auto it = parser_.namespaces_.begin();
+    for (auto it = parser_.namespaces_.begin(); it != parser_.namespaces_.end();
-       it != parser_.namespaces_.end(); ++it) {
+         ++it) {
       std::string namespace_so_far;
 
       // Gather all parent namespaces for this namespace
       for (auto component = (*it)->components.begin();
            component != (*it)->components.end(); ++component) {
-      if (!namespace_so_far.empty()) {
+        if (!namespace_so_far.empty()) { namespace_so_far += '.'; }
-        namespace_so_far += '.';
-      }
         namespace_so_far += *component;
         namespaces.insert(namespace_so_far);
       }
     }
 
     // Make sure parent namespaces come before child namespaces
-  std::vector<std::string> sorted_namespaces(
+    std::vector<std::string> sorted_namespaces(namespaces.begin(),
-    namespaces.begin(), namespaces.end());
+                                               namespaces.end());
     std::sort(sorted_namespaces.begin(), sorted_namespaces.end());
 
     // Emit namespaces in a form that Closure Compiler can optimize
     std::string &code = *code_ptr;
     std::string &exports = *exports_ptr;
-  for (auto it = sorted_namespaces.begin();
+    for (auto it = sorted_namespaces.begin(); it != sorted_namespaces.end();
-       it != sorted_namespaces.end(); it++) {
+         it++) {
       if (lang_.language == IDLOptions::kTs) {
         if (it->find('.') == std::string::npos) {
           code += "import { flatbuffers } from \"./flatbuffers\"\n";
@@ -227,7 +221,7 @@ class JsGenerator : public BaseGenerator {
         code += "/**\n * @const\n * @namespace\n */\n";
         if (it->find('.') == std::string::npos) {
           code += "var ";
-        if(parser_.opts.use_goog_js_export_format) {
+          if (parser_.opts.use_goog_js_export_format) {
             exports += "goog.exportSymbol('" + *it + "', " + *it + ");\n";
           } else {
             exports += "this." + *it + " = " + *it + ";\n";
@@ -236,10 +230,10 @@ class JsGenerator : public BaseGenerator {
         code += *it + " = " + *it + " || {};\n\n";
       }
     }
-}
+  }
 
-// Generate a documentation comment, if available.
+  // Generate a documentation comment, if available.
-static void GenDocComment(const std::vector<std::string> &dc,
+  static void GenDocComment(const std::vector<std::string> &dc,
                             std::string *code_ptr,
                             const std::string &extra_lines,
                             const char *indent = nullptr) {
@@ -275,15 +269,15 @@ static void GenDocComment(const std::vector<std::string> &dc,
     }
     if (indent) code += indent;
     code += " */\n";
-}
+  }
 
-static void GenDocComment(std::string *code_ptr,
+  static void GenDocComment(std::string *code_ptr,
                             const std::string &extra_lines) {
     GenDocComment(std::vector<std::string>(), code_ptr, extra_lines);
-}
+  }
 
-// Generate an enum declaration and an enum string lookup table.
+  // Generate an enum declaration and an enum string lookup table.
-void GenEnum(EnumDef &enum_def, std::string *code_ptr,
+  void GenEnum(EnumDef &enum_def, std::string *code_ptr,
                std::string *exports_ptr, reexport_map &reexports) {
     if (enum_def.generated) return;
     std::string &code = *code_ptr;
@@ -291,14 +285,12 @@ void GenEnum(EnumDef &enum_def, std::string *code_ptr,
     GenDocComment(enum_def.doc_comment, code_ptr, "@enum");
     std::string ns = GetNameSpace(enum_def);
     if (lang_.language == IDLOptions::kTs) {
-    if (!ns.empty()) {
+      if (!ns.empty()) { code += "export namespace " + ns + "{\n"; }
-      code += "export namespace " + ns + "{\n";
-    }
       code += "export enum " + enum_def.name + "{\n";
     } else {
       if (enum_def.defined_namespace->components.empty()) {
         code += "var ";
-      if(parser_.opts.use_goog_js_export_format) {
+        if (parser_.opts.use_goog_js_export_format) {
           exports += "goog.exportSymbol('" + enum_def.name + "', " +
                      enum_def.name + ");\n";
         } else {
@@ -307,13 +299,11 @@ void GenEnum(EnumDef &enum_def, std::string *code_ptr,
       }
       code += WrapInNameSpace(enum_def) + " = {\n";
     }
-  for (auto it = enum_def.vals.vec.begin();
+    for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
-       it != enum_def.vals.vec.end(); ++it) {
+         ++it) {
       auto &ev = **it;
       if (!ev.doc_comment.empty()) {
-      if (it != enum_def.vals.vec.begin()) {
+        if (it != enum_def.vals.vec.begin()) { code += '\n'; }
-        code += '\n';
-      }
         GenDocComment(ev.doc_comment, code_ptr, "", "  ");
       }
       code += "  " + ev.name;
@@ -322,23 +312,19 @@ void GenEnum(EnumDef &enum_def, std::string *code_ptr,
       code += (it + 1) != enum_def.vals.vec.end() ? ",\n" : "\n";
 
       if (ev.union_type.struct_def) {
-        ReexportDescription desc = {
+        ReexportDescription desc = { ev.name,
-          ev.name,
                                      GetNameSpace(*ev.union_type.struct_def),
-          GetNameSpace(enum_def)
+                                     GetNameSpace(enum_def) };
-        };
+        reexports.insert(
-        reexports.insert(std::make_pair(ev.union_type.struct_def->file,
+            std::make_pair(ev.union_type.struct_def->file, std::move(desc)));
-                                        std::move(desc)));
       }
     }
 
-  if (lang_.language == IDLOptions::kTs && !ns.empty()) {
+    if (lang_.language == IDLOptions::kTs && !ns.empty()) { code += "}"; }
-    code += "}";
-  }
     code += "};\n\n";
-}
+  }
 
-static std::string GenType(const Type &type) {
+  static std::string GenType(const Type &type) {
     switch (type.base_type) {
       case BASE_TYPE_BOOL:
       case BASE_TYPE_CHAR: return "Int8";
@@ -357,19 +343,18 @@ static std::string GenType(const Type &type) {
       case BASE_TYPE_STRUCT: return type.struct_def->name;
       default: return "Table";
     }
-}
+  }
 
-std::string GenGetter(const Type &type, const std::string &arguments) {
+  std::string GenGetter(const Type &type, const std::string &arguments) {
     switch (type.base_type) {
       case BASE_TYPE_STRING: return GenBBAccess() + ".__string" + arguments;
       case BASE_TYPE_STRUCT: return GenBBAccess() + ".__struct" + arguments;
       case BASE_TYPE_UNION: return GenBBAccess() + ".__union" + arguments;
       case BASE_TYPE_VECTOR: return GenGetter(type.VectorType(), arguments);
       default: {
-      auto getter = GenBBAccess() + ".read" + MakeCamel(GenType(type)) + arguments;
+        auto getter =
-      if (type.base_type == BASE_TYPE_BOOL) {
+            GenBBAccess() + ".read" + MakeCamel(GenType(type)) + arguments;
-        getter = "!!" + getter;
+        if (type.base_type == BASE_TYPE_BOOL) { getter = "!!" + getter; }
-      }
         if (type.enum_def) {
           getter = "/** @type {" + WrapInNameSpace(*type.enum_def) + "} */ (" +
                    getter + ")";
@@ -377,34 +362,33 @@ std::string GenGetter(const Type &type, const std::string &arguments) {
         return getter;
       }
     }
-}
+  }
 
-std::string GenBBAccess() {
+  std::string GenBBAccess() {
     return lang_.language == IDLOptions::kTs ? "this.bb!" : "this.bb";
-}
+  }
 
-std::string GenDefaultValue(const Value &value, const std::string &context) {
+  std::string GenDefaultValue(const Value &value, const std::string &context) {
     if (value.type.enum_def) {
       if (auto val = value.type.enum_def->ReverseLookup(
               atoi(value.constant.c_str()), false)) {
         if (lang_.language == IDLOptions::kTs) {
           return GenPrefixedTypeName(WrapInNameSpace(*value.type.enum_def),
-                                   value.type.enum_def->file) + "." + val->name;
+                                     value.type.enum_def->file) +
+                 "." + val->name;
         } else {
           return WrapInNameSpace(*value.type.enum_def) + "." + val->name;
         }
       } else {
-      return "/** @type {" + WrapInNameSpace(*value.type.enum_def) + "} */ ("
+        return "/** @type {" + WrapInNameSpace(*value.type.enum_def) +
-        + value.constant + ")";
+               "} */ (" + value.constant + ")";
       }
     }
 
     switch (value.type.base_type) {
-    case BASE_TYPE_BOOL:
+      case BASE_TYPE_BOOL: return value.constant == "0" ? "false" : "true";
-      return value.constant == "0" ? "false" : "true";
 
-    case BASE_TYPE_STRING:
+      case BASE_TYPE_STRING: return "null";
-      return "null";
 
       case BASE_TYPE_LONG:
       case BASE_TYPE_ULONG: {
@@ -413,14 +397,15 @@ std::string GenDefaultValue(const Value &value, const std::string &context) {
                ", " + NumToString((int32_t)(constant >> 32)) + ")";
       }
 
-    default:
+      default: return value.constant;
-      return value.constant;
+    }
   }
-}
 
-std::string GenTypeName(const Type &type, bool input, bool allowNull = false) {
+  std::string GenTypeName(const Type &type, bool input,
+                          bool allowNull = false) {
     if (!input) {
-    if (type.base_type == BASE_TYPE_STRING || type.base_type == BASE_TYPE_STRUCT) {
+      if (type.base_type == BASE_TYPE_STRING ||
+          type.base_type == BASE_TYPE_STRUCT) {
         std::string name;
         if (type.base_type == BASE_TYPE_STRING) {
           name = "string|Uint8Array";
@@ -437,17 +422,15 @@ std::string GenTypeName(const Type &type, bool input, bool allowNull = false) {
       case BASE_TYPE_ULONG: return "flatbuffers.Long";
       default:
         if (IsScalar(type.base_type)) {
-        if (type.enum_def) {
+          if (type.enum_def) { return WrapInNameSpace(*type.enum_def); }
-          return WrapInNameSpace(*type.enum_def);
-        }
           return "number";
         }
         return "flatbuffers.Offset";
     }
-}
+  }
 
-// Returns the method name for use with add/put calls.
+  // Returns the method name for use with add/put calls.
-static std::string GenWriteMethod(const Type &type) {
+  static std::string GenWriteMethod(const Type &type) {
     // Forward to signed versions since unsigned versions don't exist
     switch (type.base_type) {
       case BASE_TYPE_UTYPE:
@@ -458,47 +441,40 @@ static std::string GenWriteMethod(const Type &type) {
       default: break;
     }
 
-  return IsScalar(type.base_type)
+    return IsScalar(type.base_type) ? MakeCamel(GenType(type))
-    ? MakeCamel(GenType(type))
                                     : (IsStruct(type) ? "Struct" : "Offset");
-}
+  }
 
-template <typename T>
+  template<typename T> static std::string MaybeAdd(T value) {
-static std::string MaybeAdd(T value) {
     return value != 0 ? " + " + NumToString(value) : "";
-}
+  }
 
-template <typename T>
+  template<typename T> static std::string MaybeScale(T value) {
-static std::string MaybeScale(T value) {
     return value != 1 ? " * " + NumToString(value) : "";
-}
+  }
 
-static std::string GenFileNamespacePrefix(const std::string &file) {
+  static std::string GenFileNamespacePrefix(const std::string &file) {
-  return "NS" + std::to_string(
+    return "NS" + std::to_string(static_cast<unsigned long long>(
-        static_cast<unsigned long long>(std::hash<std::string>()(file)));
+                      std::hash<std::string>()(file)));
-}
+  }
 
-static std::string GenPrefixedImport(const std::string &full_file_name,
+  static std::string GenPrefixedImport(const std::string &full_file_name,
                                        const std::string &base_file_name) {
-  return "import * as "+ GenFileNamespacePrefix(full_file_name) +
+    return "import * as " + GenFileNamespacePrefix(full_file_name) +
            " from \"./" + base_file_name + "\";\n";
-}
+  }
 
-// Adds a source-dependent prefix, for of import * statements.
+  // Adds a source-dependent prefix, for of import * statements.
-std::string GenPrefixedTypeName(const std::string &typeName,
+  std::string GenPrefixedTypeName(const std::string &typeName,
                                   const std::string &file) {
     const auto basename =
         flatbuffers::StripPath(flatbuffers::StripExtension(file));
-  if (basename == file_name_) {
+    if (basename == file_name_) { return typeName; }
-    return typeName;
-  }
     return GenFileNamespacePrefix(file) + "." + typeName;
-}
+  }
 
-void GenStructArgs(const StructDef &struct_def,
+  void GenStructArgs(const StructDef &struct_def, std::string *annotations,
-                          std::string *annotations,
+                     std::string *arguments, const std::string &nameprefix) {
-                          std::string *arguments,
-                          const std::string &nameprefix) {
     for (auto it = struct_def.fields.vec.begin();
          it != struct_def.fields.vec.end(); ++it) {
       auto &field = **it;
@@ -520,10 +496,9 @@ void GenStructArgs(const StructDef &struct_def,
         }
       }
     }
-}
+  }
 
-static void GenStructBody(const StructDef &struct_def,
+  static void GenStructBody(const StructDef &struct_def, std::string *body,
-                          std::string *body,
                             const std::string &nameprefix) {
     *body += "  builder.prep(";
     *body += NumToString(struct_def.minalign) + ", ";
@@ -543,16 +518,14 @@ static void GenStructBody(const StructDef &struct_def,
                       nameprefix + field.name + "_");
       } else {
         *body += "  builder.write" + GenWriteMethod(field.value.type) + "(";
-      if (field.value.type.base_type == BASE_TYPE_BOOL) {
+        if (field.value.type.base_type == BASE_TYPE_BOOL) { *body += "+"; }
-        *body += "+";
-      }
         *body += nameprefix + field.name + ");\n";
       }
     }
-}
+  }
 
-// Generate an accessor struct with constructor for a flatbuffers struct.
+  // Generate an accessor struct with constructor for a flatbuffers struct.
-void GenStruct(const Parser &parser, StructDef &struct_def,
+  void GenStruct(const Parser &parser, StructDef &struct_def,
                  std::string *code_ptr, std::string *exports_ptr,
                  imported_fileset &imported_files) {
     if (struct_def.generated) return;
@@ -585,11 +558,12 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
       object_name = WrapInNameSpace(struct_def);
       GenDocComment(struct_def.doc_comment, code_ptr, "@constructor");
       if (isStatement) {
-      if(parser_.opts.use_goog_js_export_format) {
+        if (parser_.opts.use_goog_js_export_format) {
           exports += "goog.exportSymbol('" + struct_def.name + "', " +
                      struct_def.name + ");\n";
         } else {
-        exports += "this." + struct_def.name + " = " + struct_def.name + ";\n";
+          exports +=
+              "this." + struct_def.name + " = " + struct_def.name + ";\n";
         }
         code += "function " + object_name;
       } else {
@@ -617,8 +591,8 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
     code += " */\n";
 
     if (lang_.language == IDLOptions::kTs) {
-    code += "__init(i:number, bb:flatbuffers.ByteBuffer):" + object_name +
+      code +=
-            " {\n";
+          "__init(i:number, bb:flatbuffers.ByteBuffer):" + object_name + " {\n";
     } else {
       code += object_name + ".prototype.__init = function(i, bb) {\n";
     }
@@ -633,12 +607,15 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
     if (!struct_def.fixed) {
       GenDocComment(code_ptr,
                     "@param {flatbuffers.ByteBuffer} bb\n"
-      "@param {" + object_name + "=} obj\n"
+                    "@param {" +
-      "@returns {" + object_name + "}");
+                        object_name +
+                        "=} obj\n"
+                        "@returns {" +
+                        object_name + "}");
       if (lang_.language == IDLOptions::kTs) {
         code += "static getRootAs" + struct_def.name;
-      code += "(bb:flatbuffers.ByteBuffer, obj?:" + object_name + "):" +
+        code += "(bb:flatbuffers.ByteBuffer, obj?:" + object_name +
-              object_name + " {\n";
+                "):" + object_name + " {\n";
       } else {
         code += object_name + ".getRootAs" + struct_def.name;
         code += " = function(bb, obj) {\n";
@@ -655,7 +632,8 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
                       "@returns {boolean}");
         if (lang_.language == IDLOptions::kTs) {
           code +=
-            "static bufferHasIdentifier(bb:flatbuffers.ByteBuffer):boolean {\n";
+              "static bufferHasIdentifier(bb:flatbuffers.ByteBuffer):boolean "
+              "{\n";
         } else {
           code += object_name + ".bufferHasIdentifier = function(bb) {\n";
         }
@@ -670,31 +648,37 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
          it != struct_def.fields.vec.end(); ++it) {
       auto &field = **it;
       if (field.deprecated) continue;
-    auto offset_prefix = "  var offset = " + GenBBAccess() +
+      auto offset_prefix =
-      ".__offset(this.bb_pos, " + NumToString(field.value.offset) +
+          "  var offset = " + GenBBAccess() + ".__offset(this.bb_pos, " +
-      ");\n  return offset ? ";
+          NumToString(field.value.offset) + ");\n  return offset ? ";
 
       // Emit a scalar field
       if (IsScalar(field.value.type.base_type) ||
           field.value.type.base_type == BASE_TYPE_STRING) {
-      GenDocComment(field.doc_comment, code_ptr,
+        GenDocComment(
-        std::string(field.value.type.base_type == BASE_TYPE_STRING ?
+            field.doc_comment, code_ptr,
-          "@param {flatbuffers.Encoding=} optionalEncoding\n" : "") +
+            std::string(
-        "@returns {" + GenTypeName(field.value.type, false, true) + "}");
+                field.value.type.base_type == BASE_TYPE_STRING
+                    ? "@param {flatbuffers.Encoding=} optionalEncoding\n"
+                    : "") +
+                "@returns {" + GenTypeName(field.value.type, false, true) +
+                "}");
         if (lang_.language == IDLOptions::kTs) {
           std::string prefix = MakeCamel(field.name, false) + "(";
           if (field.value.type.base_type == BASE_TYPE_STRING) {
             code += prefix + "):string|null\n";
-          code += prefix + "optionalEncoding:flatbuffers.Encoding"+"):" +
+            code += prefix + "optionalEncoding:flatbuffers.Encoding" +
-                  GenTypeName(field.value.type, false, true)+"\n";
+                    "):" + GenTypeName(field.value.type, false, true) + "\n";
             code += prefix + "optionalEncoding?:any";
           } else {
             code += prefix;
           }
           if (field.value.type.enum_def) {
-          code += "):" +
+            code +=
+                "):" +
                 GenPrefixedTypeName(GenTypeName(field.value.type, false, true),
-                                      field.value.type.enum_def->file) + " {\n";
+                                    field.value.type.enum_def->file) +
+                " {\n";
           } else {
             code += "):" + GenTypeName(field.value.type, false, true) + " {\n";
           }
@@ -708,15 +692,19 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
         }
 
         if (struct_def.fixed) {
-        code += "  return " + GenGetter(field.value.type, "(this.bb_pos" +
+          code +=
-          MaybeAdd(field.value.offset) + ")") + ";\n";
+              "  return " +
+              GenGetter(field.value.type,
+                        "(this.bb_pos" + MaybeAdd(field.value.offset) + ")") +
+              ";\n";
         } else {
           std::string index = "this.bb_pos + offset";
           if (field.value.type.base_type == BASE_TYPE_STRING) {
             index += ", optionalEncoding";
           }
-        code += offset_prefix + GenGetter(field.value.type,
+          code += offset_prefix +
-          "(" + index + ")") + " : " + GenDefaultValue(field.value, GenBBAccess());
+                  GenGetter(field.value.type, "(" + index + ")") + " : " +
+                  GenDefaultValue(field.value, GenBBAccess());
           code += ";\n";
         }
       }
@@ -726,21 +714,25 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
         switch (field.value.type.base_type) {
           case BASE_TYPE_STRUCT: {
             auto type = WrapInNameSpace(*field.value.type.struct_def);
-          GenDocComment(field.doc_comment, code_ptr,
+            GenDocComment(
+                field.doc_comment, code_ptr,
                 "@param {" + type + "=} obj\n@returns {" + type + "|null}");
             if (lang_.language == IDLOptions::kTs) {
-            type = GenPrefixedTypeName(type, field.value.type.struct_def->file);
+              type =
+                  GenPrefixedTypeName(type, field.value.type.struct_def->file);
               code += MakeCamel(field.name, false);
               code += "(obj?:" + type + "):" + type + "|null {\n";
             } else {
-            code += object_name + ".prototype." + MakeCamel(field.name, false);
+              code +=
+                  object_name + ".prototype." + MakeCamel(field.name, false);
               code += " = function(obj) {\n";
             }
 
             if (struct_def.fixed) {
               code += "  return (obj || new " + type;
               code += ").__init(this.bb_pos";
-            code += MaybeAdd(field.value.offset) + ", " + GenBBAccess() + ");\n";
+              code +=
+                  MaybeAdd(field.value.offset) + ", " + GenBBAccess() + ");\n";
             } else {
               code += offset_prefix + "(obj || new " + type + ").__init(";
               code += field.value.type.struct_def->fixed
@@ -760,7 +752,8 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
             auto vectortype = field.value.type.VectorType();
             auto vectortypename = GenTypeName(vectortype, false);
             auto inline_size = InlineSize(vectortype);
-          auto index = GenBBAccess() + ".__vector(this.bb_pos + offset) + index" +
+            auto index = GenBBAccess() +
+                         ".__vector(this.bb_pos + offset) + index" +
                          MaybeScale(inline_size);
             std::string args = "@param {number} index\n";
             std::string ret_type;
@@ -779,36 +772,34 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
                 ret_type = "?flatbuffers.Table";
                 is_union = true;
                 break;
-            default:
+              default: ret_type = vectortypename;
-              ret_type = vectortypename;
             }
-          GenDocComment(field.doc_comment, code_ptr, args +
+            GenDocComment(field.doc_comment, code_ptr,
-            "@returns {" + ret_type + "}");
+                          args + "@returns {" + ret_type + "}");
             if (lang_.language == IDLOptions::kTs) {
               std::string prefix = MakeCamel(field.name, false);
-            if (is_union) {
+              if (is_union) { prefix += "<T extends flatbuffers.Table>"; }
-              prefix += "<T extends flatbuffers.Table>";
-            }
               prefix += "(index: number";
               if (is_union) {
                 vectortypename = "T";
                 code += prefix + ", obj:T";
               } else if (vectortype.base_type == BASE_TYPE_STRUCT) {
-              vectortypename = GenPrefixedTypeName(vectortypename,
+                vectortypename = GenPrefixedTypeName(
-                                                   vectortype.struct_def->file);
+                    vectortypename, vectortype.struct_def->file);
                 code += prefix + ", obj?:" + vectortypename;
                 imported_files.insert(vectortype.struct_def->file);
               } else if (vectortype.base_type == BASE_TYPE_STRING) {
                 code += prefix + "):string\n";
-              code += prefix + ",optionalEncoding:flatbuffers.Encoding" + "):" +
+                code += prefix + ",optionalEncoding:flatbuffers.Encoding" +
-                      vectortypename + "\n";
+                        "):" + vectortypename + "\n";
                 code += prefix + ",optionalEncoding?:any";
               } else {
                 code += prefix;
               }
               code += "):" + vectortypename + "|null {\n";
             } else {
-            code += object_name + ".prototype." + MakeCamel(field.name, false);
+              code +=
+                  object_name + ".prototype." + MakeCamel(field.name, false);
               code += " = function(index";
               if (vectortype.base_type == BASE_TYPE_STRUCT || is_union) {
                 code += ", obj";
@@ -862,32 +853,32 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
               code += MakeCamel(field.name, false);
               code += "<T extends flatbuffers.Table>(obj:T):T|null {\n";
             } else {
-            code += object_name + ".prototype." + MakeCamel(field.name, false);
+              code +=
+                  object_name + ".prototype." + MakeCamel(field.name, false);
               code += " = function(obj) {\n";
             }
 
-          code += offset_prefix + GenGetter(field.value.type,
+            code += offset_prefix +
-            "(obj, this.bb_pos + offset)") + " : null;\n";
+                    GenGetter(field.value.type, "(obj, this.bb_pos + offset)") +
+                    " : null;\n";
             break;
 
-        default:
+          default: assert(0);
-          assert(0);
         }
       }
       code += "};\n\n";
 
-    if(parser_.opts.use_goog_js_export_format) {
+      if (parser_.opts.use_goog_js_export_format) {
         exports += "goog.exportProperty(" + object_name + ".prototype, '" +
-        MakeCamel(field.name, false) + "', " + object_name + ".prototype." +
+                   MakeCamel(field.name, false) + "', " + object_name +
-        MakeCamel(field.name, false) + ");\n";
+                   ".prototype." + MakeCamel(field.name, false) + ");\n";
       }
 
       // Adds the mutable scalar value to the output
       if (IsScalar(field.value.type.base_type) && parser.opts.mutable_buffer) {
         std::string annotations =
             "@param {" + GenTypeName(field.value.type, true) + "} value\n";
-      GenDocComment(code_ptr, annotations +
+        GenDocComment(code_ptr, annotations + "@returns {boolean}");
-        "@returns {boolean}");
 
         if (lang_.language == IDLOptions::kTs) {
           std::string type;
@@ -912,7 +903,8 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
 
         // special case for bools, which are treated as uint8
         code += "  " + GenBBAccess() + ".write" +
-        MakeCamel(GenType(field.value.type)) + "(this.bb_pos + offset, ";
+                MakeCamel(GenType(field.value.type)) +
+                "(this.bb_pos + offset, ";
         if (field.value.type.base_type == BASE_TYPE_BOOL &&
             lang_.language == IDLOptions::kTs) {
           code += "+";
@@ -922,7 +914,7 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
         code += "  return true;\n";
         code += "};\n\n";
 
-      if(parser_.opts.use_goog_js_export_format) {
+        if (parser_.opts.use_goog_js_export_format) {
           exports += "goog.exportProperty(" + object_name +
                      ".prototype, 'mutate_" + field.name + "', " + object_name +
                      ".prototype.mutate_" + field.name + ");\n";
@@ -941,18 +933,21 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
           code += "Length = function() {\n" + offset_prefix;
         }
 
-      code += GenBBAccess() + ".__vector_len(this.bb_pos + offset) : 0;\n};\n\n";
+        code +=
+            GenBBAccess() + ".__vector_len(this.bb_pos + offset) : 0;\n};\n\n";
 
-      if(parser_.opts.use_goog_js_export_format) {
+        if (parser_.opts.use_goog_js_export_format) {
           exports += "goog.exportProperty(" + object_name + ".prototype, '" +
                      MakeCamel(field.name, false) + "Length', " + object_name +
-          ".prototype." + MakeCamel(field.name, false) + "Length);\n";
+                     ".prototype." + MakeCamel(field.name, false) +
+                     "Length);\n";
         }
 
         // For scalar types, emit a typed array helper
         auto vectorType = field.value.type.VectorType();
         if (IsScalar(vectorType.base_type) && !IsLong(vectorType.base_type)) {
-        GenDocComment(code_ptr, "@returns {" + GenType(vectorType) + "Array}");
+          GenDocComment(code_ptr,
+                        "@returns {" + GenType(vectorType) + "Array}");
 
           if (lang_.language == IDLOptions::kTs) {
             code += MakeCamel(field.name, false);
@@ -964,14 +959,16 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
           }
 
           code += "new " + GenType(vectorType) + "Array(" + GenBBAccess() +
-          ".bytes().buffer, " + GenBBAccess() + ".bytes().byteOffset + " +
+                  ".bytes().buffer, " + GenBBAccess() +
-          GenBBAccess() + ".__vector(this.bb_pos + offset), " +
+                  ".bytes().byteOffset + " + GenBBAccess() +
-          GenBBAccess() + ".__vector_len(this.bb_pos + offset)) : null;\n};\n\n";
+                  ".__vector(this.bb_pos + offset), " + GenBBAccess() +
+                  ".__vector_len(this.bb_pos + offset)) : null;\n};\n\n";
 
-        if(parser_.opts.use_goog_js_export_format) {
+          if (parser_.opts.use_goog_js_export_format) {
             exports += "goog.exportProperty(" + object_name + ".prototype, '" +
                        MakeCamel(field.name, false) + "Array', " + object_name +
-            ".prototype." + MakeCamel(field.name, false) + "Array);\n";
+                       ".prototype." + MakeCamel(field.name, false) +
+                       "Array);\n";
           }
         }
       }
@@ -982,14 +979,15 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
       std::string annotations = "@param {flatbuffers.Builder} builder\n";
       std::string arguments;
       GenStructArgs(struct_def, &annotations, &arguments, "");
-    GenDocComment(code_ptr, annotations +
+      GenDocComment(code_ptr, annotations + "@returns {flatbuffers.Offset}");
-      "@returns {flatbuffers.Offset}");
 
       if (lang_.language == IDLOptions::kTs) {
-      code += "static create" + struct_def.name + "(builder:flatbuffers.Builder";
+        code +=
+            "static create" + struct_def.name + "(builder:flatbuffers.Builder";
         code += arguments + "):flatbuffers.Offset {\n";
       } else {
-      code += object_name + ".create" + struct_def.name + " = function(builder";
+        code +=
+            object_name + ".create" + struct_def.name + " = function(builder";
         code += arguments + ") {\n";
       }
 
@@ -997,8 +995,7 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
       code += "  return builder.offset();\n};\n\n";
     } else {
       // Generate a method to start building a new object
-    GenDocComment(code_ptr,
+      GenDocComment(code_ptr, "@param {flatbuffers.Builder} builder");
-      "@param {flatbuffers.Builder} builder");
 
       if (lang_.language == IDLOptions::kTs) {
         code += "static start" + struct_def.name;
@@ -1008,8 +1005,8 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
         code += " = function(builder) {\n";
       }
 
-    code += "  builder.startObject(" + NumToString(
+      code += "  builder.startObject(" +
-      struct_def.fields.vec.size()) + ");\n";
+              NumToString(struct_def.fields.vec.size()) + ");\n";
       code += "};\n\n";
 
       // Generate a set of static methods that allow table construction
@@ -1018,15 +1015,13 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
         auto &field = **it;
         if (field.deprecated) continue;
         auto argname = MakeCamel(field.name, false);
-      if (!IsScalar(field.value.type.base_type)) {
+        if (!IsScalar(field.value.type.base_type)) { argname += "Offset"; }
-        argname += "Offset";
-      }
 
         // Generate the field insertion method
         GenDocComment(code_ptr,
                       "@param {flatbuffers.Builder} builder\n"
-        "@param {" + GenTypeName(field.value.type, true) + "} " +
+                      "@param {" +
-        argname);
+                          GenTypeName(field.value.type, true) + "} " + argname);
 
         if (lang_.language == IDLOptions::kTs) {
           std::string argType;
@@ -1047,16 +1042,12 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
 
         code += "  builder.addField" + GenWriteMethod(field.value.type) + "(";
         code += NumToString(it - struct_def.fields.vec.begin()) + ", ";
-      if (field.value.type.base_type == BASE_TYPE_BOOL) {
+        if (field.value.type.base_type == BASE_TYPE_BOOL) { code += "+"; }
-        code += "+";
-      }
         code += argname + ", ";
         if (!IsScalar(field.value.type.base_type)) {
           code += "0";
         } else {
-        if (field.value.type.base_type == BASE_TYPE_BOOL) {
+          if (field.value.type.base_type == BASE_TYPE_BOOL) { code += "+"; }
-          code += "+";
-        }
           code += GenDefaultValue(field.value, "builder");
         }
         code += ");\n};\n\n";
@@ -1070,16 +1061,15 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
           if (!IsStruct(vector_type)) {
             GenDocComment(code_ptr,
                           "@param {flatbuffers.Builder} builder\n"
-            "@param {Array.<" + GenTypeName(vector_type, true) +
+                          "@param {Array.<" +
+                              GenTypeName(vector_type, true) +
                               ">} data\n"
                               "@returns {flatbuffers.Offset}");
 
             if (lang_.language == IDLOptions::kTs) {
               code += "static create" + MakeCamel(field.name);
               std::string type = GenTypeName(vector_type, true) + "[]";
-            if (type == "number[]") {
+              if (type == "number[]") { type += " | Uint8Array"; }
-              type += " | Uint8Array";
-            }
               code += "Vector(builder:flatbuffers.Builder, data:" + type +
                       "):flatbuffers.Offset {\n";
             } else {
@@ -1091,16 +1081,15 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
             code += ", data.length, " + NumToString(alignment) + ");\n";
             code += "  for (var i = data.length - 1; i >= 0; i--) {\n";
             code += "    builder.add" + GenWriteMethod(vector_type) + "(";
-          if (vector_type.base_type == BASE_TYPE_BOOL) {
+            if (vector_type.base_type == BASE_TYPE_BOOL) { code += "+"; }
-            code += "+";
-          }
             code += "data[i]);\n";
             code += "  }\n";
             code += "  return builder.endVector();\n";
             code += "};\n\n";
           }
 
-        // Generate a method to start a vector, data to be added manually after
+          // Generate a method to start a vector, data to be added manually
+          // after
           GenDocComment(code_ptr,
                         "@param {flatbuffers.Builder} builder\n"
                         "@param {number} numElems");
@@ -1153,7 +1142,8 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
 
         if (lang_.language == IDLOptions::kTs) {
           code += "static finish" + struct_def.name + "Buffer";
-        code += "(builder:flatbuffers.Builder, offset:flatbuffers.Offset) {\n";
+          code +=
+              "(builder:flatbuffers.Builder, offset:flatbuffers.Offset) {\n";
         } else {
           code += object_name + ".finish" + struct_def.name + "Buffer";
           code += " = function(builder, offset) {\n";
@@ -1169,12 +1159,10 @@ void GenStruct(const Parser &parser, StructDef &struct_def,
     }
 
     if (lang_.language == IDLOptions::kTs) {
-    if (!object_namespace.empty()) {
+      if (!object_namespace.empty()) { code += "}\n"; }
       code += "}\n";
     }
-    code += "}\n";
   }
-}
 };
 }  // namespace js
 
@@ -1184,22 +1172,20 @@ bool GenerateJS(const Parser &parser, const std::string &path,
   return generator.generate();
 }
 
-std::string JSMakeRule(const Parser &parser,
+std::string JSMakeRule(const Parser &parser, const std::string &path,
-                       const std::string &path,
                        const std::string &file_name) {
   assert(parser.opts.lang <= IDLOptions::kMAX);
   const auto &lang = GetJsLangParams(parser.opts.lang);
 
-  std::string filebase = flatbuffers::StripPath(
+  std::string filebase =
-      flatbuffers::StripExtension(file_name));
+      flatbuffers::StripPath(flatbuffers::StripExtension(file_name));
   std::string make_rule = GeneratedFileName(path, filebase, lang) + ": ";
 
   auto included_files = parser.GetIncludedFilesRecursive(file_name);
-  for (auto it = included_files.begin();
+  for (auto it = included_files.begin(); it != included_files.end(); ++it) {
-       it != included_files.end(); ++it) {
     make_rule += " " + *it;
   }
-return make_rule;
+  return make_rule;
 }
 
 }  // namespace flatbuffers

src/idl_gen_json_schema.cpp

@@ -1,23 +1,23 @@
 /*
-* Copyright 2014 Google Inc. All rights reserved.
+ * Copyright 2014 Google Inc. All rights reserved.
-*
+ *
-* Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
+ * You may obtain a copy of the License at
-*
+ *
-*     http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
-*
+ *
-* Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
-* limitations under the License.
+ * limitations under the License.
-*/
+ */
 
+#include <iostream>
 #include "flatbuffers/code_generators.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
-#include <iostream>
 
 namespace flatbuffers {
 
@@ -30,8 +30,7 @@ namespace jsons {
 
 std::string GenNativeType(BaseType type) {
   switch (type) {
-    case BASE_TYPE_BOOL:
+    case BASE_TYPE_BOOL: return "boolean";
-      return "boolean";
     case BASE_TYPE_CHAR:
     case BASE_TYPE_UCHAR:
     case BASE_TYPE_SHORT:
@@ -41,16 +40,13 @@ std::string GenNativeType(BaseType type) {
     case BASE_TYPE_LONG:
     case BASE_TYPE_ULONG:
     case BASE_TYPE_FLOAT:
-    case BASE_TYPE_DOUBLE:
+    case BASE_TYPE_DOUBLE: return "number";
-      return "number";
+    case BASE_TYPE_STRING: return "string";
-    case BASE_TYPE_STRING:
+    default: return "";
-      return "string";
-    default:
-      return "";
   }
 }
 
-template <class T> std::string GenFullName(const T *enum_def) {
+template<class T> std::string GenFullName(const T *enum_def) {
   std::string full_name;
   const auto &name_spaces = enum_def->defined_namespace->components;
   for (auto ns = name_spaces.cbegin(); ns != name_spaces.cend(); ++ns) {
@@ -60,7 +56,7 @@ template <class T> std::string GenFullName(const T *enum_def) {
   return full_name;
 }
 
-template <class T> std::string GenTypeRef(const T *enum_def) {
+template<class T> std::string GenTypeRef(const T *enum_def) {
   return "\"$ref\" : \"#/definitions/" + GenFullName(enum_def) + "\"";
 }
 
@@ -93,11 +89,10 @@ std::string GenType(const Type &type) {
       const auto &union_types = type.enum_def->vals.vec;
       for (auto ut = union_types.cbegin(); ut < union_types.cend(); ++ut) {
         auto &union_type = *ut;
-        if (union_type->union_type.base_type == BASE_TYPE_NONE) {
+        if (union_type->union_type.base_type == BASE_TYPE_NONE) { continue; }
-          continue;
-        }
         if (union_type->union_type.base_type == BASE_TYPE_STRUCT) {
-          union_type_string.append("{ " + GenTypeRef(union_type->union_type.struct_def) + " }");
+          union_type_string.append(
+              "{ " + GenTypeRef(union_type->union_type.struct_def) + " }");
         }
         if (union_type != *type.enum_def->vals.vec.rbegin()) {
           union_type_string.append(",");
@@ -106,10 +101,8 @@ std::string GenType(const Type &type) {
       union_type_string.append("]");
       return union_type_string;
     }
-    case BASE_TYPE_UTYPE:
+    case BASE_TYPE_UTYPE: return GenTypeRef(type.enum_def);
-      return GenTypeRef(type.enum_def);
+    default: return GenType(GenNativeType(type.base_type));
-    default:
-      return GenType(GenNativeType(type.base_type));
   }
 }
 
@@ -130,35 +123,29 @@ class JsonSchemaGenerator : public BaseGenerator {
     code_ += "{";
     code_ += "  \"$schema\": \"http://json-schema.org/draft-04/schema#\",";
     code_ += "  \"definitions\": {";
-    for (auto e = parser_.enums_.vec.cbegin();
+    for (auto e = parser_.enums_.vec.cbegin(); e != parser_.enums_.vec.cend();
-         e != parser_.enums_.vec.cend();
          ++e) {
       code_ += "    \"" + GenFullName(*e) + "\" : {";
       code_ += "      " + GenType("string") + ",";
       std::string enumdef("      \"enum\": [");
       for (auto enum_value = (*e)->vals.vec.begin();
-           enum_value != (*e)->vals.vec.end();
+           enum_value != (*e)->vals.vec.end(); ++enum_value) {
-           ++enum_value) {
         enumdef.append("\"" + (*enum_value)->name + "\"");
-        if (*enum_value != (*e)->vals.vec.back()) {
+        if (*enum_value != (*e)->vals.vec.back()) { enumdef.append(", "); }
-          enumdef.append(", ");
-        }
       }
       enumdef.append("]");
       code_ += enumdef;
       code_ += "    },";  // close type
     }
     for (auto s = parser_.structs_.vec.cbegin();
-         s != parser_.structs_.vec.cend();
+         s != parser_.structs_.vec.cend(); ++s) {
-         ++s) {
       const auto &structure = *s;
       code_ += "    \"" + GenFullName(structure) + "\" : {";
       code_ += "      " + GenType("object") + ",";
       std::string comment;
       const auto &comment_lines = structure->doc_comment;
       for (auto comment_line = comment_lines.cbegin();
-           comment_line != comment_lines.cend();
+           comment_line != comment_lines.cend(); ++comment_line) {
-           ++comment_line) {
         comment.append(*comment_line);
       }
       if (comment.size() > 0) {
@@ -169,10 +156,9 @@ class JsonSchemaGenerator : public BaseGenerator {
       const auto &properties = structure->fields.vec;
       for (auto prop = properties.cbegin(); prop != properties.cend(); ++prop) {
         const auto &property = *prop;
-        std::string typeLine("        \"" + property->name + "\" : { " + GenType(property->value.type) + " }");
+        std::string typeLine("        \"" + property->name + "\" : { " +
-        if (property != properties.back()) {
+                             GenType(property->value.type) + " }");
-          typeLine.append(",");
+        if (property != properties.back()) { typeLine.append(","); }
-        }          
         code_ += typeLine;
       }
       code_ += "      },";  // close properties
@@ -184,8 +170,7 @@ class JsonSchemaGenerator : public BaseGenerator {
       if (requiredProperties.size() > 0) {
         std::string required_string("      \"required\" : [");
         for (auto req_prop = requiredProperties.cbegin();
-             req_prop != requiredProperties.cend();
+             req_prop != requiredProperties.cend(); ++req_prop) {
-             ++req_prop) {
           required_string.append("\"" + (*req_prop)->name + "\"");
           if (*req_prop != requiredProperties.back()) {
             required_string.append(", ");
@@ -196,9 +181,7 @@ class JsonSchemaGenerator : public BaseGenerator {
       }
       code_ += "      \"additionalProperties\" : false";
       std::string closeType("    }");
-      if (*s != parser_.structs_.vec.back()) {
+      if (*s != parser_.structs_.vec.back()) { closeType.append(","); }
-        closeType.append(",");
-      }
       code_ += closeType;  // close type
     }
     code_ += "  },";  // close definitions

src/idl_gen_php.cpp

@@ -1,33 +1,33 @@
 /*
-* Copyright 2014 Google Inc. All rights reserved.
+ * Copyright 2014 Google Inc. All rights reserved.
-*
+ *
-* Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
+ * You may obtain a copy of the License at
-*
+ *
-*     http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
-*
+ *
-* Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
-* limitations under the License.
+ * limitations under the License.
-*/
+ */
 
 // independent from idl_parser, since this code is not needed for most clients
 
 #include <string>
 
+#include "flatbuffers/code_generators.h"
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
-#include "flatbuffers/code_generators.h"
 
 namespace flatbuffers {
 namespace php {
-    // Hardcode spaces per indentation.
+// Hardcode spaces per indentation.
-    const std::string Indent = "    ";
+const std::string Indent = "    ";
-    class PhpGenerator : public BaseGenerator {
+class PhpGenerator : public BaseGenerator {
  public:
   PhpGenerator(const Parser &parser, const std::string &path,
                const std::string &file_name)
@@ -40,8 +40,8 @@ namespace php {
 
  private:
   bool generateEnums() {
-        for (auto it = parser_.enums_.vec.begin();
+    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
-             it != parser_.enums_.vec.end(); ++it) {
+         ++it) {
       auto &enum_def = **it;
       std::string enumcode;
       GenEnum(enum_def, &enumcode);
@@ -62,8 +62,8 @@ namespace php {
   }
 
   // Begin by declaring namespace and imports.
-      void BeginFile(const std::string name_space_name,
+  void BeginFile(const std::string name_space_name, const bool needs_imports,
-                     const bool needs_imports, std::string *code_ptr) {
+                 std::string *code_ptr) {
     std::string &code = *code_ptr;
     code += "<?php\n";
     code = code + "// " + FlatBuffersGeneratedWarning() + "\n\n";
@@ -87,12 +87,12 @@ namespace php {
     if (!classcode.length()) return true;
 
     std::string code = "";
-        BeginFile(FullNamespace("\\", *def.defined_namespace),
+    BeginFile(FullNamespace("\\", *def.defined_namespace), needs_imports,
-                  needs_imports, &code);
+              &code);
     code += classcode;
 
-        std::string filename = NamespaceDir(*def.defined_namespace) +
+    std::string filename =
-                               def.name + ".php";
+        NamespaceDir(*def.defined_namespace) + def.name + ".php";
     return SaveFile(filename.c_str(), code, false);
   }
 
@@ -173,8 +173,7 @@ namespace php {
   }
 
   // Get the length of a vector.
-    static void GetVectorLen(const FieldDef &field,
+  static void GetVectorLen(const FieldDef &field, std::string *code_ptr) {
-      std::string *code_ptr) {
     std::string &code = *code_ptr;
 
     code += Indent + "/**\n";
@@ -191,8 +190,7 @@ namespace php {
   }
 
   // Get a [ubyte] vector as a byte array.
-    static void GetUByte(const FieldDef &field,
+  static void GetUByte(const FieldDef &field, std::string *code_ptr) {
-      std::string *code_ptr) {
     std::string &code = *code_ptr;
 
     code += Indent + "/**\n";
@@ -242,10 +240,9 @@ namespace php {
     code += MakeCamel(field.name);
     code += "()\n";
     code += Indent + "{\n";
-      code += Indent + Indent +
+    code += Indent + Indent + "$o = $this->__offset(" +
-        "$o = $this->__offset(" +
+            NumToString(field.value.offset) + ");\n" + Indent + Indent +
-        NumToString(field.value.offset) +
+            "return $o != 0 ? ";
-        ");\n" + Indent + Indent + "return $o != 0 ? ";
     code += "$this->bb->get";
     code += MakeCamel(GenTypeGet(field.value.type)) + "($o + $this->bb_pos)";
     code += " : " + GenDefaultValue(field.value) + ";\n";
@@ -282,14 +279,11 @@ namespace php {
     code += Indent + "{\n";
     code += Indent + Indent + "$obj = new ";
     code += MakeCamel(GenTypeGet(field.value.type)) + "();\n";
-      code += Indent + Indent +
+    code += Indent + Indent + "$o = $this->__offset(" +
-        "$o = $this->__offset(" +
+            NumToString(field.value.offset) + ");\n";
-        NumToString(field.value.offset) +
-        ");\n";
     code += Indent + Indent;
     code += "return $o != 0 ? $obj->init(";
-      if (field.value.type.struct_def->fixed)
+    if (field.value.type.struct_def->fixed) {
-      {
       code += "$o + $this->bb_pos, $this->bb) : ";
     } else {
       code += "$this->__indirect($o + $this->bb_pos), $this->bb) : ";
@@ -305,10 +299,8 @@ namespace php {
     code += MakeCamel(field.name);
     code += "()\n";
     code += Indent + "{\n";
-      code += Indent + Indent +
+    code += Indent + Indent + "$o = $this->__offset(" +
-        "$o = $this->__offset(" +
+            NumToString(field.value.offset) + ");\n";
-        NumToString(field.value.offset) +
-        ");\n";
     code += Indent + Indent;
     code += "return $o != 0 ? $this->__string($o + $this->bb_pos) : ";
     code += GenDefaultValue(field.value) + ";\n";
@@ -325,10 +317,8 @@ namespace php {
     code += Indent + "public function get";
     code += MakeCamel(field.name) + "($obj)\n";
     code += Indent + "{\n";
-      code += Indent + Indent +
+    code += Indent + Indent + "$o = $this->__offset(" +
-        "$o = $this->__offset(" +
+            NumToString(field.value.offset) + ");\n";
-        NumToString(field.value.offset) +
-        ");\n";
     code += Indent + Indent;
     code += "return $o != 0 ? $this->__union($obj, $o) : null;\n";
     code += Indent + "}\n\n";
@@ -347,10 +337,8 @@ namespace php {
     code += MakeCamel(field.name);
     code += "($j)\n";
     code += Indent + "{\n";
-      code += Indent + Indent +
+    code += Indent + Indent + "$o = $this->__offset(" +
-        "$o = $this->__offset(" +
+            NumToString(field.value.offset) + ");\n";
-        NumToString(field.value.offset) +
-        ");\n";
     code += Indent + Indent + "$obj = new ";
     code += MakeCamel(GenTypeGet(field.value.type)) + "();\n";
 
@@ -358,8 +346,8 @@ namespace php {
       case BASE_TYPE_STRUCT:
         if (struct_def.fixed) {
           code += Indent + Indent;
-          code += "return $o != 0 ? $obj->init($this->bb_pos +"
+          code += "return $o != 0 ? $obj->init($this->bb_pos +" +
-            + NumToString(field.value.offset) + ", $this->bb) : null;\n";
+                  NumToString(field.value.offset) + ", $this->bb) : null;\n";
         } else {
           code += Indent + Indent + "return $o != 0 ? $obj->init(";
           code += field.value.type.struct_def->fixed
@@ -389,8 +377,7 @@ namespace php {
         code += Indent + Indent + "return $o != 0 ? $this->";
         code += GenGetter(field.value.type) + "($obj, $o); null;\n";
         break;
-      default:
+      default: break;
-        break;
     }
 
     code += Indent + "}\n\n";
@@ -411,10 +398,8 @@ namespace php {
     code += MakeCamel(field.name);
     code += "($j)\n";
     code += Indent + "{\n";
-      code += Indent + Indent +
+    code += Indent + Indent + "$o = $this->__offset(" +
-        "$o = $this->__offset(" +
+            NumToString(field.value.offset) + ");\n";
-        NumToString(field.value.offset) +
-        ");\n";
 
     if (field.value.type.VectorType().base_type == BASE_TYPE_STRING) {
       code += Indent + Indent;
@@ -433,8 +418,7 @@ namespace php {
 
   // Get the value of a vector's union member. Uses a named return
   // argument to conveniently set the zero value for the result.
-    void GetMemberOfVectorOfUnion(const FieldDef &field,
+  void GetMemberOfVectorOfUnion(const FieldDef &field, std::string *code_ptr) {
-      std::string *code_ptr) {
     std::string &code = *code_ptr;
     auto vectortype = field.value.type.VectorType();
 
@@ -446,10 +430,8 @@ namespace php {
     code += MakeCamel(field.name);
     code += "($j, $obj)\n";
     code += Indent + "{\n";
-      code += Indent + Indent +
+    code += Indent + Indent + "$o = $this->__offset(" +
-        "$o = $this->__offset(" +
+            NumToString(field.value.offset) + ");\n";
-        NumToString(field.value.offset) +
-        ");\n";
     code += Indent + Indent + "return $o != 0 ? ";
     code += "$this->__union($obj, $this->__vector($o) + $j * ";
     code += NumToString(InlineSize(vectortype)) + " - $this->bb_pos) : null;\n";
@@ -459,11 +441,9 @@ namespace php {
   // Recursively generate arguments for a constructor, to deal with nested
   // structs.
   static void StructBuilderArgs(const StructDef &struct_def,
-      const char *nameprefix,
+                                const char *nameprefix, std::string *code_ptr) {
-      std::string *code_ptr) {
     for (auto it = struct_def.fields.vec.begin();
-      it != struct_def.fields.vec.end();
+         it != struct_def.fields.vec.end(); ++it) {
-        ++it) {
       auto &field = **it;
       if (IsStruct(field.value.type)) {
         // Generate arguments for a struct inside a struct. To ensure names
@@ -471,11 +451,10 @@ namespace php {
         // these arguments are constructing
         // a nested struct, prefix the name with the field name.
         StructBuilderArgs(*field.value.type.struct_def,
-            (nameprefix + (field.name + "_")).c_str(),
+                          (nameprefix + (field.name + "_")).c_str(), code_ptr);
-            code_ptr);
       } else {
         std::string &code = *code_ptr;
-          code += (std::string)", $" + nameprefix;
+        code += (std::string) ", $" + nameprefix;
         code += MakeCamel(field.name, false);
       }
     }
@@ -484,15 +463,13 @@ namespace php {
   // Recursively generate struct construction statements and instert manual
   // padding.
   static void StructBuilderBody(const StructDef &struct_def,
-      const char *nameprefix,
+                                const char *nameprefix, std::string *code_ptr) {
-      std::string *code_ptr) {
     std::string &code = *code_ptr;
     code += Indent + Indent + "$builder->prep(";
     code += NumToString(struct_def.minalign) + ", ";
     code += NumToString(struct_def.bytesize) + ");\n";
     for (auto it = struct_def.fields.vec.rbegin();
-      it != struct_def.fields.vec.rend();
+         it != struct_def.fields.vec.rend(); ++it) {
-        ++it) {
       auto &field = **it;
       if (field.padding) {
         code += Indent + Indent + "$builder->pad(";
@@ -500,8 +477,7 @@ namespace php {
       }
       if (IsStruct(field.value.type)) {
         StructBuilderBody(*field.value.type.struct_def,
-            (nameprefix + (field.name + "_")).c_str(),
+                          (nameprefix + (field.name + "_")).c_str(), code_ptr);
-            code_ptr);
       } else {
         code += Indent + Indent + "$builder->put" + GenMethod(field) + "($";
         code += nameprefix + MakeCamel(field.name, false) + ");\n";
@@ -534,15 +510,12 @@ namespace php {
     code += "(FlatBufferBuilder $builder, ";
 
     for (auto it = struct_def.fields.vec.begin();
-      it != struct_def.fields.vec.end();
+         it != struct_def.fields.vec.end(); ++it) {
-        ++it) {
       auto &field = **it;
 
       if (field.deprecated) continue;
       code += "$" + field.name;
-        if (!(it == (--struct_def.fields.vec.end()))) {
+      if (!(it == (--struct_def.fields.vec.end()))) { code += ", "; }
-          code += ", ";
-        }
     }
     code += ")\n";
     code += Indent + "{\n";
@@ -550,8 +523,7 @@ namespace php {
     code += NumToString(struct_def.fields.vec.size());
     code += ");\n";
     for (auto it = struct_def.fields.vec.begin();
-      it != struct_def.fields.vec.end();
+         it != struct_def.fields.vec.end(); ++it) {
-        ++it) {
       auto &field = **it;
       if (field.deprecated) continue;
 
@@ -562,8 +534,7 @@ namespace php {
     code += Indent + Indent + "$o = $builder->endObject();\n";
 
     for (auto it = struct_def.fields.vec.begin();
-      it != struct_def.fields.vec.end();
+         it != struct_def.fields.vec.end(); ++it) {
-        ++it) {
       auto &field = **it;
       if (!field.deprecated && field.required) {
         code += Indent + Indent + "$builder->required($o, ";
@@ -576,12 +547,10 @@ namespace php {
   }
 
   // Set the value of a table's field.
-    static void BuildFieldOfTable(const FieldDef &field,
+  static void BuildFieldOfTable(const FieldDef &field, const size_t offset,
-      const size_t offset,
                                 std::string *code_ptr) {
     std::string &code = *code_ptr;
 
-
     code += Indent + "/**\n";
     code += Indent + " * @param FlatBufferBuilder $builder\n";
     code += Indent + " * @param " + GenTypeBasic(field.value.type) + "\n";
@@ -597,7 +566,6 @@ namespace php {
     code += GenMethod(field) + "X(";
     code += NumToString(offset) + ", ";
 
-
     code += "$" + MakeCamel(field.name, false);
     code += ", ";
 
@@ -611,8 +579,7 @@ namespace php {
   }
 
   // Set the value of one of the members of a table's vector.
-    static void BuildVectorOfTable(const FieldDef &field,
+  static void BuildVectorOfTable(const FieldDef &field, std::string *code_ptr) {
-      std::string *code_ptr) {
     std::string &code = *code_ptr;
 
     auto vector_type = field.value.type.VectorType();
@@ -646,7 +613,6 @@ namespace php {
     code += Indent + Indent + "return $builder->endVector();\n";
     code += Indent + "}\n\n";
 
-
     code += Indent + "/**\n";
     code += Indent + " * @param FlatBufferBuilder $builder\n";
     code += Indent + " * @param int $numElems\n";
@@ -667,7 +633,6 @@ namespace php {
   void GetEndOffsetOnTable(const StructDef &struct_def, std::string *code_ptr) {
     std::string &code = *code_ptr;
 
-
     code += Indent + "/**\n";
     code += Indent + " * @param FlatBufferBuilder $builder\n";
     code += Indent + " * @return int table offset\n";
@@ -677,10 +642,8 @@ namespace php {
     code += Indent + "{\n";
     code += Indent + Indent + "$o = $builder->endObject();\n";
 
-
     for (auto it = struct_def.fields.vec.begin();
-      it != struct_def.fields.vec.end();
+         it != struct_def.fields.vec.end(); ++it) {
-        ++it) {
       auto &field = **it;
       if (!field.deprecated && field.required) {
         code += Indent + Indent + "$builder->required($o, ";
@@ -726,9 +689,7 @@ namespace php {
             GetStructFieldOfTable(field, code_ptr);
           }
           break;
-        case BASE_TYPE_STRING:
+        case BASE_TYPE_STRING: GetStringField(field, code_ptr); break;
-          GetStringField(field, code_ptr);
-          break;
         case BASE_TYPE_VECTOR: {
           auto vectortype = field.value.type.VectorType();
           if (vectortype.base_type == BASE_TYPE_UNION) {
@@ -740,11 +701,8 @@ namespace php {
           }
           break;
         }
-        case BASE_TYPE_UNION:
+        case BASE_TYPE_UNION: GetUnionField(field, code_ptr); break;
-          GetUnionField(field, code_ptr);
+        default: assert(0);
-          break;
-        default:
-          assert(0);
       }
     }
     if (field.value.type.base_type == BASE_TYPE_VECTOR) {
@@ -760,8 +718,7 @@ namespace php {
     GetStartOfTable(struct_def, code_ptr);
 
     for (auto it = struct_def.fields.vec.begin();
-      it != struct_def.fields.vec.end();
+         it != struct_def.fields.vec.end(); ++it) {
-        ++it) {
       auto &field = **it;
       if (field.deprecated) continue;
 
@@ -787,8 +744,7 @@ namespace php {
   }
 
   // Generate struct or table methods.
-    void GenStruct(const StructDef &struct_def,
+  void GenStruct(const StructDef &struct_def, std::string *code_ptr) {
-      std::string *code_ptr) {
     if (struct_def.generated) return;
 
     GenComment(struct_def.doc_comment, code_ptr, nullptr);
@@ -836,8 +792,7 @@ namespace php {
     // accessor object. This is to allow object reuse.
     InitializeExisting(struct_def, code_ptr);
     for (auto it = struct_def.fields.vec.begin();
-      it != struct_def.fields.vec.end();
+         it != struct_def.fields.vec.end(); ++it) {
-        ++it) {
       auto &field = **it;
       if (field.deprecated) continue;
 
@@ -860,8 +815,7 @@ namespace php {
 
     GenComment(enum_def.doc_comment, code_ptr, nullptr);
     BeginEnum(enum_def.name, code_ptr);
-      for (auto it = enum_def.vals.vec.begin();
+    for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
-      it != enum_def.vals.vec.end();
          ++it) {
       auto &ev = **it;
       GenComment(ev.doc_comment, code_ptr, nullptr);
@@ -871,8 +825,8 @@ namespace php {
     std::string &code = *code_ptr;
     code += "\n";
     code += Indent + "private static $names = array(\n";
-      for (auto it = enum_def.vals.vec.begin();
+    for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
-        it != enum_def.vals.vec.end(); ++it) {
+         ++it) {
       auto &ev = **it;
       code += Indent + Indent + "\"" + ev.name + "\",\n";
     }
@@ -895,8 +849,7 @@ namespace php {
       case BASE_TYPE_STRUCT: return "__struct";
       case BASE_TYPE_UNION: return "__union";
       case BASE_TYPE_VECTOR: return GenGetter(type.VectorType());
-      default:
+      default: return "Get";
-        return "Get";
     }
   }
 
@@ -909,11 +862,13 @@ namespace php {
 
   static std::string GenTypeBasic(const Type &type) {
     static const char *ctypename[] = {
-#define FLATBUFFERS_TD(ENUM, IDLTYPE, \
+    // clang-format off
+        #define FLATBUFFERS_TD(ENUM, IDLTYPE, \
             CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
             #NTYPE,
                 FLATBUFFERS_GEN_TYPES(FLATBUFFERS_TD)
-#undef FLATBUFFERS_TD
+        #undef FLATBUFFERS_TD
+      // clang-format on
     };
     return ctypename[type.base_type];
   }
@@ -927,11 +882,9 @@ namespace php {
     }
 
     switch (value.type.base_type) {
-      case BASE_TYPE_BOOL:
+      case BASE_TYPE_BOOL: return value.constant == "0" ? "false" : "true";
-        return value.constant == "0" ? "false" : "true";
 
-      case BASE_TYPE_STRING:
+      case BASE_TYPE_STRING: return "null";
-        return "null";
 
       case BASE_TYPE_LONG:
       case BASE_TYPE_ULONG:
@@ -941,30 +894,23 @@ namespace php {
         }
         return "0";
 
-      default:
+      default: return value.constant;
-        return value.constant;
     }
   }
 
   static std::string GenTypePointer(const Type &type) {
     switch (type.base_type) {
-      case BASE_TYPE_STRING:
+      case BASE_TYPE_STRING: return "string";
-        return "string";
+      case BASE_TYPE_VECTOR: return GenTypeGet(type.VectorType());
-      case BASE_TYPE_VECTOR:
+      case BASE_TYPE_STRUCT: return type.struct_def->name;
-        return GenTypeGet(type.VectorType());
-      case BASE_TYPE_STRUCT:
-        return type.struct_def->name;
       case BASE_TYPE_UNION:
         // fall through
-      default:
+      default: return "Table";
-        return "Table";
     }
   }
 
   static std::string GenTypeGet(const Type &type) {
-      return IsScalar(type.base_type)
+    return IsScalar(type.base_type) ? GenTypeBasic(type) : GenTypePointer(type);
-        ? GenTypeBasic(type)
-        : GenTypePointer(type);
   }
 
   // Create a struct with a builder and the struct's arguments.
@@ -986,13 +932,12 @@ namespace php {
     code += Indent + Indent + "return $builder->offset();\n";
     code += Indent + "}\n";
   }
+};
+}  // namespace php
 
-    };
+bool GeneratePhp(const Parser &parser, const std::string &path,
-    }  // namespace php
-
-    bool GeneratePhp(const Parser &parser, const std::string &path,
                  const std::string &file_name) {
   php::PhpGenerator generator(parser, path, file_name);
   return generator.generate();
-    }
+}
-    }  // namespace flatbuffers
+}  // namespace flatbuffers

src/idl_gen_python.cpp

@@ -18,10 +18,10 @@
 
 #include <string>
 
+#include "flatbuffers/code_generators.h"
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
-#include "flatbuffers/code_generators.h"
 
 namespace flatbuffers {
 namespace python {
@@ -35,7 +35,6 @@ static std::string GenTypeBasic(const Type &type);
 static std::string GenTypeGet(const Type &type);
 static std::string TypeName(const FieldDef &field);
 
-
 // Hardcode spaces per indentation.
 const std::string Indent = "    ";
 
@@ -44,9 +43,8 @@ const std::string Indent = "    ";
 std::string OffsetPrefix(const FieldDef &field) {
   return "\n" + Indent + Indent +
          "o = flatbuffers.number_types.UOffsetTFlags.py_type" +
-         "(self._tab.Offset(" +
+         "(self._tab.Offset(" + NumToString(field.value.offset) + "))\n" +
-         NumToString(field.value.offset) +
+         Indent + Indent + "if o != 0:\n";
-         "))\n" + Indent + Indent + "if o != 0:\n";
 }
 
 // Begin a class declaration.
@@ -109,8 +107,7 @@ static void InitializeExisting(const StructDef &struct_def,
 }
 
 // Get the length of a vector.
-static void GetVectorLen(const StructDef &struct_def,
+static void GetVectorLen(const StructDef &struct_def, const FieldDef &field,
-                         const FieldDef &field,
                          std::string *code_ptr) {
   std::string &code = *code_ptr;
 
@@ -188,8 +185,7 @@ static void GetStructFieldOfTable(const StructDef &struct_def,
 }
 
 // Get the value of a string.
-static void GetStringField(const StructDef &struct_def,
+static void GetStringField(const StructDef &struct_def, const FieldDef &field,
-                           const FieldDef &field,
                            std::string *code_ptr) {
   std::string &code = *code_ptr;
   GenReceiver(struct_def, code_ptr);
@@ -202,8 +198,7 @@ static void GetStringField(const StructDef &struct_def,
 }
 
 // Get the value of a union from an object.
-static void GetUnionField(const StructDef &struct_def,
+static void GetUnionField(const StructDef &struct_def, const FieldDef &field,
-                          const FieldDef &field,
                           std::string *code_ptr) {
   std::string &code = *code_ptr;
   GenReceiver(struct_def, code_ptr);
@@ -284,9 +279,7 @@ static void GetVectorOfNonStructAsNumpy(const StructDef &struct_def,
 
   // Currently, we only support accessing as numpy array if
   // the vector type is a scalar.
-  if (!(IsScalar(vectortype.base_type))) {
+  if (!(IsScalar(vectortype.base_type))) { return; }
-    return;
-  }
 
   GenReceiver(struct_def, code_ptr);
   code += MakeCamel(field.name) + "AsNumpy(self):";
@@ -319,22 +312,19 @@ static void BeginBuilderArgs(const StructDef &struct_def,
 // Recursively generate arguments for a constructor, to deal with nested
 // structs.
 static void StructBuilderArgs(const StructDef &struct_def,
-                              const char *nameprefix,
+                              const char *nameprefix, std::string *code_ptr) {
-                              std::string *code_ptr) {
   for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
+       it != struct_def.fields.vec.end(); ++it) {
-       ++it) {
     auto &field = **it;
     if (IsStruct(field.value.type)) {
       // 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.
       StructBuilderArgs(*field.value.type.struct_def,
-                        (nameprefix + (field.name + "_")).c_str(),
+                        (nameprefix + (field.name + "_")).c_str(), code_ptr);
-                        code_ptr);
     } else {
       std::string &code = *code_ptr;
-      code += (std::string)", " + nameprefix;
+      code += (std::string) ", " + nameprefix;
       code += MakeCamel(field.name, false);
     }
   }
@@ -349,21 +339,18 @@ static void EndBuilderArgs(std::string *code_ptr) {
 // Recursively generate struct construction statements and instert manual
 // padding.
 static void StructBuilderBody(const StructDef &struct_def,
-                              const char *nameprefix,
+                              const char *nameprefix, std::string *code_ptr) {
-                              std::string *code_ptr) {
   std::string &code = *code_ptr;
   code += "    builder.Prep(" + NumToString(struct_def.minalign) + ", ";
   code += NumToString(struct_def.bytesize) + ")\n";
   for (auto it = struct_def.fields.vec.rbegin();
-       it != struct_def.fields.vec.rend();
+       it != struct_def.fields.vec.rend(); ++it) {
-       ++it) {
     auto &field = **it;
     if (field.padding)
       code += "    builder.Pad(" + NumToString(field.padding) + ")\n";
     if (IsStruct(field.value.type)) {
       StructBuilderBody(*field.value.type.struct_def,
-                        (nameprefix + (field.name + "_")).c_str(),
+                        (nameprefix + (field.name + "_")).c_str(), code_ptr);
-                        code_ptr);
     } else {
       code += "    builder.Prepend" + GenMethod(field) + "(";
       code += nameprefix + MakeCamel(field.name, false) + ")\n";
@@ -389,8 +376,7 @@ static void GetStartOfTable(const StructDef &struct_def,
 
 // Set the value of a table's field.
 static void BuildFieldOfTable(const StructDef &struct_def,
-                              const FieldDef &field,
+                              const FieldDef &field, const size_t offset,
-                              const size_t offset,
                               std::string *code_ptr) {
   std::string &code = *code_ptr;
   code += "def " + struct_def.name + "Add" + MakeCamel(field.name);
@@ -413,8 +399,7 @@ static void BuildFieldOfTable(const StructDef &struct_def,
 
 // Set the value of one of the members of a table's vector.
 static void BuildVectorOfTable(const StructDef &struct_def,
-                               const FieldDef &field,
+                               const FieldDef &field, std::string *code_ptr) {
-                               std::string *code_ptr) {
   std::string &code = *code_ptr;
   code += "def " + struct_def.name + "Start";
   code += MakeCamel(field.name);
@@ -445,8 +430,7 @@ static void GenReceiver(const StructDef &struct_def, std::string *code_ptr) {
 
 // Generate a struct field, conditioned on its child type(s).
 static void GenStructAccessor(const StructDef &struct_def,
-                              const FieldDef &field,
+                              const FieldDef &field, std::string *code_ptr) {
-                              std::string *code_ptr) {
   GenComment(field.doc_comment, code_ptr, nullptr, "# ");
   if (IsScalar(field.value.type.base_type)) {
     if (struct_def.fixed) {
@@ -463,9 +447,7 @@ static void GenStructAccessor(const StructDef &struct_def,
           GetStructFieldOfTable(struct_def, field, code_ptr);
         }
         break;
-      case BASE_TYPE_STRING:
+      case BASE_TYPE_STRING: GetStringField(struct_def, field, code_ptr); break;
-        GetStringField(struct_def, field, code_ptr);
-        break;
       case BASE_TYPE_VECTOR: {
         auto vectortype = field.value.type.VectorType();
         if (vectortype.base_type == BASE_TYPE_STRUCT) {
@@ -476,11 +458,8 @@ static void GenStructAccessor(const StructDef &struct_def,
         }
         break;
       }
-      case BASE_TYPE_UNION:
+      case BASE_TYPE_UNION: GetUnionField(struct_def, field, code_ptr); break;
-        GetUnionField(struct_def, field, code_ptr);
+      default: assert(0);
-        break;
-      default:
-        assert(0);
     }
   }
   if (field.value.type.base_type == BASE_TYPE_VECTOR) {
@@ -494,8 +473,7 @@ static void GenTableBuilders(const StructDef &struct_def,
   GetStartOfTable(struct_def, code_ptr);
 
   for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
+       it != struct_def.fields.vec.end(); ++it) {
-       ++it) {
     auto &field = **it;
     if (field.deprecated) continue;
 
@@ -510,8 +488,7 @@ static void GenTableBuilders(const StructDef &struct_def,
 }
 
 // Generate struct or table methods.
-static void GenStruct(const StructDef &struct_def,
+static void GenStruct(const StructDef &struct_def, std::string *code_ptr) {
-                      std::string *code_ptr) {
   if (struct_def.generated) return;
 
   GenComment(struct_def.doc_comment, code_ptr, nullptr, "# ");
@@ -525,8 +502,7 @@ static void GenStruct(const StructDef &struct_def,
   // accessor object. This is to allow object reuse.
   InitializeExisting(struct_def, code_ptr);
   for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
+       it != struct_def.fields.vec.end(); ++it) {
-       ++it) {
     auto &field = **it;
     if (field.deprecated) continue;
 
@@ -548,8 +524,7 @@ static void GenEnum(const EnumDef &enum_def, std::string *code_ptr) {
 
   GenComment(enum_def.doc_comment, code_ptr, nullptr, "# ");
   BeginEnum(enum_def.name, code_ptr);
-  for (auto it = enum_def.vals.vec.begin();
+  for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
-       it != enum_def.vals.vec.end();
        ++it) {
     auto &ev = **it;
     GenComment(ev.doc_comment, code_ptr, nullptr, "# ");
@@ -565,9 +540,8 @@ static std::string GenGetter(const Type &type) {
     case BASE_TYPE_UNION: return "self._tab.Union(";
     case BASE_TYPE_VECTOR: return GenGetter(type.VectorType());
     default:
-      return "self._tab.Get(flatbuffers.number_types." + \
+      return "self._tab.Get(flatbuffers.number_types." +
-             MakeCamel(GenTypeGet(type)) + \
+             MakeCamel(GenTypeGet(type)) + "Flags, ";
-             "Flags, ";
   }
 }
 
@@ -580,34 +554,30 @@ static std::string GenMethod(const FieldDef &field) {
 
 static std::string GenTypeBasic(const Type &type) {
   static const char *ctypename[] = {
+  // clang-format off
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, \
       CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
       #PTYPE,
       FLATBUFFERS_GEN_TYPES(FLATBUFFERS_TD)
     #undef FLATBUFFERS_TD
+    // clang-format on
   };
   return ctypename[type.base_type];
 }
 
 static std::string GenTypePointer(const Type &type) {
   switch (type.base_type) {
-    case BASE_TYPE_STRING:
+    case BASE_TYPE_STRING: return "string";
-      return "string";
+    case BASE_TYPE_VECTOR: return GenTypeGet(type.VectorType());
-    case BASE_TYPE_VECTOR:
+    case BASE_TYPE_STRUCT: return type.struct_def->name;
-      return GenTypeGet(type.VectorType());
-    case BASE_TYPE_STRUCT:
-      return type.struct_def->name;
     case BASE_TYPE_UNION:
       // fall through
-    default:
+    default: return "*flatbuffers.Table";
-      return "*flatbuffers.Table";
   }
 }
 
 static std::string GenTypeGet(const Type &type) {
-  return IsScalar(type.base_type)
+  return IsScalar(type.base_type) ? GenTypeBasic(type) : GenTypePointer(type);
-    ? GenTypeBasic(type)
-    : GenTypePointer(type);
 }
 
 static std::string TypeName(const FieldDef &field) {
@@ -666,9 +636,7 @@ class PythonGenerator : public BaseGenerator {
     std::string &code = *code_ptr;
     code = code + "# " + FlatBuffersGeneratedWarning() + "\n\n";
     code += "# namespace: " + name_space_name + "\n\n";
-    if (needs_imports) {
+    if (needs_imports) { code += "import flatbuffers\n\n"; }
-      code += "import flatbuffers\n\n";
-    }
   }
 
   // Save out the generated code for a Python Table type.
@@ -688,8 +656,8 @@ class PythonGenerator : public BaseGenerator {
     std::string code = "";
     BeginFile(LastNamespacePart(*def.defined_namespace), needs_imports, &code);
     code += classcode;
-    std::string filename = NamespaceDir(*def.defined_namespace) +
+    std::string filename =
-                           def.name + ".py";
+        NamespaceDir(*def.defined_namespace) + def.name + ".py";
     return SaveFile(filename.c_str(), code, false);
   }
 };

src/idl_gen_text.cpp

@@ -17,15 +17,14 @@
 // independent from idl_parser, since this code is not needed for most clients
 
 #include "flatbuffers/flatbuffers.h"
+#include "flatbuffers/flexbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
-#include "flatbuffers/flexbuffers.h"
 
 namespace flatbuffers {
 
 static bool GenStruct(const StructDef &struct_def, const Table *table,
-                      int indent, const IDLOptions &opts,
+                      int indent, const IDLOptions &opts, std::string *_text);
-                      std::string *_text);
 
 // If indentation is less than 0, that indicates we don't want any newlines
 // either.
@@ -33,9 +32,7 @@ const char *NewLine(const IDLOptions &opts) {
   return opts.indent_step >= 0 ? "\n" : "";
 }
 
-int Indent(const IDLOptions &opts) {
+int Indent(const IDLOptions &opts) { return std::max(opts.indent_step, 0); }
-  return std::max(opts.indent_step, 0);
-}
 
 // Output an identifier with or without quotes depending on strictness.
 void OutputIdentifier(const std::string &name, const IDLOptions &opts,
@@ -49,10 +46,9 @@ void OutputIdentifier(const std::string &name, const IDLOptions &opts,
 // Print (and its template specialization below for pointers) generate text
 // for a single FlatBuffer value into JSON format.
 // The general case for scalars:
-template<typename T> bool Print(T val, Type type, int /*indent*/,
+template<typename T>
-                                Type * /*union_type*/,
+bool Print(T val, Type type, int /*indent*/, Type * /*union_type*/,
-                                const IDLOptions &opts,
+           const IDLOptions &opts, std::string *_text) {
-                                std::string *_text) {
   std::string &text = *_text;
   if (type.enum_def && opts.output_enum_identifiers) {
     auto enum_val = type.enum_def->ReverseLookup(static_cast<int>(val));
@@ -72,9 +68,9 @@ template<typename T> bool Print(T val, Type type, int /*indent*/,
 }
 
 // Print a vector a sequence of JSON values, comma separated, wrapped in "[]".
-template<typename T> bool PrintVector(const Vector<T> &v, Type type,
+template<typename T>
-                                      int indent, const IDLOptions &opts,
+bool PrintVector(const Vector<T> &v, Type type, int indent,
-                                      std::string *_text) {
+                 const IDLOptions &opts, std::string *_text) {
   std::string &text = *_text;
   text += "[";
   text += NewLine(opts);
@@ -90,8 +86,7 @@ template<typename T> bool PrintVector(const Vector<T> &v, Type type,
         return false;
       }
     } else {
-      if (!Print(v[i], type, indent + Indent(opts), nullptr,
+      if (!Print(v[i], type, indent + Indent(opts), nullptr, opts, _text)) {
-                 opts, _text)) {
         return false;
       }
     }
@@ -103,10 +98,9 @@ template<typename T> bool PrintVector(const Vector<T> &v, Type type,
 }
 
 // Specialization of Print above for pointer types.
-template<> bool Print<const void *>(const void *val,
+template<>
-                                    Type type, int indent,
+bool Print<const void *>(const void *val, Type type, int indent,
-                                    Type *union_type,
+                         Type *union_type, const IDLOptions &opts,
-                                    const IDLOptions &opts,
                          std::string *_text) {
   switch (type.base_type) {
     case BASE_TYPE_UNION:
@@ -116,11 +110,8 @@ template<> bool Print<const void *>(const void *val,
       return Print<const void *>(val, *union_type, indent, nullptr, opts,
                                  _text);
     case BASE_TYPE_STRUCT:
-      if (!GenStruct(*type.struct_def,
+      if (!GenStruct(*type.struct_def, reinterpret_cast<const Table *>(val),
-                     reinterpret_cast<const Table *>(val),
+                     indent, opts, _text)) {
-                     indent,
-                     opts,
-                     _text)) {
         return false;
       }
       break;
@@ -135,6 +126,7 @@ template<> bool Print<const void *>(const void *val,
       type = type.VectorType();
       // Call PrintVector above specifically for each element type:
       switch (type.base_type) {
+        // clang-format off
         #define FLATBUFFERS_TD(ENUM, IDLTYPE, \
           CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
           case BASE_TYPE_ ## ENUM: \
@@ -146,6 +138,7 @@ template<> bool Print<const void *>(const void *val,
             break;
           FLATBUFFERS_GEN_TYPES(FLATBUFFERS_TD)
         #undef FLATBUFFERS_TD
+        // clang-format on
       }
       break;
     default: assert(0);
@@ -154,31 +147,28 @@ template<> bool Print<const void *>(const void *val,
 }
 
 // Generate text for a scalar field.
-template<typename T> static bool GenField(const FieldDef &fd,
+template<typename T>
-                                          const Table *table, bool fixed,
+static bool GenField(const FieldDef &fd, const Table *table, bool fixed,
-                                          const IDLOptions &opts,
+                     const IDLOptions &opts, int indent, std::string *_text) {
-                                          int indent,
+  return Print(fixed ? reinterpret_cast<const Struct *>(table)->GetField<T>(
-                                          std::string *_text) {
+                           fd.value.offset)
-  return Print(fixed ?
+                     : table->GetField<T>(fd.value.offset, 0),
-    reinterpret_cast<const Struct *>(table)->GetField<T>(fd.value.offset) :
+               fd.value.type, indent, nullptr, opts, _text);
-    table->GetField<T>(fd.value.offset, 0), fd.value.type, indent, nullptr,
-                                            opts, _text);
 }
 
 static bool GenStruct(const StructDef &struct_def, const Table *table,
-						  int indent, const IDLOptions &opts,
+                      int indent, const IDLOptions &opts, std::string *_text);
-						  std::string *_text);
 
 // Generate text for non-scalar field.
 static bool GenFieldOffset(const FieldDef &fd, const Table *table, bool fixed,
-                           int indent, Type *union_type,
+                           int indent, Type *union_type, const IDLOptions &opts,
-                           const IDLOptions &opts, std::string *_text) {
+                           std::string *_text) {
   const void *val = nullptr;
   if (fixed) {
     // The only non-scalar fields in structs are structs.
     assert(IsStruct(fd.value.type));
-    val = reinterpret_cast<const Struct *>(table)->
+    val = reinterpret_cast<const Struct *>(table)->GetStruct<const void *>(
-            GetStruct<const void *>(fd.value.offset);
+        fd.value.offset);
   } else if (fd.flexbuffer) {
     auto vec = table->GetPointer<const Vector<uint8_t> *>(fd.value.offset);
     auto root = flexbuffers::GetRoot(vec->data(), vec->size());
@@ -199,20 +189,17 @@ static bool GenFieldOffset(const FieldDef &fd, const Table *table, bool fixed,
 // Generate text for a struct or table, values separated by commas, indented,
 // and bracketed by "{}"
 static bool GenStruct(const StructDef &struct_def, const Table *table,
-                      int indent, const IDLOptions &opts,
+                      int indent, const IDLOptions &opts, std::string *_text) {
-                      std::string *_text) {
   std::string &text = *_text;
   text += "{";
   int fieldout = 0;
   Type *union_type = nullptr;
   for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
+       it != struct_def.fields.vec.end(); ++it) {
-       ++it) {
     FieldDef &fd = **it;
     auto is_present = struct_def.fixed || table->CheckField(fd.value.offset);
     auto output_anyway = opts.output_default_scalars_in_json &&
-                         IsScalar(fd.value.type.base_type) &&
+                         IsScalar(fd.value.type.base_type) && !fd.deprecated;
-                         !fd.deprecated;
     if (is_present || output_anyway) {
       if (fieldout++) {
         if (!opts.protobuf_ascii_alike) text += ",";
@@ -222,10 +209,12 @@ static bool GenStruct(const StructDef &struct_def, const Table *table,
       OutputIdentifier(fd.name, opts, _text);
       if (!opts.protobuf_ascii_alike ||
           (fd.value.type.base_type != BASE_TYPE_STRUCT &&
-           fd.value.type.base_type != BASE_TYPE_VECTOR)) text += ":";
+           fd.value.type.base_type != BASE_TYPE_VECTOR))
+        text += ":";
       text += " ";
       if (is_present) {
         switch (fd.value.type.base_type) {
+          // clang-format off
           #define FLATBUFFERS_TD(ENUM, IDLTYPE, \
             CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
             case BASE_TYPE_ ## ENUM: \
@@ -247,6 +236,7 @@ static bool GenStruct(const StructDef &struct_def, const Table *table,
                 return false;
               }
               break;
+          // clang-format on
         }
         if (fd.value.type.base_type == BASE_TYPE_UTYPE) {
           auto enum_val = fd.value.type.enum_def->ReverseLookup(
@@ -254,9 +244,7 @@ static bool GenStruct(const StructDef &struct_def, const Table *table,
           assert(enum_val);
           union_type = &enum_val->union_type;
         }
-      }
+      } else {
-      else
-      {
         text += fd.value.constant;
       }
     }
@@ -273,11 +261,8 @@ bool GenerateText(const Parser &parser, const void *flatbuffer,
   std::string &text = *_text;
   assert(parser.root_struct_def_);  // call SetRootType()
   text.reserve(1024);               // Reduce amount of inevitable reallocs.
-  if (!GenStruct(*parser.root_struct_def_,
+  if (!GenStruct(*parser.root_struct_def_, GetRoot<Table>(flatbuffer), 0,
-                 GetRoot<Table>(flatbuffer),
+                 parser.opts, _text)) {
-                 0,
-                 parser.opts,
-                 _text)) {
     return false;
   }
   text += NewLine(parser.opts);
@@ -289,34 +274,29 @@ std::string TextFileName(const std::string &path,
   return path + file_name + ".json";
 }
 
-bool GenerateTextFile(const Parser &parser,
+bool GenerateTextFile(const Parser &parser, const std::string &path,
-                      const std::string &path,
                       const std::string &file_name) {
   if (!parser.builder_.GetSize() || !parser.root_struct_def_) return true;
   std::string text;
   if (!GenerateText(parser, parser.builder_.GetBufferPointer(), &text)) {
     return false;
   }
-  return flatbuffers::SaveFile(TextFileName(path, file_name).c_str(),
+  return flatbuffers::SaveFile(TextFileName(path, file_name).c_str(), text,
-                               text,
                                false);
 }
 
-std::string TextMakeRule(const Parser &parser,
+std::string TextMakeRule(const Parser &parser, const std::string &path,
-                         const std::string &path,
                          const std::string &file_name) {
   if (!parser.builder_.GetSize() || !parser.root_struct_def_) return "";
-  std::string filebase = flatbuffers::StripPath(
+  std::string filebase =
-      flatbuffers::StripExtension(file_name));
+      flatbuffers::StripPath(flatbuffers::StripExtension(file_name));
   std::string make_rule = TextFileName(path, filebase) + ": " + file_name;
-  auto included_files = parser.GetIncludedFilesRecursive(
+  auto included_files =
-      parser.root_struct_def_->file);
+      parser.GetIncludedFilesRecursive(parser.root_struct_def_->file);
-  for (auto it = included_files.begin();
+  for (auto it = included_files.begin(); it != included_files.end(); ++it) {
-       it != included_files.end(); ++it) {
     make_rule += " " + *it;
   }
   return make_rule;
 }
 
 }  // namespace flatbuffers
-

src/reflection.cpp

@@ -22,7 +22,8 @@
 namespace flatbuffers {
 
 int64_t GetAnyValueI(reflection::BaseType type, const uint8_t *data) {
-# define FLATBUFFERS_GET(T) static_cast<int64_t>(ReadScalar<T>(data))
+  // clang-format off
+  #define FLATBUFFERS_GET(T) static_cast<int64_t>(ReadScalar<T>(data))
   switch (type) {
     case reflection::UType:
     case reflection::Bool:
@@ -43,7 +44,8 @@ int64_t GetAnyValueI(reflection::BaseType type, const uint8_t *data) {
     }
     default: return 0;  // Tables & vectors do not make sense.
   }
-# undef FLATBUFFERS_GET
+  #undef FLATBUFFERS_GET
+  // clang-format on
 }
 
 double GetAnyValueF(reflection::BaseType type, const uint8_t *data) {
@@ -51,8 +53,8 @@ double GetAnyValueF(reflection::BaseType type, const uint8_t *data) {
     case reflection::Float: return static_cast<double>(ReadScalar<float>(data));
     case reflection::Double: return ReadScalar<double>(data);
     case reflection::String: {
-      auto s = reinterpret_cast<const String *>(ReadScalar<uoffset_t>(data) +
+      auto s =
-                                                data);
+          reinterpret_cast<const String *>(ReadScalar<uoffset_t>(data) + data);
       return s ? strtod(s->c_str(), nullptr) : 0.0;
     }
     default: return static_cast<double>(GetAnyValueI(type, data));
@@ -65,8 +67,8 @@ std::string GetAnyValueS(reflection::BaseType type, const uint8_t *data,
     case reflection::Float:
     case reflection::Double: return NumToString(GetAnyValueF(type, data));
     case reflection::String: {
-      auto s = reinterpret_cast<const String *>(ReadScalar<uoffset_t>(data) +
+      auto s =
-                                                data);
+          reinterpret_cast<const String *>(ReadScalar<uoffset_t>(data) + data);
       return s ? s->c_str() : "";
     }
     case reflection::Obj:
@@ -105,14 +107,14 @@ std::string GetAnyValueS(reflection::BaseType type, const uint8_t *data,
       }
     case reflection::Vector:
       return "[(elements)]";                   // TODO: implement this as well.
-    case reflection::Union:
+    case reflection::Union: return "(union)";  // TODO: implement this as well.
-      return "(union)";  // TODO: implement this as well.
     default: return NumToString(GetAnyValueI(type, data));
   }
 }
 
 void SetAnyValueI(reflection::BaseType type, uint8_t *data, int64_t val) {
-# define FLATBUFFERS_SET(T) WriteScalar(data, static_cast<T>(val))
+  // clang-format off
+  #define FLATBUFFERS_SET(T) WriteScalar(data, static_cast<T>(val))
   switch (type) {
     case reflection::UType:
     case reflection::Bool:
@@ -129,7 +131,8 @@ void SetAnyValueI(reflection::BaseType type, uint8_t *data, int64_t val) {
     // TODO: support strings
     default: break;
   }
-# undef FLATBUFFERS_SET
+  #undef FLATBUFFERS_SET
+  // clang-format on
 }
 
 void SetAnyValueF(reflection::BaseType type, uint8_t *data, double val) {
@@ -165,8 +168,10 @@ class ResizeContext {
   ResizeContext(const reflection::Schema &schema, uoffset_t start, int delta,
                 std::vector<uint8_t> *flatbuf,
                 const reflection::Object *root_table = nullptr)
-     : schema_(schema), startptr_(vector_data(*flatbuf) + start),
+      : schema_(schema),
-       delta_(delta), buf_(*flatbuf),
+        startptr_(vector_data(*flatbuf) + start),
+        delta_(delta),
+        buf_(*flatbuf),
         dag_check_(flatbuf->size() / sizeof(uoffset_t), false) {
     auto mask = static_cast<int>(sizeof(largest_scalar_t) - 1);
     delta_ = (delta_ + mask) & ~mask;
@@ -176,16 +181,17 @@ class ResizeContext {
     Straddle<uoffset_t, 1>(vector_data(buf_), root, vector_data(buf_));
     ResizeTable(root_table ? *root_table : *schema.root_table(), root);
     // We can now add or remove bytes at start.
-    if (delta_ > 0) buf_.insert(buf_.begin() + start, delta_, 0);
+    if (delta_ > 0)
-    else buf_.erase(buf_.begin() + start, buf_.begin() + start - delta_);
+      buf_.insert(buf_.begin() + start, delta_, 0);
+    else
+      buf_.erase(buf_.begin() + start, buf_.begin() + start - delta_);
   }
 
   // Check if the range between first (lower address) and second straddles
   // the insertion point. If it does, change the offset at offsetloc (of
   // type T, with direction D).
-  template<typename T, int D> void Straddle(const void *first,
+  template<typename T, int D>
-                                            const void *second,
+  void Straddle(const void *first, const void *second, void *offsetloc) {
-                                            void *offsetloc) {
     if (first <= startptr_ && second >= startptr_) {
       WriteScalar<T>(offsetloc, ReadScalar<T>(offsetloc) + delta_ * D);
       DagCheck(offsetloc) = true;
@@ -205,8 +211,7 @@ class ResizeContext {
   }
 
   void ResizeTable(const reflection::Object &objectdef, Table *table) {
-    if (DagCheck(table))
+    if (DagCheck(table)) return;  // Table already visited.
-      return;  // Table already visited.
     auto vtable = table->GetVTable();
     // Early out: since all fields inside the table must point forwards in
     // memory, if the insertion point is before the table we can stop here.
@@ -228,13 +233,14 @@ class ResizeContext {
         auto offset = table->GetOptionalFieldOffset(fielddef.offset());
         if (!offset) continue;
         // Ignore structs.
-        auto subobjectdef = base_type == reflection::Obj ?
+        auto subobjectdef =
-          schema_.objects()->Get(fielddef.type()->index()) : nullptr;
+            base_type == reflection::Obj
+                ? schema_.objects()->Get(fielddef.type()->index())
+                : nullptr;
         if (subobjectdef && subobjectdef->is_struct()) continue;
         // Get this fields' offset, and read it if safe.
         auto offsetloc = tableloc + offset;
-        if (DagCheck(offsetloc))
+        if (DagCheck(offsetloc)) continue;  // This offset already visited.
-          continue;  // This offset already visited.
         auto ref = offsetloc + ReadScalar<uoffset_t>(offsetloc);
         Straddle<uoffset_t, 1>(offsetloc, ref, offsetloc);
         // Recurse.
@@ -248,16 +254,16 @@ class ResizeContext {
             if (elem_type != reflection::Obj && elem_type != reflection::String)
               break;
             auto vec = reinterpret_cast<Vector<uoffset_t> *>(ref);
-            auto elemobjectdef = elem_type == reflection::Obj
+            auto elemobjectdef =
+                elem_type == reflection::Obj
                     ? schema_.objects()->Get(fielddef.type()->index())
                     : nullptr;
             if (elemobjectdef && elemobjectdef->is_struct()) break;
             for (uoffset_t i = 0; i < vec->size(); i++) {
               auto loc = vec->Data() + i * sizeof(uoffset_t);
-              if (DagCheck(loc))
+              if (DagCheck(loc)) continue;  // This offset already visited.
-                continue;  // This offset already visited.
               auto dest = loc + vec->Get(i);
-              Straddle<uoffset_t, 1>(loc, dest ,loc);
+              Straddle<uoffset_t, 1>(loc, dest, loc);
               if (elemobjectdef)
                 ResizeTable(*elemobjectdef, reinterpret_cast<Table *>(dest));
             }
@@ -268,10 +274,8 @@ class ResizeContext {
                         reinterpret_cast<Table *>(ref));
             break;
           }
-          case reflection::String:
+          case reflection::String: break;
-            break;
+          default: assert(false);
-          default:
-            assert(false);
         }
       }
       // Check if the vtable offset points beyond the insertion point.
@@ -317,8 +321,8 @@ uint8_t *ResizeAnyVector(const reflection::Schema &schema, uoffset_t newsize,
                          const reflection::Object *root_table) {
   auto delta_elem = static_cast<int>(newsize) - static_cast<int>(num_elems);
   auto delta_bytes = delta_elem * static_cast<int>(elem_size);
-  auto vec_start = reinterpret_cast<const uint8_t *>(vec) -
+  auto vec_start =
-      vector_data(*flatbuf);
+      reinterpret_cast<const uint8_t *>(vec) - vector_data(*flatbuf);
   auto start = static_cast<uoffset_t>(vec_start + sizeof(uoffset_t) +
                                       elem_size * num_elems);
   if (delta_bytes) {
@@ -363,8 +367,7 @@ void CopyInline(FlatBufferBuilder &fbb, const reflection::Field &fielddef,
 Offset<const Table *> CopyTable(FlatBufferBuilder &fbb,
                                 const reflection::Schema &schema,
                                 const reflection::Object &objectdef,
-                                const Table &table,
+                                const Table &table, bool use_string_pooling) {
-                                bool use_string_pooling) {
   // Before we can construct the table, we have to first generate any
   // subobjects, and collect their offsets.
   std::vector<uoffset_t> offsets;
@@ -384,22 +387,24 @@ Offset<const Table *> CopyTable(FlatBufferBuilder &fbb,
       case reflection::Obj: {
         auto &subobjectdef = *schema.objects()->Get(fielddef.type()->index());
         if (!subobjectdef.is_struct()) {
-          offset = CopyTable(fbb, schema, subobjectdef,
+          offset =
-                             *GetFieldT(table, fielddef)).o;
+              CopyTable(fbb, schema, subobjectdef, *GetFieldT(table, fielddef))
+                  .o;
         }
         break;
       }
       case reflection::Union: {
         auto &subobjectdef = GetUnionType(schema, objectdef, fielddef, table);
-        offset = CopyTable(fbb, schema, subobjectdef,
+        offset =
-                           *GetFieldT(table, fielddef)).o;
+            CopyTable(fbb, schema, subobjectdef, *GetFieldT(table, fielddef)).o;
         break;
       }
       case reflection::Vector: {
-        auto vec = table.GetPointer<const Vector<Offset<Table>> *>(
+        auto vec =
-                                                             fielddef.offset());
+            table.GetPointer<const Vector<Offset<Table>> *>(fielddef.offset());
         auto element_base_type = fielddef.type()->element();
-        auto elemobjectdef = element_base_type == reflection::Obj
+        auto elemobjectdef =
+            element_base_type == reflection::Obj
                 ? schema.objects()->Get(fielddef.type()->index())
                 : nullptr;
         switch (element_base_type) {
@@ -441,13 +446,10 @@ Offset<const Table *> CopyTable(FlatBufferBuilder &fbb,
       default:  // Scalars.
         break;
     }
-    if (offset) {
+    if (offset) { offsets.push_back(offset); }
-      offsets.push_back(offset);
-    }
   }
   // Now we can build the actual table from either offsets or scalar data.
-  auto start = objectdef.is_struct()
+  auto start = objectdef.is_struct() ? fbb.StartStruct(objectdef.minalign())
-                 ? fbb.StartStruct(objectdef.minalign())
                                      : fbb.StartTable();
   size_t offset_idx = 0;
   for (auto it = fielddefs->begin(); it != fielddefs->end(); ++it) {
@@ -487,51 +489,40 @@ Offset<const Table *> CopyTable(FlatBufferBuilder &fbb,
 
 bool VerifyStruct(flatbuffers::Verifier &v,
                   const flatbuffers::Table &parent_table,
-                  voffset_t field_offset,
+                  voffset_t field_offset, const reflection::Object &obj,
-                  const reflection::Object &obj,
                   bool required) {
   auto offset = parent_table.GetOptionalFieldOffset(field_offset);
-  if (required && !offset) {
+  if (required && !offset) { return false; }
-    return false;
-  }
 
-  return !offset || v.Verify(reinterpret_cast<const uint8_t*>(&parent_table)
+  return !offset ||
-                             + offset, obj.bytesize());
+         v.Verify(reinterpret_cast<const uint8_t *>(&parent_table) + offset,
+                  obj.bytesize());
 }
 
 bool VerifyVectorOfStructs(flatbuffers::Verifier &v,
                            const flatbuffers::Table &parent_table,
                            voffset_t field_offset,
-                           const reflection::Object &obj,
+                           const reflection::Object &obj, bool required) {
-                           bool required) {
+  auto p = parent_table.GetPointer<const uint8_t *>(field_offset);
-  auto p = parent_table.GetPointer<const uint8_t*>(field_offset);
+  const uint8_t *end;
-  const uint8_t* end;
+  if (required && !p) { return false; }
-  if (required && !p) {
-    return false;
-  }
 
   return !p || v.VerifyVector(p, obj.bytesize(), &end);
 }
 
 // forward declare to resolve cyclic deps between VerifyObject and VerifyVector
-bool VerifyObject(flatbuffers::Verifier &v,
+bool VerifyObject(flatbuffers::Verifier &v, const reflection::Schema &schema,
-                  const reflection::Schema &schema,
                   const reflection::Object &obj,
-                  const flatbuffers::Table *table,
+                  const flatbuffers::Table *table, bool isRequired);
-                  bool isRequired);
 
-bool VerifyVector(flatbuffers::Verifier &v,
+bool VerifyVector(flatbuffers::Verifier &v, const reflection::Schema &schema,
-                  const reflection::Schema &schema,
                   const flatbuffers::Table &table,
                   const reflection::Field &vec_field) {
   assert(vec_field.type()->base_type() == reflection::Vector);
-  if (!table.VerifyField<uoffset_t>(v, vec_field.offset()))
+  if (!table.VerifyField<uoffset_t>(v, vec_field.offset())) return false;
-    return false;
 
   switch (vec_field.type()->element()) {
-    case reflection::None:
+    case reflection::None: assert(false); break;
-      assert(false);
-      break;
     case reflection::UType:
       return v.Verify(flatbuffers::GetFieldV<uint8_t>(table, vec_field));
     case reflection::Bool:
@@ -553,17 +544,15 @@ bool VerifyVector(flatbuffers::Verifier &v,
       return v.Verify(flatbuffers::GetFieldV<double>(table, vec_field));
     case reflection::String: {
       auto vecString =
-        flatbuffers::GetFieldV<flatbuffers::
+          flatbuffers::GetFieldV<flatbuffers::Offset<flatbuffers::String>>(
-        Offset<flatbuffers::String>>(table, vec_field);
+              table, vec_field);
       if (v.Verify(vecString) && v.VerifyVectorOfStrings(vecString)) {
         return true;
       } else {
         return false;
       }
     }
-    case reflection::Vector:
+    case reflection::Vector: assert(false); break;
-      assert(false);
-      break;
     case reflection::Obj: {
       auto obj = schema.objects()->Get(vec_field.type()->index());
       if (obj->is_struct()) {
@@ -573,10 +562,9 @@ bool VerifyVector(flatbuffers::Verifier &v,
         }
       } else {
         auto vec =
-          flatbuffers::GetFieldV<flatbuffers::
+            flatbuffers::GetFieldV<flatbuffers::Offset<flatbuffers::Table>>(
-          Offset<flatbuffers::Table>>(table, vec_field);
+                table, vec_field);
-        if (!v.Verify(vec))
+        if (!v.Verify(vec)) return false;
-          return false;
         if (vec) {
           for (uoffset_t j = 0; j < vec->size(); j++) {
             if (!VerifyObject(v, schema, *obj, vec->Get(j), true)) {
@@ -587,22 +575,16 @@ bool VerifyVector(flatbuffers::Verifier &v,
       }
       return true;
     }
-    case reflection::Union:
+    case reflection::Union: assert(false); break;
-      assert(false);
+    default: assert(false); break;
-      break;
-    default:
-      assert(false);
-      break;
   }
 
   return false;
 }
 
-bool VerifyObject(flatbuffers::Verifier &v,
+bool VerifyObject(flatbuffers::Verifier &v, const reflection::Schema &schema,
-                  const reflection::Schema &schema,
                   const reflection::Object &obj,
-                  const flatbuffers::Table *table,
+                  const flatbuffers::Table *table, bool required) {
-                  bool required) {
   if (!table) {
     if (!required)
       return true;
@@ -610,47 +592,37 @@ bool VerifyObject(flatbuffers::Verifier &v,
       return false;
   }
 
-  if (!table->VerifyTableStart(v))
+  if (!table->VerifyTableStart(v)) return false;
-    return false;
 
   for (uoffset_t i = 0; i < obj.fields()->size(); i++) {
     auto field_def = obj.fields()->Get(i);
     switch (field_def->type()->base_type()) {
-      case reflection::None:
+      case reflection::None: assert(false); break;
-        assert(false);
-        break;
       case reflection::UType:
-        if (!table->VerifyField<uint8_t>(v, field_def->offset()))
+        if (!table->VerifyField<uint8_t>(v, field_def->offset())) return false;
-          return false;
         break;
       case reflection::Bool:
       case reflection::Byte:
       case reflection::UByte:
-        if (!table->VerifyField<int8_t>(v, field_def->offset()))
+        if (!table->VerifyField<int8_t>(v, field_def->offset())) return false;
-          return false;
         break;
       case reflection::Short:
       case reflection::UShort:
-        if (!table->VerifyField<int16_t>(v, field_def->offset()))
+        if (!table->VerifyField<int16_t>(v, field_def->offset())) return false;
-          return false;
         break;
       case reflection::Int:
       case reflection::UInt:
-        if (!table->VerifyField<int32_t>(v, field_def->offset()))
+        if (!table->VerifyField<int32_t>(v, field_def->offset())) return false;
-          return false;
         break;
       case reflection::Long:
       case reflection::ULong:
-        if (!table->VerifyField<int64_t>(v, field_def->offset()))
+        if (!table->VerifyField<int64_t>(v, field_def->offset())) return false;
-          return false;
         break;
       case reflection::Float:
-        if (!table->VerifyField<float>(v, field_def->offset()))
+        if (!table->VerifyField<float>(v, field_def->offset())) return false;
-          return false;
         break;
       case reflection::Double:
-        if (!table->VerifyField<double>(v, field_def->offset()))
+        if (!table->VerifyField<double>(v, field_def->offset())) return false;
-          return false;
         break;
       case reflection::String:
         if (!table->VerifyField<uoffset_t>(v, field_def->offset()) ||
@@ -659,8 +631,7 @@ bool VerifyObject(flatbuffers::Verifier &v,
         }
         break;
       case reflection::Vector:
-        if (!VerifyVector(v, schema, *table, *field_def))
+        if (!VerifyVector(v, schema, *table, *field_def)) return false;
-          return false;
         break;
       case reflection::Obj: {
         auto child_obj = schema.objects()->Get(field_def->type()->index());
@@ -694,22 +665,17 @@ bool VerifyObject(flatbuffers::Verifier &v,
         }
         break;
       }
-      default:
+      default: assert(false); break;
-        assert(false);
-        break;
     }
   }
 
-  if (!v.EndTable())
+  if (!v.EndTable()) return false;
-    return false;
 
   return true;
 }
 
-bool Verify(const reflection::Schema &schema,
+bool Verify(const reflection::Schema &schema, const reflection::Object &root,
-            const reflection::Object &root,
+            const uint8_t *buf, size_t length) {
-            const uint8_t *buf,
-            size_t length) {
   Verifier v(buf, length);
   return VerifyObject(v, schema, root, flatbuffers::GetAnyRoot(buf), true);
 }

src/util.cpp

@@ -57,6 +57,7 @@ bool FileExists(const char *name) {
 }
 
 bool DirExists(const char *name) {
+  // clang-format off
   #ifdef _WIN32
     #define flatbuffers_stat _stat
     #define FLATBUFFERS_S_IFDIR _S_IFDIR
@@ -64,6 +65,7 @@ bool DirExists(const char *name) {
     #define flatbuffers_stat stat
     #define FLATBUFFERS_S_IFDIR S_IFDIR
   #endif
+  // clang-format on
   struct flatbuffers_stat file_info;
   if (flatbuffers_stat(name, &file_info) != 0) return false;
   return (file_info.st_mode & FLATBUFFERS_S_IFDIR) != 0;
@@ -78,8 +80,8 @@ LoadFileFunction SetLoadFileFunction(LoadFileFunction load_file_function) {
 FileExistsFunction SetFileExistsFunction(
     FileExistsFunction file_exists_function) {
   FileExistsFunction previous_function = g_file_exists_function;
-  g_file_exists_function = file_exists_function ?
+  g_file_exists_function =
-      file_exists_function : FileExistsRaw;
+      file_exists_function ? file_exists_function : FileExistsRaw;
   return previous_function;
 }
 

tests/monster_test.grpc.fb.cc

@@ -27,44 +27,36 @@ std::unique_ptr< MonsterStorage::Stub> MonsterStorage::NewStub(const std::shared
 }
 
 MonsterStorage::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel)
-  : channel_(channel)  , rpcmethod_Store_(MonsterStorage_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
+  : channel_(channel)  , rpcmethod_Store_(MonsterStorage_method_names[0], ::grpc::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Retrieve_(MonsterStorage_method_names[1], ::grpc::internal::RpcMethod::SERVER_STREAMING, channel)
+  , rpcmethod_Retrieve_(MonsterStorage_method_names[1], ::grpc::RpcMethod::SERVER_STREAMING, channel)
   {}
   
 ::grpc::Status MonsterStorage::Stub::Store(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Monster>& request, flatbuffers::grpc::Message<Stat>* response) {
-  return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_Store_, context, request, response);
+  return ::grpc::BlockingUnaryCall(channel_.get(), rpcmethod_Store_, context, request, response);
 }
 
 ::grpc::ClientAsyncResponseReader< flatbuffers::grpc::Message<Stat>>* MonsterStorage::Stub::AsyncStoreRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Monster>& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory< flatbuffers::grpc::Message<Stat>>::Create(channel_.get(), cq, rpcmethod_Store_, context, request, true);
+  return ::grpc::ClientAsyncResponseReader< flatbuffers::grpc::Message<Stat>>::Create(channel_.get(), cq, rpcmethod_Store_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< flatbuffers::grpc::Message<Stat>>* MonsterStorage::Stub::PrepareAsyncStoreRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Monster>& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory< flatbuffers::grpc::Message<Stat>>::Create(channel_.get(), cq, rpcmethod_Store_, context, request, false);
 }
 
 ::grpc::ClientReader< flatbuffers::grpc::Message<Monster>>* MonsterStorage::Stub::RetrieveRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request) {
-  return ::grpc::internal::ClientReaderFactory< flatbuffers::grpc::Message<Monster>>::Create(channel_.get(), rpcmethod_Retrieve_, context, request);
+  return new ::grpc::ClientReader< flatbuffers::grpc::Message<Monster>>(channel_.get(), rpcmethod_Retrieve_, context, request);
 }
 
 ::grpc::ClientAsyncReader< flatbuffers::grpc::Message<Monster>>* MonsterStorage::Stub::AsyncRetrieveRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request, ::grpc::CompletionQueue* cq, void* tag) {
-  return ::grpc::internal::ClientAsyncReaderFactory< flatbuffers::grpc::Message<Monster>>::Create(channel_.get(), cq, rpcmethod_Retrieve_, context, request, true, tag);
+  return ::grpc::ClientAsyncReader< flatbuffers::grpc::Message<Monster>>::Create(channel_.get(), cq, rpcmethod_Retrieve_, context, request, tag);
-}
-
-::grpc::ClientAsyncReader< flatbuffers::grpc::Message<Monster>>* MonsterStorage::Stub::PrepareAsyncRetrieveRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncReaderFactory< flatbuffers::grpc::Message<Monster>>::Create(channel_.get(), cq, rpcmethod_Retrieve_, context, request, false, nullptr);
 }
 
 MonsterStorage::Service::Service() {
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
+  AddMethod(new ::grpc::RpcServiceMethod(
       MonsterStorage_method_names[0],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
+      ::grpc::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< MonsterStorage::Service, flatbuffers::grpc::Message<Monster>, flatbuffers::grpc::Message<Stat>>(
+      new ::grpc::RpcMethodHandler< MonsterStorage::Service, flatbuffers::grpc::Message<Monster>, flatbuffers::grpc::Message<Stat>>(
           std::mem_fn(&MonsterStorage::Service::Store), this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
+  AddMethod(new ::grpc::RpcServiceMethod(
       MonsterStorage_method_names[1],
-      ::grpc::internal::RpcMethod::SERVER_STREAMING,
+      ::grpc::RpcMethod::SERVER_STREAMING,
-      new ::grpc::internal::ServerStreamingHandler< MonsterStorage::Service, flatbuffers::grpc::Message<Stat>, flatbuffers::grpc::Message<Monster>>(
+      new ::grpc::ServerStreamingHandler< MonsterStorage::Service, flatbuffers::grpc::Message<Stat>, flatbuffers::grpc::Message<Monster>>(
           std::mem_fn(&MonsterStorage::Service::Retrieve), this)));
 }
 

tests/monster_test.grpc.fb.h

@@ -4,8 +4,8 @@
 #ifndef GRPC_monster_5ftest__INCLUDED
 #define GRPC_monster_5ftest__INCLUDED
 
-#include "monster_test_generated.h"
 #include "flatbuffers/grpc.h"
+#include "monster_test_generated.h"
 
 #include <grpc++/impl/codegen/async_stream.h>
 #include <grpc++/impl/codegen/async_unary_call.h>
@@ -20,6 +20,7 @@
 namespace grpc {
 class CompletionQueue;
 class Channel;
+class RpcService;
 class ServerCompletionQueue;
 class ServerContext;
 }  // namespace grpc
@@ -39,24 +40,16 @@ class MonsterStorage final {
     std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< flatbuffers::grpc::Message<Stat>>> AsyncStore(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Monster>& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< flatbuffers::grpc::Message<Stat>>>(AsyncStoreRaw(context, request, cq));
     }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< flatbuffers::grpc::Message<Stat>>> PrepareAsyncStore(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Monster>& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< flatbuffers::grpc::Message<Stat>>>(PrepareAsyncStoreRaw(context, request, cq));
-    }
     std::unique_ptr< ::grpc::ClientReaderInterface< flatbuffers::grpc::Message<Monster>>> Retrieve(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request) {
       return std::unique_ptr< ::grpc::ClientReaderInterface< flatbuffers::grpc::Message<Monster>>>(RetrieveRaw(context, request));
     }
     std::unique_ptr< ::grpc::ClientAsyncReaderInterface< flatbuffers::grpc::Message<Monster>>> AsyncRetrieve(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request, ::grpc::CompletionQueue* cq, void* tag) {
       return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< flatbuffers::grpc::Message<Monster>>>(AsyncRetrieveRaw(context, request, cq, tag));
     }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< flatbuffers::grpc::Message<Monster>>> PrepareAsyncRetrieve(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< flatbuffers::grpc::Message<Monster>>>(PrepareAsyncRetrieveRaw(context, request, cq));
-    }
   private:
     virtual ::grpc::ClientAsyncResponseReaderInterface< flatbuffers::grpc::Message<Stat>>* AsyncStoreRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Monster>& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< flatbuffers::grpc::Message<Stat>>* PrepareAsyncStoreRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Monster>& request, ::grpc::CompletionQueue* cq) = 0;
     virtual ::grpc::ClientReaderInterface< flatbuffers::grpc::Message<Monster>>* RetrieveRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request) = 0;
     virtual ::grpc::ClientAsyncReaderInterface< flatbuffers::grpc::Message<Monster>>* AsyncRetrieveRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request, ::grpc::CompletionQueue* cq, void* tag) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< flatbuffers::grpc::Message<Monster>>* PrepareAsyncRetrieveRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request, ::grpc::CompletionQueue* cq) = 0;
   };
   class Stub final : public StubInterface {
    public:
@@ -65,28 +58,20 @@ class MonsterStorage final {
     std::unique_ptr< ::grpc::ClientAsyncResponseReader< flatbuffers::grpc::Message<Stat>>> AsyncStore(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Monster>& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncResponseReader< flatbuffers::grpc::Message<Stat>>>(AsyncStoreRaw(context, request, cq));
     }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< flatbuffers::grpc::Message<Stat>>> PrepareAsyncStore(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Monster>& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< flatbuffers::grpc::Message<Stat>>>(PrepareAsyncStoreRaw(context, request, cq));
-    }
     std::unique_ptr< ::grpc::ClientReader< flatbuffers::grpc::Message<Monster>>> Retrieve(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request) {
       return std::unique_ptr< ::grpc::ClientReader< flatbuffers::grpc::Message<Monster>>>(RetrieveRaw(context, request));
     }
     std::unique_ptr< ::grpc::ClientAsyncReader< flatbuffers::grpc::Message<Monster>>> AsyncRetrieve(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request, ::grpc::CompletionQueue* cq, void* tag) {
       return std::unique_ptr< ::grpc::ClientAsyncReader< flatbuffers::grpc::Message<Monster>>>(AsyncRetrieveRaw(context, request, cq, tag));
     }
-    std::unique_ptr< ::grpc::ClientAsyncReader< flatbuffers::grpc::Message<Monster>>> PrepareAsyncRetrieve(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< flatbuffers::grpc::Message<Monster>>>(PrepareAsyncRetrieveRaw(context, request, cq));
-    }
   
    private:
     std::shared_ptr< ::grpc::ChannelInterface> channel_;
     ::grpc::ClientAsyncResponseReader< flatbuffers::grpc::Message<Stat>>* AsyncStoreRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Monster>& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< flatbuffers::grpc::Message<Stat>>* PrepareAsyncStoreRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Monster>& request, ::grpc::CompletionQueue* cq) override;
     ::grpc::ClientReader< flatbuffers::grpc::Message<Monster>>* RetrieveRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request) override;
     ::grpc::ClientAsyncReader< flatbuffers::grpc::Message<Monster>>* AsyncRetrieveRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request, ::grpc::CompletionQueue* cq, void* tag) override;
-    ::grpc::ClientAsyncReader< flatbuffers::grpc::Message<Monster>>* PrepareAsyncRetrieveRaw(::grpc::ClientContext* context, const flatbuffers::grpc::Message<Stat>& request, ::grpc::CompletionQueue* cq) override;
+    const ::grpc::RpcMethod rpcmethod_Store_;
-    const ::grpc::internal::RpcMethod rpcmethod_Store_;
+    const ::grpc::RpcMethod rpcmethod_Retrieve_;
-    const ::grpc::internal::RpcMethod rpcmethod_Retrieve_;
   };
   static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
   
@@ -179,7 +164,7 @@ class MonsterStorage final {
    public:
     WithStreamedUnaryMethod_Store() {
       ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::StreamedUnaryHandler< flatbuffers::grpc::Message<Monster>, flatbuffers::grpc::Message<Stat>>(std::bind(&WithStreamedUnaryMethod_Store<BaseClass>::StreamedStore, this, std::placeholders::_1, std::placeholders::_2)));
+        new ::grpc::StreamedUnaryHandler< flatbuffers::grpc::Message<Monster>, flatbuffers::grpc::Message<Stat>>(std::bind(&WithStreamedUnaryMethod_Store<BaseClass>::StreamedStore, this, std::placeholders::_1, std::placeholders::_2)));
     }
     ~WithStreamedUnaryMethod_Store() override {
       BaseClassMustBeDerivedFromService(this);
@@ -200,7 +185,7 @@ class MonsterStorage final {
    public:
     WithSplitStreamingMethod_Retrieve() {
       ::grpc::Service::MarkMethodStreamed(1,
-        new ::grpc::internal::SplitServerStreamingHandler< flatbuffers::grpc::Message<Stat>, flatbuffers::grpc::Message<Monster>>(std::bind(&WithSplitStreamingMethod_Retrieve<BaseClass>::StreamedRetrieve, this, std::placeholders::_1, std::placeholders::_2)));
+        new ::grpc::SplitServerStreamingHandler< flatbuffers::grpc::Message<Stat>, flatbuffers::grpc::Message<Monster>>(std::bind(&WithSplitStreamingMethod_Retrieve<BaseClass>::StreamedRetrieve, this, std::placeholders::_1, std::placeholders::_2)));
     }
     ~WithSplitStreamingMethod_Retrieve() override {
       BaseClassMustBeDerivedFromService(this);

tests/namespace_test/namespace_test1_generated.ts

@@ -18,7 +18,7 @@ export class TableInNestedNS {
   /**
    * @type {flatbuffers.ByteBuffer}
    */
-  bb: flatbuffers.ByteBuffer|null = null;
+  bb: flatbuffers.ByteBuffer;
 
   /**
    * @type {number}
@@ -48,8 +48,8 @@ static getRootAsTableInNestedNS(bb:flatbuffers.ByteBuffer, obj?:TableInNestedNS)
  * @returns {number}
  */
 foo():number {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
+  var offset = this.bb.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.readInt32(this.bb_pos + offset) : 0;
+  return offset ? this.bb.readInt32(this.bb_pos + offset) : 0;
 };
 
 /**
@@ -57,13 +57,13 @@ foo():number {
  * @returns {boolean}
  */
 mutate_foo(value:number):boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
+  var offset = this.bb.__offset(this.bb_pos, 4);
 
   if (offset === 0) {
     return false;
   }
 
-  this.bb!.writeInt32(this.bb_pos + offset, value);
+  this.bb.writeInt32(this.bb_pos + offset, value);
   return true;
 };
 
@@ -101,7 +101,7 @@ export class StructInNestedNS {
   /**
    * @type {flatbuffers.ByteBuffer}
    */
-  bb: flatbuffers.ByteBuffer|null = null;
+  bb: flatbuffers.ByteBuffer;
 
   /**
    * @type {number}
@@ -122,7 +122,7 @@ __init(i:number, bb:flatbuffers.ByteBuffer):StructInNestedNS {
  * @returns {number}
  */
 a():number {
-  return this.bb!.readInt32(this.bb_pos);
+  return this.bb.readInt32(this.bb_pos);
 };
 
 /**
@@ -130,13 +130,13 @@ a():number {
  * @returns {boolean}
  */
 mutate_a(value:number):boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 0);
+  var offset = this.bb.__offset(this.bb_pos, 0);
 
   if (offset === 0) {
     return false;
   }
 
-  this.bb!.writeInt32(this.bb_pos + offset, value);
+  this.bb.writeInt32(this.bb_pos + offset, value);
   return true;
 };
 
@@ -144,7 +144,7 @@ mutate_a(value:number):boolean {
  * @returns {number}
  */
 b():number {
-  return this.bb!.readInt32(this.bb_pos + 4);
+  return this.bb.readInt32(this.bb_pos + 4);
 };
 
 /**
@@ -152,13 +152,13 @@ b():number {
  * @returns {boolean}
  */
 mutate_b(value:number):boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
+  var offset = this.bb.__offset(this.bb_pos, 4);
 
   if (offset === 0) {
     return false;
   }
 
-  this.bb!.writeInt32(this.bb_pos + offset, value);
+  this.bb.writeInt32(this.bb_pos + offset, value);
   return true;
 };
 

tests/namespace_test/namespace_test2_generated.ts

@@ -9,7 +9,7 @@ export class TableInFirstNS {
   /**
    * @type {flatbuffers.ByteBuffer}
    */
-  bb: flatbuffers.ByteBuffer|null = null;
+  bb: flatbuffers.ByteBuffer;
 
   /**
    * @type {number}
@@ -40,16 +40,16 @@ static getRootAsTableInFirstNS(bb:flatbuffers.ByteBuffer, obj?:TableInFirstNS):T
  * @returns {NamespaceA.NamespaceB.TableInNestedNS|null}
  */
 fooTable(obj?:NS9459827973991502386.NamespaceA.NamespaceB.TableInNestedNS):NS9459827973991502386.NamespaceA.NamespaceB.TableInNestedNS|null {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
+  var offset = this.bb.__offset(this.bb_pos, 4);
-  return offset ? (obj || new NS9459827973991502386.NamespaceA.NamespaceB.TableInNestedNS).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
+  return offset ? (obj || new NS9459827973991502386.NamespaceA.NamespaceB.TableInNestedNS).__init(this.bb.__indirect(this.bb_pos + offset), this.bb) : null;
 };
 
 /**
  * @returns {NamespaceA.NamespaceB.EnumInNestedNS}
  */
 fooEnum():NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
+  var offset = this.bb.__offset(this.bb_pos, 6);
-  return offset ? /** @type {NamespaceA.NamespaceB.EnumInNestedNS} */ (this.bb!.readInt8(this.bb_pos + offset)) : NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS.A;
+  return offset ? /** @type {NamespaceA.NamespaceB.EnumInNestedNS} */ (this.bb.readInt8(this.bb_pos + offset)) : NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS.A;
 };
 
 /**
@@ -57,13 +57,13 @@ fooEnum():NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS {
  * @returns {boolean}
  */
 mutate_foo_enum(value:NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS):boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
+  var offset = this.bb.__offset(this.bb_pos, 6);
 
   if (offset === 0) {
     return false;
   }
 
-  this.bb!.writeInt8(this.bb_pos + offset, value);
+  this.bb.writeInt8(this.bb_pos + offset, value);
   return true;
 };
 
@@ -72,8 +72,8 @@ mutate_foo_enum(value:NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS
  * @returns {NamespaceA.NamespaceB.StructInNestedNS|null}
  */
 fooStruct(obj?:NS9459827973991502386.NamespaceA.NamespaceB.StructInNestedNS):NS9459827973991502386.NamespaceA.NamespaceB.StructInNestedNS|null {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
+  var offset = this.bb.__offset(this.bb_pos, 8);
-  return offset ? (obj || new NS9459827973991502386.NamespaceA.NamespaceB.StructInNestedNS).__init(this.bb_pos + offset, this.bb!) : null;
+  return offset ? (obj || new NS9459827973991502386.NamespaceA.NamespaceB.StructInNestedNS).__init(this.bb_pos + offset, this.bb) : null;
 };
 
 /**
@@ -126,7 +126,7 @@ export class TableInC {
   /**
    * @type {flatbuffers.ByteBuffer}
    */
-  bb: flatbuffers.ByteBuffer|null = null;
+  bb: flatbuffers.ByteBuffer;
 
   /**
    * @type {number}
@@ -157,8 +157,8 @@ static getRootAsTableInC(bb:flatbuffers.ByteBuffer, obj?:TableInC):TableInC {
  * @returns {NamespaceA.TableInFirstNS|null}
  */
 referToA1(obj?:NamespaceA.TableInFirstNS):NamespaceA.TableInFirstNS|null {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
+  var offset = this.bb.__offset(this.bb_pos, 4);
-  return offset ? (obj || new NamespaceA.TableInFirstNS).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
+  return offset ? (obj || new NamespaceA.TableInFirstNS).__init(this.bb.__indirect(this.bb_pos + offset), this.bb) : null;
 };
 
 /**
@@ -166,8 +166,8 @@ referToA1(obj?:NamespaceA.TableInFirstNS):NamespaceA.TableInFirstNS|null {
  * @returns {NamespaceA.SecondTableInA|null}
  */
 referToA2(obj?:NamespaceA.SecondTableInA):NamespaceA.SecondTableInA|null {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
+  var offset = this.bb.__offset(this.bb_pos, 6);
-  return offset ? (obj || new NamespaceA.SecondTableInA).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
+  return offset ? (obj || new NamespaceA.SecondTableInA).__init(this.bb.__indirect(this.bb_pos + offset), this.bb) : null;
 };
 
 /**
@@ -212,7 +212,7 @@ export class SecondTableInA {
   /**
    * @type {flatbuffers.ByteBuffer}
    */
-  bb: flatbuffers.ByteBuffer|null = null;
+  bb: flatbuffers.ByteBuffer;
 
   /**
    * @type {number}
@@ -243,8 +243,8 @@ static getRootAsSecondTableInA(bb:flatbuffers.ByteBuffer, obj?:SecondTableInA):S
  * @returns {NamespaceC.TableInC|null}
  */
 referToC(obj?:NamespaceC.TableInC):NamespaceC.TableInC|null {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
+  var offset = this.bb.__offset(this.bb_pos, 4);
-  return offset ? (obj || new NamespaceC.TableInC).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
+  return offset ? (obj || new NamespaceC.TableInC).__init(this.bb.__indirect(this.bb_pos + offset), this.bb) : null;
 };
 
 /**

tests/union_vector/union_vector_generated.ts

@@ -20,7 +20,7 @@ export class Attacker {
   /**
    * @type {flatbuffers.ByteBuffer}
    */
-  bb: flatbuffers.ByteBuffer|null = null;
+  bb: flatbuffers.ByteBuffer;
 
   /**
    * @type {number}
@@ -50,8 +50,8 @@ static getRootAsAttacker(bb:flatbuffers.ByteBuffer, obj?:Attacker):Attacker {
  * @returns {number}
  */
 swordAttackDamage():number {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
+  var offset = this.bb.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.readInt32(this.bb_pos + offset) : 0;
+  return offset ? this.bb.readInt32(this.bb_pos + offset) : 0;
 };
 
 /**
@@ -59,13 +59,13 @@ swordAttackDamage():number {
  * @returns {boolean}
  */
 mutate_sword_attack_damage(value:number):boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
+  var offset = this.bb.__offset(this.bb_pos, 4);
 
   if (offset === 0) {
     return false;
   }
 
-  this.bb!.writeInt32(this.bb_pos + offset, value);
+  this.bb.writeInt32(this.bb_pos + offset, value);
   return true;
 };
 
@@ -101,7 +101,7 @@ export class Rapunzel {
   /**
    * @type {flatbuffers.ByteBuffer}
    */
-  bb: flatbuffers.ByteBuffer|null = null;
+  bb: flatbuffers.ByteBuffer;
 
   /**
    * @type {number}
@@ -122,7 +122,7 @@ __init(i:number, bb:flatbuffers.ByteBuffer):Rapunzel {
  * @returns {number}
  */
 hairLength():number {
-  return this.bb!.readInt32(this.bb_pos);
+  return this.bb.readInt32(this.bb_pos);
 };
 
 /**
@@ -130,13 +130,13 @@ hairLength():number {
  * @returns {boolean}
  */
 mutate_hair_length(value:number):boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 0);
+  var offset = this.bb.__offset(this.bb_pos, 0);
 
   if (offset === 0) {
     return false;
   }
 
-  this.bb!.writeInt32(this.bb_pos + offset, value);
+  this.bb.writeInt32(this.bb_pos + offset, value);
   return true;
 };
 
@@ -159,7 +159,7 @@ export class BookReader {
   /**
    * @type {flatbuffers.ByteBuffer}
    */
-  bb: flatbuffers.ByteBuffer|null = null;
+  bb: flatbuffers.ByteBuffer;
 
   /**
    * @type {number}
@@ -180,7 +180,7 @@ __init(i:number, bb:flatbuffers.ByteBuffer):BookReader {
  * @returns {number}
  */
 booksRead():number {
-  return this.bb!.readInt32(this.bb_pos);
+  return this.bb.readInt32(this.bb_pos);
 };
 
 /**
@@ -188,13 +188,13 @@ booksRead():number {
  * @returns {boolean}
  */
 mutate_books_read(value:number):boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 0);
+  var offset = this.bb.__offset(this.bb_pos, 0);
 
   if (offset === 0) {
     return false;
   }
 
-  this.bb!.writeInt32(this.bb_pos + offset, value);
+  this.bb.writeInt32(this.bb_pos + offset, value);
   return true;
 };
 
@@ -217,7 +217,7 @@ export class Movie {
   /**
    * @type {flatbuffers.ByteBuffer}
    */
-  bb: flatbuffers.ByteBuffer|null = null;
+  bb: flatbuffers.ByteBuffer;
 
   /**
    * @type {number}
@@ -255,8 +255,8 @@ static bufferHasIdentifier(bb:flatbuffers.ByteBuffer):boolean {
  * @returns {Character}
  */
 mainCharacterType():Character {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
+  var offset = this.bb.__offset(this.bb_pos, 4);
-  return offset ? /** @type {Character} */ (this.bb!.readUint8(this.bb_pos + offset)) : Character.NONE;
+  return offset ? /** @type {Character} */ (this.bb.readUint8(this.bb_pos + offset)) : Character.NONE;
 };
 
 /**
@@ -264,13 +264,13 @@ mainCharacterType():Character {
  * @returns {boolean}
  */
 mutate_main_character_type(value:Character):boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
+  var offset = this.bb.__offset(this.bb_pos, 4);
 
   if (offset === 0) {
     return false;
   }
 
-  this.bb!.writeUint8(this.bb_pos + offset, value);
+  this.bb.writeUint8(this.bb_pos + offset, value);
   return true;
 };
 
@@ -279,8 +279,8 @@ mutate_main_character_type(value:Character):boolean {
  * @returns {?flatbuffers.Table}
  */
 mainCharacter<T extends flatbuffers.Table>(obj:T):T|null {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
+  var offset = this.bb.__offset(this.bb_pos, 6);
-  return offset ? this.bb!.__union(obj, this.bb_pos + offset) : null;
+  return offset ? this.bb.__union(obj, this.bb_pos + offset) : null;
 };
 
 /**
@@ -288,24 +288,24 @@ mainCharacter<T extends flatbuffers.Table>(obj:T):T|null {
  * @returns {Character}
  */
 charactersType(index: number):Character|null {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
+  var offset = this.bb.__offset(this.bb_pos, 8);
-  return offset ? /** @type {Character} */ (this.bb!.readUint8(this.bb!.__vector(this.bb_pos + offset) + index)) : /** @type {Character} */ (0);
+  return offset ? /** @type {Character} */ (this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index)) : /** @type {Character} */ (0);
 };
 
 /**
  * @returns {number}
  */
 charactersTypeLength():number {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
+  var offset = this.bb.__offset(this.bb_pos, 8);
-  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
+  return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0;
 };
 
 /**
  * @returns {Uint8Array}
  */
 charactersTypeArray():Uint8Array|null {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
+  var offset = this.bb.__offset(this.bb_pos, 8);
-  return offset ? new Uint8Array(this.bb!.bytes().buffer, this.bb!.bytes().byteOffset + this.bb!.__vector(this.bb_pos + offset), this.bb!.__vector_len(this.bb_pos + offset)) : null;
+  return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null;
 };
 
 /**
@@ -314,16 +314,16 @@ charactersTypeArray():Uint8Array|null {
  * @returns {?flatbuffers.Table}
  */
 characters<T extends flatbuffers.Table>(index: number, obj:T):T|null {
-  var offset = this.bb!.__offset(this.bb_pos, 10);
+  var offset = this.bb.__offset(this.bb_pos, 10);
-  return offset ? this.bb!.__union(obj, this.bb!.__vector(this.bb_pos + offset) + index * 4) : null;
+  return offset ? this.bb.__union(obj, this.bb.__vector(this.bb_pos + offset) + index * 4) : null;
 };
 
 /**
  * @returns {number}
  */
 charactersLength():number {
-  var offset = this.bb!.__offset(this.bb_pos, 10);
+  var offset = this.bb.__offset(this.bb_pos, 10);
-  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
+  return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0;
 };
 
 /**