From 1075c80e8aa85462893a1996b947da04d9fc6f85 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 25 Nov 2015 15:50:30 -0800
Subject: [PATCH 001/185] Fixed crash related to flatc parsing duplicate input
 files.

Thanks @Chaosvex for reporting.

Change-Id: I73f60ab0bf875a3e0849eaec5f42f6d036881094
Tested: on Linux.
---
 include/flatbuffers/idl.h | 2 +-
 src/idl_parser.cpp        | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index ad755f8c9..f1276f01b 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -419,7 +419,7 @@ class Parser {
   const char *source_, *cursor_;
   int line_;  // the current line being parsed
   int token_;
-  std::stack<std::string> files_being_parsed_;
+  std::string files_being_parsed_;
   bool proto_mode_;
   bool strict_json_;
   std::string attribute_;
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 13290e74b..233eeceef 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -892,7 +892,7 @@ EnumDef &Parser::ParseEnum(bool is_union) {
   Expect(kTokenIdentifier);
   auto &enum_def = *new EnumDef();
   enum_def.name = enum_name;
-  if (!files_being_parsed_.empty()) enum_def.file = files_being_parsed_.top();
+  enum_def.file = files_being_parsed_;
   enum_def.doc_comment = enum_comment;
   enum_def.is_union = is_union;
   enum_def.defined_namespace = namespaces_.back();
@@ -973,7 +973,7 @@ StructDef &Parser::StartStruct(const std::string &name) {
   if (!struct_def.predecl) Error("datatype already exists: " + name);
   struct_def.predecl = false;
   struct_def.name = name;
-  if (!files_being_parsed_.empty()) struct_def.file = files_being_parsed_.top();
+  struct_def.file = files_being_parsed_;
   // Move this struct to the back of the vector just in case it was predeclared,
   // to preserve declaration order.
   *remove(structs_.vec.begin(), structs_.vec.end(), &struct_def) = &struct_def;
@@ -1352,11 +1352,11 @@ Type Parser::ParseTypeFromProtoType() {
 
 bool Parser::Parse(const char *source, const char **include_paths,
                    const char *source_filename) {
+  files_being_parsed_ = source_filename ? source_filename : "";
   if (source_filename &&
       included_files_.find(source_filename) == included_files_.end()) {
     included_files_[source_filename] = true;
     files_included_per_file_[source_filename] = std::set<std::string>();
-    files_being_parsed_.push(source_filename);
   }
   if (!include_paths) {
     static const char *current_directory[] = { "", nullptr };
@@ -1499,10 +1499,8 @@ bool Parser::Parse(const char *source, const char **include_paths,
       error_ += NumToString(line_) + ":0";  // gcc alike
     #endif
     error_ += ": error: " + msg;
-    if (source_filename) files_being_parsed_.pop();
     return false;
   }
-  if (source_filename) files_being_parsed_.pop();
   return true;
 }
 

From b7d8c2af1a31bc8277884b417656236cc5f87e68 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 25 Nov 2015 16:48:28 -0800
Subject: [PATCH 002/185] Made generated C++ code respect gcc -Werror=shadow.

Change-Id: I17de0bcc462770124227a9967e2aab620467f6eb
Tested: on Linux.
---
 CMakeLists.txt                    |  2 +-
 include/flatbuffers/flatbuffers.h |  4 +--
 samples/monster_generated.h       | 16 ++++-----
 src/idl_gen_cpp.cpp               | 14 ++++----
 tests/monster_test_generated.h    | 54 +++++++++++++++----------------
 5 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1eef851b0..47a428230 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ if(APPLE)
     "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
 elseif(CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra")
+    "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra -Werror=shadow")
 elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   set(CMAKE_CXX_FLAGS
     "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 41b3b266c..a728a79cf 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -329,9 +329,9 @@ public:
       return nullptr;  // Key not found.
     }
 
-    const uint8_t *data = reinterpret_cast<const uint8_t *>(search_result);
+    const uint8_t *element = reinterpret_cast<const uint8_t *>(search_result);
 
-    return IndirectHelper<T>::Read(data, 0);
+    return IndirectHelper<T>::Read(element, 0);
   }
 
 protected:
diff --git a/samples/monster_generated.h b/samples/monster_generated.h
index 878a7688b..854e712ee 100644
--- a/samples/monster_generated.h
+++ b/samples/monster_generated.h
@@ -46,15 +46,15 @@ MANUALLY_ALIGNED_STRUCT(4) Vec3 FLATBUFFERS_FINAL_CLASS {
   float z_;
 
  public:
-  Vec3(float x, float y, float z)
-    : x_(flatbuffers::EndianScalar(x)), y_(flatbuffers::EndianScalar(y)), z_(flatbuffers::EndianScalar(z)) { }
+  Vec3(float _x, float _y, float _z)
+    : x_(flatbuffers::EndianScalar(_x)), y_(flatbuffers::EndianScalar(_y)), z_(flatbuffers::EndianScalar(_z)) { }
 
   float x() const { return flatbuffers::EndianScalar(x_); }
-  void mutate_x(float x) { flatbuffers::WriteScalar(&x_, x); }
+  void mutate_x(float _x) { flatbuffers::WriteScalar(&x_, _x); }
   float y() const { return flatbuffers::EndianScalar(y_); }
-  void mutate_y(float y) { flatbuffers::WriteScalar(&y_, y); }
+  void mutate_y(float _y) { flatbuffers::WriteScalar(&y_, _y); }
   float z() const { return flatbuffers::EndianScalar(z_); }
-  void mutate_z(float z) { flatbuffers::WriteScalar(&z_, z); }
+  void mutate_z(float _z) { flatbuffers::WriteScalar(&z_, _z); }
 };
 STRUCT_END(Vec3, 12);
 
@@ -62,15 +62,15 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   const Vec3 *pos() const { return GetStruct<const Vec3 *>(4); }
   Vec3 *mutable_pos() { return GetStruct<Vec3 *>(4); }
   int16_t mana() const { return GetField<int16_t>(6, 150); }
-  bool mutate_mana(int16_t mana) { return SetField(6, mana); }
+  bool mutate_mana(int16_t _mana) { return SetField(6, _mana); }
   int16_t hp() const { return GetField<int16_t>(8, 100); }
-  bool mutate_hp(int16_t hp) { return SetField(8, hp); }
+  bool mutate_hp(int16_t _hp) { return SetField(8, _hp); }
   const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(10); }
   flatbuffers::String *mutable_name() { return GetPointer<flatbuffers::String *>(10); }
   const flatbuffers::Vector<uint8_t> *inventory() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(14); }
   flatbuffers::Vector<uint8_t> *mutable_inventory() { return GetPointer<flatbuffers::Vector<uint8_t> *>(14); }
   Color color() const { return static_cast<Color>(GetField<int8_t>(16, 2)); }
-  bool mutate_color(Color color) { return SetField(16, static_cast<int8_t>(color)); }
+  bool mutate_color(Color _color) { return SetField(16, static_cast<int8_t>(_color)); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<Vec3>(verifier, 4 /* pos */) &&
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 904f4706b..641103810 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -277,8 +277,8 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
         if (is_scalar) {
           code += "  bool mutate_" + field.name + "(";
           code += GenTypeBasic(parser, field.value.type, true);
-          code += " " + field.name + ") { return SetField(" + offsetstr + ", ";
-          code += GenUnderlyingCast(parser, field, false, field.name);
+          code += " _" + field.name + ") { return SetField(" + offsetstr + ", ";
+          code += GenUnderlyingCast(parser, field, false, "_" + field.name);
           code += "); }\n";
         } else {
           auto type = GenTypeGet(parser, field.value.type, " ", "", " *", true);
@@ -524,7 +524,7 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
     auto &field = **it;
     if (it != struct_def.fields.vec.begin()) code += ", ";
     code += GenTypeGet(parser, field.value.type, " ", "const ", " &", true);
-    code += field.name;
+    code += "_" + field.name;
   }
   code += ")\n    : ";
   padding_id = 0;
@@ -536,10 +536,10 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
     code += field.name + "_(";
     if (IsScalar(field.value.type.base_type)) {
       code += "flatbuffers::EndianScalar(";
-      code += GenUnderlyingCast(parser, field, false, field.name);
+      code += GenUnderlyingCast(parser, field, false, "_" + field.name);
       code += "))";
     } else {
-      code += field.name + ")";
+      code += "_" + field.name + ")";
     }
     GenPadding(field, [&code, &padding_id](int bits) {
       (void)bits;
@@ -579,9 +579,9 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
       if (is_scalar) {
         code += "  void mutate_" + field.name + "(";
         code += GenTypeBasic(parser, field.value.type, true);
-        code += " " + field.name + ") { flatbuffers::WriteScalar(&";
+        code += " _" + field.name + ") { flatbuffers::WriteScalar(&";
         code += field.name + "_, ";
-        code += GenUnderlyingCast(parser, field, false, field.name);
+        code += GenUnderlyingCast(parser, field, false, "_" + field.name);
         code += "); }\n";
       } else {
         code += "  ";
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index ece639808..9ef76597b 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -55,13 +55,13 @@ MANUALLY_ALIGNED_STRUCT(2) Test FLATBUFFERS_FINAL_CLASS {
   int8_t __padding0;
 
  public:
-  Test(int16_t a, int8_t b)
-    : a_(flatbuffers::EndianScalar(a)), b_(flatbuffers::EndianScalar(b)), __padding0(0) { (void)__padding0; }
+  Test(int16_t _a, int8_t _b)
+    : a_(flatbuffers::EndianScalar(_a)), b_(flatbuffers::EndianScalar(_b)), __padding0(0) { (void)__padding0; }
 
   int16_t a() const { return flatbuffers::EndianScalar(a_); }
-  void mutate_a(int16_t a) { flatbuffers::WriteScalar(&a_, a); }
+  void mutate_a(int16_t _a) { flatbuffers::WriteScalar(&a_, _a); }
   int8_t b() const { return flatbuffers::EndianScalar(b_); }
-  void mutate_b(int8_t b) { flatbuffers::WriteScalar(&b_, b); }
+  void mutate_b(int8_t _b) { flatbuffers::WriteScalar(&b_, _b); }
 };
 STRUCT_END(Test, 4);
 
@@ -78,19 +78,19 @@ MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS {
   int16_t __padding2;
 
  public:
-  Vec3(float x, float y, float z, double test1, Color test2, const Test &test3)
-    : x_(flatbuffers::EndianScalar(x)), y_(flatbuffers::EndianScalar(y)), z_(flatbuffers::EndianScalar(z)), __padding0(0), test1_(flatbuffers::EndianScalar(test1)), test2_(flatbuffers::EndianScalar(static_cast<int8_t>(test2))), __padding1(0), test3_(test3), __padding2(0) { (void)__padding0; (void)__padding1; (void)__padding2; }
+  Vec3(float _x, float _y, float _z, double _test1, Color _test2, const Test &_test3)
+    : x_(flatbuffers::EndianScalar(_x)), y_(flatbuffers::EndianScalar(_y)), z_(flatbuffers::EndianScalar(_z)), __padding0(0), test1_(flatbuffers::EndianScalar(_test1)), test2_(flatbuffers::EndianScalar(static_cast<int8_t>(_test2))), __padding1(0), test3_(_test3), __padding2(0) { (void)__padding0; (void)__padding1; (void)__padding2; }
 
   float x() const { return flatbuffers::EndianScalar(x_); }
-  void mutate_x(float x) { flatbuffers::WriteScalar(&x_, x); }
+  void mutate_x(float _x) { flatbuffers::WriteScalar(&x_, _x); }
   float y() const { return flatbuffers::EndianScalar(y_); }
-  void mutate_y(float y) { flatbuffers::WriteScalar(&y_, y); }
+  void mutate_y(float _y) { flatbuffers::WriteScalar(&y_, _y); }
   float z() const { return flatbuffers::EndianScalar(z_); }
-  void mutate_z(float z) { flatbuffers::WriteScalar(&z_, z); }
+  void mutate_z(float _z) { flatbuffers::WriteScalar(&z_, _z); }
   double test1() const { return flatbuffers::EndianScalar(test1_); }
-  void mutate_test1(double test1) { flatbuffers::WriteScalar(&test1_, test1); }
+  void mutate_test1(double _test1) { flatbuffers::WriteScalar(&test1_, _test1); }
   Color test2() const { return static_cast<Color>(flatbuffers::EndianScalar(test2_)); }
-  void mutate_test2(Color test2) { flatbuffers::WriteScalar(&test2_, static_cast<int8_t>(test2)); }
+  void mutate_test2(Color _test2) { flatbuffers::WriteScalar(&test2_, static_cast<int8_t>(_test2)); }
   const Test &test3() const { return test3_; }
   Test &mutable_test3() { return test3_; }
 };
@@ -98,7 +98,7 @@ STRUCT_END(Vec3, 32);
 
 struct TestSimpleTableWithEnum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   Color color() const { return static_cast<Color>(GetField<int8_t>(4, 2)); }
-  bool mutate_color(Color color) { return SetField(4, static_cast<int8_t>(color)); }
+  bool mutate_color(Color _color) { return SetField(4, static_cast<int8_t>(_color)); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<int8_t>(verifier, 4 /* color */) &&
@@ -129,9 +129,9 @@ struct Stat FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   const flatbuffers::String *id() const { return GetPointer<const flatbuffers::String *>(4); }
   flatbuffers::String *mutable_id() { return GetPointer<flatbuffers::String *>(4); }
   int64_t val() const { return GetField<int64_t>(6, 0); }
-  bool mutate_val(int64_t val) { return SetField(6, val); }
+  bool mutate_val(int64_t _val) { return SetField(6, _val); }
   uint16_t count() const { return GetField<uint16_t>(8, 0); }
-  bool mutate_count(uint16_t count) { return SetField(8, count); }
+  bool mutate_count(uint16_t _count) { return SetField(8, _count); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, 4 /* id */) &&
@@ -172,9 +172,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   const Vec3 *pos() const { return GetStruct<const Vec3 *>(4); }
   Vec3 *mutable_pos() { return GetStruct<Vec3 *>(4); }
   int16_t mana() const { return GetField<int16_t>(6, 150); }
-  bool mutate_mana(int16_t mana) { return SetField(6, mana); }
+  bool mutate_mana(int16_t _mana) { return SetField(6, _mana); }
   int16_t hp() const { return GetField<int16_t>(8, 100); }
-  bool mutate_hp(int16_t hp) { return SetField(8, hp); }
+  bool mutate_hp(int16_t _hp) { return SetField(8, _hp); }
   const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(10); }
   flatbuffers::String *mutable_name() { return GetPointer<flatbuffers::String *>(10); }
   bool KeyCompareLessThan(const Monster *o) const { return *name() < *o->name(); }
@@ -182,9 +182,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   const flatbuffers::Vector<uint8_t> *inventory() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(14); }
   flatbuffers::Vector<uint8_t> *mutable_inventory() { return GetPointer<flatbuffers::Vector<uint8_t> *>(14); }
   Color color() const { return static_cast<Color>(GetField<int8_t>(16, 8)); }
-  bool mutate_color(Color color) { return SetField(16, static_cast<int8_t>(color)); }
+  bool mutate_color(Color _color) { return SetField(16, static_cast<int8_t>(_color)); }
   Any test_type() const { return static_cast<Any>(GetField<uint8_t>(18, 0)); }
-  bool mutate_test_type(Any test_type) { return SetField(18, static_cast<uint8_t>(test_type)); }
+  bool mutate_test_type(Any _test_type) { return SetField(18, static_cast<uint8_t>(_test_type)); }
   const void *test() const { return GetPointer<const void *>(20); }
   void *mutable_test() { return GetPointer<void *>(20); }
   const flatbuffers::Vector<const Test *> *test4() const { return GetPointer<const flatbuffers::Vector<const Test *> *>(22); }
@@ -203,23 +203,23 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   const Stat *testempty() const { return GetPointer<const Stat *>(32); }
   Stat *mutable_testempty() { return GetPointer<Stat *>(32); }
   uint8_t testbool() const { return GetField<uint8_t>(34, 0); }
-  bool mutate_testbool(uint8_t testbool) { return SetField(34, testbool); }
+  bool mutate_testbool(uint8_t _testbool) { return SetField(34, _testbool); }
   int32_t testhashs32_fnv1() const { return GetField<int32_t>(36, 0); }
-  bool mutate_testhashs32_fnv1(int32_t testhashs32_fnv1) { return SetField(36, testhashs32_fnv1); }
+  bool mutate_testhashs32_fnv1(int32_t _testhashs32_fnv1) { return SetField(36, _testhashs32_fnv1); }
   uint32_t testhashu32_fnv1() const { return GetField<uint32_t>(38, 0); }
-  bool mutate_testhashu32_fnv1(uint32_t testhashu32_fnv1) { return SetField(38, testhashu32_fnv1); }
+  bool mutate_testhashu32_fnv1(uint32_t _testhashu32_fnv1) { return SetField(38, _testhashu32_fnv1); }
   int64_t testhashs64_fnv1() const { return GetField<int64_t>(40, 0); }
-  bool mutate_testhashs64_fnv1(int64_t testhashs64_fnv1) { return SetField(40, testhashs64_fnv1); }
+  bool mutate_testhashs64_fnv1(int64_t _testhashs64_fnv1) { return SetField(40, _testhashs64_fnv1); }
   uint64_t testhashu64_fnv1() const { return GetField<uint64_t>(42, 0); }
-  bool mutate_testhashu64_fnv1(uint64_t testhashu64_fnv1) { return SetField(42, testhashu64_fnv1); }
+  bool mutate_testhashu64_fnv1(uint64_t _testhashu64_fnv1) { return SetField(42, _testhashu64_fnv1); }
   int32_t testhashs32_fnv1a() const { return GetField<int32_t>(44, 0); }
-  bool mutate_testhashs32_fnv1a(int32_t testhashs32_fnv1a) { return SetField(44, testhashs32_fnv1a); }
+  bool mutate_testhashs32_fnv1a(int32_t _testhashs32_fnv1a) { return SetField(44, _testhashs32_fnv1a); }
   uint32_t testhashu32_fnv1a() const { return GetField<uint32_t>(46, 0); }
-  bool mutate_testhashu32_fnv1a(uint32_t testhashu32_fnv1a) { return SetField(46, testhashu32_fnv1a); }
+  bool mutate_testhashu32_fnv1a(uint32_t _testhashu32_fnv1a) { return SetField(46, _testhashu32_fnv1a); }
   int64_t testhashs64_fnv1a() const { return GetField<int64_t>(48, 0); }
-  bool mutate_testhashs64_fnv1a(int64_t testhashs64_fnv1a) { return SetField(48, testhashs64_fnv1a); }
+  bool mutate_testhashs64_fnv1a(int64_t _testhashs64_fnv1a) { return SetField(48, _testhashs64_fnv1a); }
   uint64_t testhashu64_fnv1a() const { return GetField<uint64_t>(50, 0); }
-  bool mutate_testhashu64_fnv1a(uint64_t testhashu64_fnv1a) { return SetField(50, testhashu64_fnv1a); }
+  bool mutate_testhashu64_fnv1a(uint64_t _testhashu64_fnv1a) { return SetField(50, _testhashu64_fnv1a); }
   const flatbuffers::Vector<uint8_t> *testarrayofbools() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(52); }
   flatbuffers::Vector<uint8_t> *mutable_testarrayofbools() { return GetPointer<flatbuffers::Vector<uint8_t> *>(52); }
   bool Verify(flatbuffers::Verifier &verifier) const {

From d7b4a31e93004e17fb320682b1801c1aaa9e7afc Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 25 Nov 2015 17:26:34 -0800
Subject: [PATCH 003/185] Added long form options for all generators (--cpp
 etc.)

Short-form versions are still supported, but are deprecated.

Change-Id: I15f70ca8d69ba5790368205caa9603b65e1b7fff
Tested: on Linux.
---
 docs/html/md__compiler.html     |  27 +++++++++++++++++--------
 docs/source/Compiler.md         |  34 +++++++++++++++++++++++---------
 src/flatc.cpp                   |  34 +++++++++++++++++++-------------
 tests/generate_code.sh          |   4 ++--
 tests/monster_test.bfbs         | Bin 2784 -> 2744 bytes
 tests/monster_test_generated.js |   2 ++
 6 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/docs/html/md__compiler.html b/docs/html/md__compiler.html
index 2fe560da6..ff3f7fe22 100644
--- a/docs/html/md__compiler.html
+++ b/docs/html/md__compiler.html
@@ -61,18 +61,28 @@ $(document).ready(function(){initNavTree('md__compiler.html','');});
 <div class="title">Using the schema compiler </div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="textblock"><p>Usage: </p><pre class="fragment">flatc [ -c ] [ -j ] [ -b ] [ -t ] [ -o PATH ] [ -I PATH ] [ -S ] FILES...
+<div class="textblock"><p>Usage: </p><pre class="fragment">flatc [ GENERATOR OPTIONS ] [ -o PATH ] [ -I PATH ] [ -S ] FILES...
       [ -- FILES...]
 </pre><p>The files are read and parsed in order, and can contain either schemas or data (see below). Later files can make use of definitions in earlier files.</p>
 <p><code>--</code> indicates that the following files are binary files in FlatBuffer format conforming to the schema(s) indicated before it. Incompatible binary files currently will give unpredictable results (!)</p>
 <p>Depending on the flags passed, additional files may be generated for each file processed:</p>
+<p>For any schema input files, one or more generators can be specified:</p>
+<ul>
+<li><code>--cpp</code>, <code>-c</code> : Generate a C++ header for all definitions in this file (as <code>filename_generated.h</code>).</li>
+<li><code>--java</code>, <code>-j</code> : Generate Java code.</li>
+<li><code>--csharp</code>, <code>-n</code> : Generate C# code.</li>
+<li><code>--go</code>, <code>-g</code> : Generate Go code.</li>
+<li><code>--python</code>, <code>-p</code>: Generate Python code.</li>
+<li><code>--javascript</code>, <code>-s</code>: Generate JavaScript code.</li>
+<li><code>--php</code>: Generate PHP code.</li>
+</ul>
+<p>For any data input files:</p>
+<ul>
+<li><code>--binary</code>, <code>-b</code> : If data is contained in this file, generate a <code>filename.bin</code> containing the binary flatbuffer (or a different extension if one is specified in the schema).</li>
+<li><code>--json</code>, <code>-t</code> : If data is contained in this file, generate a <code>filename.json</code> representing the data in the flatbuffer.</li>
+</ul>
+<p>Additional options:</p>
 <ul>
-<li><code>-c</code> : Generate a C++ header for all definitions in this file (as <code>filename_generated.h</code>). Skipped for data.</li>
-<li><code>-j</code> : Generate Java classes. Skipped for data.</li>
-<li><code>-n</code> : Generate C# classes. Skipped for data.</li>
-<li><code>-g</code> : Generate Go classes. Skipped for data.</li>
-<li><code>-b</code> : If data is contained in this file, generate a <code>filename.bin</code> containing the binary flatbuffer.</li>
-<li><code>-t</code> : If data is contained in this file, generate a <code>filename.json</code> representing the data in the flatbuffer.</li>
 <li><code>-o PATH</code> : Output all generated files to PATH (either absolute, or relative to the current directory). If omitted, PATH will be the current directory. PATH should end in your systems path separator, e.g. <code>/</code> or <code>\</code>.</li>
 <li><code>-I PATH</code> : when encountering <code>include</code> statements, attempt to load the files from this path. Paths will be tried in the order given, and if all fail (or none are specified) it will try to load relative to the path of the schema file being parsed.</li>
 <li><code>-M</code> : Print make rules for generated files.</li>
@@ -86,8 +96,9 @@ $(document).ready(function(){initNavTree('md__compiler.html','');});
 <li><code>--gen-onefile</code> : Generate single output file (useful for C#)</li>
 <li><code>--raw-binary</code> : Allow binaries without a file_indentifier to be read. This may crash flatc given a mismatched schema.</li>
 <li><code>--proto</code>: Expect input files to be .proto files (protocol buffers). Output the corresponding .fbs file. Currently supports: <code>package</code>, <code>message</code>, <code>enum</code>, nested declarations, <code>import</code> (use <code>-I</code> for paths), <code>extend</code>, <code>oneof</code>, <code>group</code>. Does not support, but will skip without error: <code>option</code>, <code>service</code>, <code>extensions</code>, and most everything else.</li>
-<li><code>--schema</code>: Serialize schemas instead of JSON (use with -b). This will output a binary version of the specified schema that itself corresponds to the reflection/reflection.fbs schema. Loading this binary file is the basis for reflection functionality. </li>
+<li><code>--schema</code>: Serialize schemas instead of JSON (use with -b). This will output a binary version of the specified schema that itself corresponds to the reflection/reflection.fbs schema. Loading this binary file is the basis for reflection functionality.</li>
 </ul>
+<p>NOTE: short-form options for generators are deprecated, use the long form whenever possible. </p>
 </div></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- Google Analytics -->
diff --git a/docs/source/Compiler.md b/docs/source/Compiler.md
index 4e6b7994b..27ddf52e4 100755
--- a/docs/source/Compiler.md
+++ b/docs/source/Compiler.md
@@ -2,7 +2,7 @@
 
 Usage:
 
-    flatc [ -c ] [ -j ] [ -b ] [ -t ] [ -o PATH ] [ -I PATH ] [ -S ] FILES...
+    flatc [ GENERATOR OPTIONS ] [ -o PATH ] [ -I PATH ] [ -S ] FILES...
           [ -- FILES...]
 
 The files are read and parsed in order, and can contain either schemas
@@ -16,21 +16,34 @@ Incompatible binary files currently will give unpredictable results (!)
 Depending on the flags passed, additional files may
 be generated for each file processed:
 
--   `-c` : Generate a C++ header for all definitions in this file (as
-    `filename_generated.h`). Skipped for data.
+For any schema input files, one or more generators can be specified:
 
--   `-j` : Generate Java classes. Skipped for data.
+-   `--cpp`, `-c` : Generate a C++ header for all definitions in this file (as
+    `filename_generated.h`).
 
--   `-n` : Generate C# classes. Skipped for data.
+-   `--java`, `-j` : Generate Java code.
 
--   `-g` : Generate Go classes. Skipped for data.
+-   `--csharp`, `-n` : Generate C# code.
 
--   `-b` : If data is contained in this file, generate a
-    `filename.bin` containing the binary flatbuffer.
+-   `--go`, `-g` : Generate Go code.
 
--   `-t` : If data is contained in this file, generate a
+-   `--python`, `-p`: Generate Python code.
+
+-   `--javascript`, `-s`: Generate JavaScript code.
+
+-   `--php`: Generate PHP code.
+
+For any data input files:
+
+-   `--binary`, `-b` : If data is contained in this file, generate a
+    `filename.bin` containing the binary flatbuffer (or a different extension
+    if one is specified in the schema).
+
+-   `--json`, `-t` : If data is contained in this file, generate a
     `filename.json` representing the data in the flatbuffer.
 
+Additional options:
+
 -   `-o PATH` : Output all generated files to PATH (either absolute, or
     relative to the current directory). If omitted, PATH will be the
     current directory. PATH should end in your systems path separator,
@@ -82,3 +95,6 @@ be generated for each file processed:
     output a binary version of the specified schema that itself corresponds
     to the reflection/reflection.fbs schema. Loading this binary file is the
     basis for reflection functionality.
+
+NOTE: short-form options for generators are deprecated, use the long form
+whenever possible.
diff --git a/src/flatc.cpp b/src/flatc.cpp
index 337ce5d8e..2479da12b 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -28,7 +28,8 @@ struct Generator {
                    const std::string &path,
                    const std::string &file_name,
                    const flatbuffers::GeneratorOptions &opts);
-  const char *generator_opt;
+  const char *generator_opt_short;
+  const char *generator_opt_long;
   const char *lang_name;
   flatbuffers::GeneratorOptions::Language lang;
   const char *generator_help;
@@ -40,41 +41,41 @@ struct Generator {
 };
 
 const Generator generators[] = {
-  { flatbuffers::GenerateBinary,   "-b", "binary",
+  { flatbuffers::GenerateBinary,   "-b", "--binary", "binary",
     flatbuffers::GeneratorOptions::kMAX,
     "Generate wire format binaries for any data definitions",
     flatbuffers::BinaryMakeRule },
-  { flatbuffers::GenerateTextFile, "-t", "text",
+  { flatbuffers::GenerateTextFile, "-t", "--json", "text",
     flatbuffers::GeneratorOptions::kMAX,
     "Generate text output for any data definitions",
     flatbuffers::TextMakeRule },
-  { flatbuffers::GenerateCPP,      "-c", "C++",
+  { flatbuffers::GenerateCPP,      "-c", "--cpp", "C++",
     flatbuffers::GeneratorOptions::kMAX,
     "Generate C++ headers for tables/structs",
     flatbuffers::CPPMakeRule },
-  { flatbuffers::GenerateGo,       "-g", "Go",
+  { flatbuffers::GenerateGo,       "-g", "--go", "Go",
     flatbuffers::GeneratorOptions::kGo,
     "Generate Go files for tables/structs",
     flatbuffers::GeneralMakeRule },
-  { flatbuffers::GenerateGeneral,  "-j", "Java",
+  { flatbuffers::GenerateGeneral,  "-j", "--java", "Java",
     flatbuffers::GeneratorOptions::kJava,
     "Generate Java classes for tables/structs",
     flatbuffers::GeneralMakeRule },
-  { flatbuffers::GenerateJS,       "-s", "JavaScript",
+  { flatbuffers::GenerateJS,       "-s", "--js", "JavaScript",
     flatbuffers::GeneratorOptions::kMAX,
     "Generate JavaScript code for tables/structs",
     flatbuffers::JSMakeRule },
-  { flatbuffers::GenerateGeneral,  "-n", "C#",
+  { flatbuffers::GenerateGeneral,  "-n", "--csharp", "C#",
     flatbuffers::GeneratorOptions::kCSharp,
     "Generate C# classes for tables/structs",
     flatbuffers::GeneralMakeRule },
-  { flatbuffers::GeneratePython,   "-p", "Python",
+  { flatbuffers::GeneratePython,   "-p", "--python", "Python",
     flatbuffers::GeneratorOptions::kMAX,
     "Generate Python files for tables/structs",
     flatbuffers::GeneralMakeRule },
-    { flatbuffers::GeneratePhp,   "--php", "PHP",
+    { flatbuffers::GeneratePhp, nullptr, "--php", "PHP",
     flatbuffers::GeneratorOptions::kMAX,
-    "Generate Php files for tables/structs",
+    "Generate PHP files for tables/structs",
     flatbuffers::GeneralMakeRule },
 };
 
@@ -86,8 +87,11 @@ static void Error(const std::string &err, bool usage, bool show_exe_name) {
   if (usage) {
     printf("usage: %s [OPTION]... FILE... [-- FILE...]\n", program_name);
     for (size_t i = 0; i < sizeof(generators) / sizeof(generators[0]); ++i)
-      printf("  %s              %s.\n",
-             generators[i].generator_opt,
+      printf("  %-12s %s %s.\n",
+             generators[i].generator_opt_long,
+             generators[i].generator_opt_short
+               ? generators[i].generator_opt_short
+               : "  ",
              generators[i].generator_help);
     printf(
       "  -o PATH         Prefix PATH to all generated files.\n"
@@ -179,7 +183,9 @@ int main(int argc, const char *argv[]) {
         print_make_rules = true;
       } else {
         for (size_t i = 0; i < num_generators; ++i) {
-          if (arg == generators[i].generator_opt) {
+          if (arg == generators[i].generator_opt_long ||
+              (generators[i].generator_opt_short &&
+               arg == generators[i].generator_opt_short)) {
             generator_enabled[i] = true;
             any_generator = true;
             goto found;
diff --git a/tests/generate_code.sh b/tests/generate_code.sh
index 91158bff4..91661f30d 100644
--- a/tests/generate_code.sh
+++ b/tests/generate_code.sh
@@ -1,2 +1,2 @@
-../flatc -c -j -n -g -b -p -s --php --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
-../flatc -b --schema monster_test.fbs
+../flatc --cpp --java --csharp --go --binary --python --js --php --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
+../flatc --binary --schema monster_test.fbs
diff --git a/tests/monster_test.bfbs b/tests/monster_test.bfbs
index 8d54ead7e9a3a5047063843fdf0f38af5266385b..e5f51face696a1ee9b3aa64b70bba83df1c4645a 100644
GIT binary patch
literal 2744
zcmaJ@O^91n6h4{!|4fqBF&(9pAVVodhITp(B1P&*>kl>sCr-hIoi~#g6G`3+$xCQl
zhzl39Dy{}sBBc~@DXzK@aUs%05f??Il;TRda5-qLjo)|fyP1auFPxm0d%tt;ch0%z
zzIRka)-SAYKw%VRQ4*4of|O+e{{+7x&qH2-oP!kRL{iWR=-1LBUt~qfkT-K8_wYZC
zHR2yYc4NRnU%XUP|6J?(9=tE;9%<}Sz#K-5x(qoAA?{^wtoma-Z$UW!aDOs^f>(~5
zaxK6UwpO0I84=K$jw5)gyMth(-R*VUy0hJJFSmo%d2iUoN)9#&>~HM3_bGS|oeM&d
zi@rAq+`i-{lL_OX)GpP|L&+BA$eH=6LXwbI{Epv;CjS=XEQEe<{h_?$^!+RBI0vfJ
zLBH#rp=&vDjWH1yjfZ=@+IL+Kt7WZ|!I6jM&As1p8(KkD5*5=N6SD|m9`le3eZTv<
zx6>ImT(#x=8-{1r?3sf#nVCKKL{6d2rqdDG2j1p@`$u#34E}!&GM~cP5{!2tKjZ(m
z&~?afkaPH7fNVi{zJ37q6UaR}gT4X%0FP&(uR=GVKZkw{AwC1lO>kJ0RgIJ}FlPa3
z?)3Z4*l%w8erJFw@&0BFigR~?KO!qr{Gkxvat5v8+Uk|2H#+TL?#Z88vs?<gBBy5J
z2NC@8BgJRefPY$+XX1xvR;K>nHTX;u_yu$fD@FcMK7$DUn!%^{fPYF(PVqM0D1W$-
zZwx;7J@AL+#7w;9PyFv8|9#*O$?=(Z%b)mTe`&m#<FG5s(oDSNPkhbb)0@DT<T=H&
zcNjP8#X=D`GPt=9fh$UNio+G7IJesi#&|A1*8NL367nUm^KwkFRs5%4`t%@fquFtS
z?P0TtM#dPS|6rZC51Rrq&i$D~_Ll3pUHX1M^o>VJflpqZRa~?_;rR-9sqlbZH-1aB
zc@Z|eo#=ZBVrv@O41#{!dk@`|!A;7ZVPApMd>?jMsi+-$m7EyIDi8(5n!5_v5{|xH
z2R?&nZ478B#Y4%mo_7sRZUdK=!-`{WY%Z?^<DQHE?-(poDf>?*lN8K|W4!cj2l?!T
zcic5&qj%a#<SU7{1+lcD|F$=By}<8}!99h0gtm;cn5e)v-!C>6W<U_Nj+nWTO%3U<
z*>AgEqr<Yu8tXFmZ+pIv(xH7U7RN5pe0WZmA<7-Ycm6KwGzSFZV~!hK3<q=C>WO^D
zeUcSD9R+Y_KI|aR7-npK_Ur;Q^WSwmULW!j@(7jm^jz4R*t{Eh{y^@S^%C<!Z1f(b
zpN+r?p!8kBwJpdA$R6S#e;cEz$<QPCE8{bD3m9@FhPJp~WrPcR#2jQRntRUkJ#L4|
z{{c_tqK)LFl)uc^jPDpT!MssdA>_L0?wo;Ae@Nf-z4s%YZ$LhR&^{UV5pBtvXPbt<
zm_77NkAO>ry%X($73~3@6?<+(&)!Yo;~LRHAJgw?Aipzy3%7x>Ib+;B=pR7%E{4iK
z#Ci;oFkh@I*LiL;+MTvPC4V0{n^R)0Lg-uaMKCzX9lx8n&k}^V|N9Q%I(vp4z#GHV
zg&8u#)`c@w2<yUO>dx<t96Im6c|oUz{`i$;zU5#xtsnicc9c5u1*N|0(3TH-)SQ2=
znqkgAvuR=^|82-m%w@cyc&<eUZKAn#z&WK6gt<)?!H|2AE1B!iZ$euSp4GR#;Q*gD
GI{pD>UDHnh

literal 2784
zcmaKuOK6-`6vxjblTI?3Owt&qQG$e0N{~=&T8gWpv8^%CRQiaULY*Yvn8?gG!#slN
zLPUxyS6y^bBr6dYr4$!I#8nn9y68$=Ns%n13m0A0cgNrV-nm~t>*K<id+)jb^SI}n
zd*+)mv-vag7nm4Do3yMATEWI_f}PpR&>?678Wi=J^)uJ%F-Wts=a!tTc*mg!(8n3G
zeazo8pURot8bTg=GY^k_0d2C8!%6`hBQwK~Y)I!9kGfs)AZP0X=F8AzZ~tn%#VYT7
zEuaatPWBEC;$AWiu(}wv+7~uzjcRnUyi$$c+Gwwzjyp9@^2lVd@8!qf%wo|QWsRG5
zwjQ_IQPYauZdZPZmd-7mX0kPSX`d@UJD>X{uUNbdDIU^00KHbP)|<?`$ccxm$&lXp
zY9|t7uXmolhvZ*xMp4}JS+csb^aOudI=kniHSRQquR;}Ee5YB3*cN|rehx{$WOX(S
zooUu<Z^WzB&YIlFBQ3AI9j#=qcfMS%n%zZD8=kC4&vVe%T>MiMzk<M*&_nhQnH$g~
zmsnsw2CYM<z<&$&6X*d73e0zye}ccje2uxme2aOIS@;Ps>Abv;50gY$alnMdf9P(-
zKJDA&z1(b;x9XLZdcE3$Ww*f}u(<?Z@v+G7@8Q?Wt@X}{<5w#2=Fu{|`<$2Tr38P&
z<A>7tRtjJIwcCBxjwJYRJbo~Z?;M*;^q&MjVY3PTk;muK_*M!ZgMY?eOz?-<<7PhG
zH|;-s+va@SW)l3e#}B3P!GGcJalYRUC-{#%elU#>{tN$@^D(-E&K3V1kI$v?!GGb8
z{MPM`+Q9_>qsRBDhLkTQO1NckMVn4)c9%WuQOdw*BMuwY8f|rf4>=pL7ZRP#$F2sl
zs(0y(p=hmAEw@)Xl?soUv4c#(rV{-JfA{)zrneTwQBAt<gB!Nz6WmSSCiOKcT*y(c
z#@cEwDzb5OsWXL`^m&<)r|_+Ib0dBS{37Q=R^qn)J?o_v=$<)VmfoD~QTEO+-A6rT
z6B~ng72foo_g^Mm9)#0+8-C8l6I|ZC58pCE9Iv#u8hY{Sar^Lkigf`}PBcz>8Q0eo
zn^o7xN@!IF&$>SEfc%u80sb|l!#U&ni0<P12UfDOyAf|jal78!LSh0fW652G^m>>w
z>dqmK<K7QfE0yL(6t7iD(bMw!-^n>Y5YO~uKggf=@*}QKlxtkMM3%xGytl!2AAJ4S
zC=P34GOm010p()7Ax?>V{=0kzFG37%2-+Lp^>oOGS~*sWv3Fg4WRo1-{?pf@VojU0
zM!jVxsA=g7y;gkrCpT0N(s!X<b~(R}y!;RMUiA9*`P_A4fp*}@$AF1FW=MKB)!ez8
za-#d|e>@E3SJr~uXI^eZG1(wci|*}NW|qBVg`0+?Lv|M+-Qx%7bLbi*-<PA+V@$S$
z{6OlxedYE2t^Nhvgr6k>6Rah_=W$7ms{ZHTZ^Q4$i{S6F#}yO{VU9BI!b`{Ns>ckg
z*Ib39JCnNe&D6Q-S8pJ^72s|tPQm8g6#hNl#*=?$UIRGYA>>sy^}Y4~-z_B~6mlag
zeuUi2uvKj+Cw{1(=v{?=Vo99*Th=$9^yzENfAay(C{N0v^eD!fFGGiV`-`r}ggW_W
zAIKmPVsOvZxVO7P%!>aJGuiYv()Wk&1-=K`fMQcd^2wK@k00!eWI_yCx_Y}5cUpW3
F*<Tm>)yDt;

diff --git a/tests/monster_test_generated.js b/tests/monster_test_generated.js
index d46a9c684..9d0f48b09 100644
--- a/tests/monster_test_generated.js
+++ b/tests/monster_test_generated.js
@@ -352,6 +352,8 @@ MyGame.Example.Stat.endStat = function(builder) {
 };
 
 /**
+ * an example documentation comment: monster object
+ *
  * @constructor
  */
 MyGame.Example.Monster = function() {

From 671c9495d946ca1aa42bbc058c7407ff3556f0b1 Mon Sep 17 00:00:00 2001
From: Chris <chris@yourdreamnet.co.uk>
Date: Fri, 27 Nov 2015 20:05:48 +0000
Subject: [PATCH 004/185] Return the full string when requested from a
 flatbuffers::String, even if it contains a NULL byte.

---
 include/flatbuffers/flatbuffers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index a728a79cf..c2b938d36 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -379,7 +379,7 @@ template<typename T> static inline size_t VectorLength(const Vector<T> *v) {
 
 struct String : public Vector<char> {
   const char *c_str() const { return reinterpret_cast<const char *>(Data()); }
-  std::string str() const { return c_str(); }
+  std::string str() const { return std::string(c_str(), Length()); }
 
   bool operator <(const String &o) const {
     return strcmp(c_str(), o.c_str()) < 0;

From 1d457a0271ec4b2ddf73e52a13c856ed939efde0 Mon Sep 17 00:00:00 2001
From: Chris <chris@yourdreamnet.co.uk>
Date: Fri, 27 Nov 2015 20:06:41 +0000
Subject: [PATCH 005/185] Fix use of std::max when Windows.h is imported.

---
 include/flatbuffers/flatbuffers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index c2b938d36..2af4486c7 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -445,7 +445,7 @@ class vector_downward {
     if (len > static_cast<size_t>(cur_ - buf_)) {
       auto old_size = size();
       auto largest_align = AlignOf<largest_scalar_t>();
-      reserved_ += std::max(len, growth_policy(reserved_));
+      reserved_ += (std::max)(len, growth_policy(reserved_));
       // Round up to avoid undefined behavior from unaligned loads and stores.
       reserved_ = (reserved_ + (largest_align - 1)) & ~(largest_align - 1);
       auto new_buf = allocator_.allocate(reserved_);

From 54dc4395b90d5a563bad45b381cba663d68370c6 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 30 Nov 2015 11:25:21 -0800
Subject: [PATCH 006/185] Java builder now checks if buffer was finished upon
 access.

Also checks for nesting of objects in vector construction.

This avoids common errors in FlatBuffer construction.

Change-Id: I5507c5d767684e20e94883a92448f05acefba4d6
Tested: on Linux.
---
 .../google/flatbuffers/FlatBufferBuilder.java | 46 ++++++++++++++-----
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/java/com/google/flatbuffers/FlatBufferBuilder.java b/java/com/google/flatbuffers/FlatBufferBuilder.java
index 368be2f30..a6234ca63 100644
--- a/java/com/google/flatbuffers/FlatBufferBuilder.java
+++ b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -28,18 +28,19 @@ import java.nio.charset.Charset;
  * main FlatBuffers documentation.
  */
 public class FlatBufferBuilder {
-    ByteBuffer bb;          // Where we construct the FlatBuffer.
-    int space;              // Remaining space in the ByteBuffer.
+    ByteBuffer bb;                   // Where we construct the FlatBuffer.
+    int space;                       // Remaining space in the ByteBuffer.
     static final Charset utf8charset = Charset.forName("UTF-8");
-    int minalign = 1;       // Minimum alignment encountered so far.
-    int[] vtable = null;    // The vtable for the current table.
-    int vtable_in_use = 0;  // The amount of fields we're actually using.
-    boolean nested = false; // Whether we are currently serializing a table.
-    int object_start;       // Starting offset of the current struct/table.
-    int[] vtables = new int[16];  // List of offsets of all vtables.
-    int num_vtables = 0;          // Number of entries in `vtables` in use.
-    int vector_num_elems = 0;     // For the current vector being built.
-    boolean force_defaults = false; // False omits default values from the serialized data
+    int minalign = 1;                // Minimum alignment encountered so far.
+    int[] vtable = null;             // The vtable for the current table.
+    int vtable_in_use = 0;           // The amount of fields we're actually using.
+    boolean nested = false;          // Whether we are currently serializing a table.
+    boolean finished = false;        // Whether the buffer is finished.
+    int object_start;                // Starting offset of the current struct/table.
+    int[] vtables = new int[16];     // List of offsets of all vtables.
+    int num_vtables = 0;             // Number of entries in `vtables` in use.
+    int vector_num_elems = 0;        // For the current vector being built.
+    boolean force_defaults = false;  // False omits default values from the serialized data
 
    /**
     * Start with a buffer of size {@code initial_size}, then grow as required.
@@ -86,6 +87,7 @@ public class FlatBufferBuilder {
         space = bb.capacity();
         vtable_in_use = 0;
         nested = false;
+        finished = false;
         object_start = 0;
         num_vtables = 0;
         vector_num_elems = 0;
@@ -240,6 +242,7 @@ public class FlatBufferBuilder {
         vector_num_elems = num_elems;
         prep(SIZEOF_INT, elem_size * num_elems);
         prep(alignment, elem_size * num_elems); // Just in case alignment > int.
+        nested = true;
     }
 
    /**
@@ -250,6 +253,9 @@ public class FlatBufferBuilder {
     * @see #startVector(int, int, int)
     */
     public int endVector() {
+        if (!nested)
+            throw new AssertionError("FlatBuffers: endVector called without startVector");
+        nested = false;
         putInt(vector_num_elems);
         return offset();
     }
@@ -284,6 +290,16 @@ public class FlatBufferBuilder {
         return endVector();
     }
 
+   /**
+    * Should not be accessing the final buffer before it is finished.
+    */
+    public void finished() {
+        if (!finished)
+            throw new AssertionError(
+                "FlatBuffers: you can only access the serialized buffer after it has been" +
+                " finished by FlatBufferBuilder.finish().");
+    }
+
    /**
     * Should not be creating any other object, string or vector
     * while an object is being constructed
@@ -452,6 +468,7 @@ public class FlatBufferBuilder {
         prep(minalign, SIZEOF_INT);
         addOffset(root_table);
         bb.position(space);
+        finished = true;
     }
 
     public void finish(int root_table, String file_identifier) {
@@ -481,7 +498,10 @@ public class FlatBufferBuilder {
     // Get the ByteBuffer representing the FlatBuffer. Only call this after you've
     // called finish(). The actual data starts at the ByteBuffer's current position,
     // not necessarily at 0.
-    public ByteBuffer dataBuffer() { return bb; }
+    public ByteBuffer dataBuffer() {
+        finished();
+        return bb;
+    }
 
    /**
     * The FlatBuffer data doesn't start at offset 0 in the {@link ByteBuffer}, but
@@ -493,6 +513,7 @@ public class FlatBufferBuilder {
     */
     @Deprecated
     private int dataStart() {
+        finished();
         return space;
     }
 
@@ -506,6 +527,7 @@ public class FlatBufferBuilder {
     * @throws IndexOutOfBoundsException If the range of bytes is ouf of bound
     */
     public byte[] sizedByteArray(int start, int length){
+        finished();
         byte[] array = new byte[length];
         bb.position(start);
         bb.get(array);

From fc1cfd287a6c40137c3674ad44a9724006c7f20e Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 30 Nov 2015 11:50:09 -0800
Subject: [PATCH 007/185] Allow vectors to be aligned beyond their natural
 type.

Change-Id: I09ade6b688a6b97d65fd832558917225d86c9118
---
 include/flatbuffers/flatbuffers.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 2af4486c7..569c72b31 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -799,6 +799,15 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
     PreAlign(len * elemsize, elemsize);  // Just in case elemsize > uoffset_t.
   }
 
+  // Call this right before StartVector/CreateVector if you want to force the
+  // alignment to be something different than what the element size would
+  // normally dictate.
+  // This is useful when storing a nested_flatbuffer in a vector of bytes,
+  // or when storing SIMD floats, etc.
+  void ForceVectorAlignment(size_t len, size_t elemsize, size_t alignment) {
+    PreAlign(len * elemsize, alignment);
+  }
+
   uint8_t *ReserveElements(size_t len, size_t elemsize) {
     return buf_.make_space(len * elemsize);
   }

From 3fc5387db79612981b41b86cd89f315269d54f3f Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 30 Nov 2015 13:54:24 -0800
Subject: [PATCH 008/185] Made C++ generated code use "bool" instead of uint8_t
 wire type.

Change-Id: I5756d15a758429ca67456264842017063d1f755e
Tested: on Linux.
---
 src/idl_gen_cpp.cpp            | 34 +++++++++++++++++++++-------------
 tests/monster_test_generated.h |  8 ++++----
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 641103810..7c39c325a 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -59,20 +59,22 @@ static std::string TranslateNameSpace(const std::string &qualified_name) {
 
 // Return a C++ type from the table in idl.h
 static std::string GenTypeBasic(const Parser &parser, const Type &type,
-                                bool real_enum) {
+                                bool user_facing_type) {
   static const char *ctypename[] = {
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
       #CTYPE,
       FLATBUFFERS_GEN_TYPES(FLATBUFFERS_TD)
     #undef FLATBUFFERS_TD
   };
-  return real_enum && type.enum_def
-      ? WrapInNameSpace(parser, *type.enum_def)
-      : ctypename[type.base_type];
+  if (user_facing_type) {
+    if (type.enum_def) return WrapInNameSpace(parser, *type.enum_def);
+    if (type.base_type == BASE_TYPE_BOOL) return "bool";
+  }
+  return ctypename[type.base_type];
 }
 
 static std::string GenTypeWire(const Parser &parser, const Type &type,
-                               const char *postfix, bool real_enum);
+                               const char *postfix, bool user_facing_type);
 
 // Return a C++ pointer type, specialized to the actual struct/table types,
 // and vector element types.
@@ -96,9 +98,9 @@ static std::string GenTypePointer(const Parser &parser, const Type &type) {
 // Return a C++ type for any type (scalar/pointer) specifically for
 // building a flatbuffer.
 static std::string GenTypeWire(const Parser &parser, const Type &type,
-                               const char *postfix, bool real_enum) {
+                               const char *postfix, bool user_facing_type) {
   return IsScalar(type.base_type)
-    ? GenTypeBasic(parser, type, real_enum) + postfix
+    ? GenTypeBasic(parser, type, user_facing_type) + postfix
     : IsStruct(type)
       ? "const " + GenTypePointer(parser, type) + " *"
       : "flatbuffers::Offset<" + GenTypePointer(parser, type) + ">" + postfix;
@@ -118,9 +120,9 @@ static std::string GenTypeSize(const Parser &parser, const Type &type) {
 // using a flatbuffer.
 static std::string GenTypeGet(const Parser &parser, const Type &type,
                               const char *afterbasic, const char *beforeptr,
-                              const char *afterptr, bool real_enum) {
+                              const char *afterptr, bool user_facing_type) {
   return IsScalar(type.base_type)
-    ? GenTypeBasic(parser, type, real_enum) + afterbasic
+    ? GenTypeBasic(parser, type, user_facing_type) + afterbasic
     : beforeptr + GenTypePointer(parser, type) + afterptr;
 }
 
@@ -190,9 +192,12 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
     }
     code += "nullptr };\n  return names;\n}\n\n";
     code += "inline const char *EnumName" + enum_def.name;
-    code += "(" + enum_def.name + " e) { return EnumNames" + enum_def.name + "()[static_cast<int>(e)";
-    if (enum_def.vals.vec.front()->value)
-      code += " - static_cast<int>(" + GetEnumVal(enum_def, *enum_def.vals.vec.front(), opts) +")";
+    code += "(" + enum_def.name + " e) { return EnumNames" + enum_def.name;
+    code += "()[static_cast<int>(e)";
+    if (enum_def.vals.vec.front()->value) {
+      code += " - static_cast<int>(";
+      code += GetEnumVal(enum_def, *enum_def.vals.vec.front(), opts) +")";
+    }
     code += "]; }\n\n";
   }
 
@@ -230,7 +235,8 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
 // underlying type to the interface type.
 std::string GenUnderlyingCast(const Parser &parser, const FieldDef &field,
                               bool from, const std::string &val) {
-  return field.value.type.enum_def && IsScalar(field.value.type.base_type)
+  return (field.value.type.enum_def && IsScalar(field.value.type.base_type)) ||
+         field.value.type.base_type == BASE_TYPE_BOOL
       ? "static_cast<" + GenTypeBasic(parser, field.value.type, from) + ">(" +
         val + ")"
       : val;
@@ -456,6 +462,8 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
         } else {
           code += GenUnderlyingCast(parser, field, true, field.value.constant);
         }
+      } else if (field.value.type.base_type == BASE_TYPE_BOOL) {
+        code += field.value.constant == "0" ? "false" : "true";
       } else {
         code += field.value.constant;
       }
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index 9ef76597b..8a78de530 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -202,8 +202,8 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   const MyGame::Example::Monster *testnestedflatbuffer_nested_root() const { return flatbuffers::GetRoot<MyGame::Example::Monster>(testnestedflatbuffer()->Data()); }
   const Stat *testempty() const { return GetPointer<const Stat *>(32); }
   Stat *mutable_testempty() { return GetPointer<Stat *>(32); }
-  uint8_t testbool() const { return GetField<uint8_t>(34, 0); }
-  bool mutate_testbool(uint8_t _testbool) { return SetField(34, _testbool); }
+  bool testbool() const { return static_cast<bool>(GetField<uint8_t>(34, 0)); }
+  bool mutate_testbool(bool _testbool) { return SetField(34, static_cast<uint8_t>(_testbool)); }
   int32_t testhashs32_fnv1() const { return GetField<int32_t>(36, 0); }
   bool mutate_testhashs32_fnv1(int32_t _testhashs32_fnv1) { return SetField(36, _testhashs32_fnv1); }
   uint32_t testhashu32_fnv1() const { return GetField<uint32_t>(38, 0); }
@@ -281,7 +281,7 @@ struct MonsterBuilder {
   void add_enemy(flatbuffers::Offset<Monster> enemy) { fbb_.AddOffset(28, enemy); }
   void add_testnestedflatbuffer(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testnestedflatbuffer) { fbb_.AddOffset(30, testnestedflatbuffer); }
   void add_testempty(flatbuffers::Offset<Stat> testempty) { fbb_.AddOffset(32, testempty); }
-  void add_testbool(uint8_t testbool) { fbb_.AddElement<uint8_t>(34, testbool, 0); }
+  void add_testbool(bool testbool) { fbb_.AddElement<uint8_t>(34, static_cast<uint8_t>(testbool), 0); }
   void add_testhashs32_fnv1(int32_t testhashs32_fnv1) { fbb_.AddElement<int32_t>(36, testhashs32_fnv1, 0); }
   void add_testhashu32_fnv1(uint32_t testhashu32_fnv1) { fbb_.AddElement<uint32_t>(38, testhashu32_fnv1, 0); }
   void add_testhashs64_fnv1(int64_t testhashs64_fnv1) { fbb_.AddElement<int64_t>(40, testhashs64_fnv1, 0); }
@@ -315,7 +315,7 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
    flatbuffers::Offset<Monster> enemy = 0,
    flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testnestedflatbuffer = 0,
    flatbuffers::Offset<Stat> testempty = 0,
-   uint8_t testbool = 0,
+   bool testbool = false,
    int32_t testhashs32_fnv1 = 0,
    uint32_t testhashu32_fnv1 = 0,
    int64_t testhashs64_fnv1 = 0,

From 7b06041a7cc142f472d318d1ff513ae52af432d0 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 30 Nov 2015 14:27:47 -0800
Subject: [PATCH 009/185] C++ generated code now has constants for vtable
 offsets.

Besides making the generated code looking a lot more readable,
it also allows you to use these offsets in calls to
Table::CheckField, to see if a field is present in a table.

Change-Id: I1b4cc350c4f27c4e474c31add40c701ef4ae63b2
Tested: On Linux.
---
 samples/monster_generated.h    |  56 ++++---
 src/idl_gen_cpp.cpp            |  29 +++-
 tests/monster_test_generated.h | 260 +++++++++++++++++++--------------
 3 files changed, 203 insertions(+), 142 deletions(-)

diff --git a/samples/monster_generated.h b/samples/monster_generated.h
index 854e712ee..53935ee93 100644
--- a/samples/monster_generated.h
+++ b/samples/monster_generated.h
@@ -59,28 +59,36 @@ MANUALLY_ALIGNED_STRUCT(4) Vec3 FLATBUFFERS_FINAL_CLASS {
 STRUCT_END(Vec3, 12);
 
 struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  const Vec3 *pos() const { return GetStruct<const Vec3 *>(4); }
-  Vec3 *mutable_pos() { return GetStruct<Vec3 *>(4); }
-  int16_t mana() const { return GetField<int16_t>(6, 150); }
-  bool mutate_mana(int16_t _mana) { return SetField(6, _mana); }
-  int16_t hp() const { return GetField<int16_t>(8, 100); }
-  bool mutate_hp(int16_t _hp) { return SetField(8, _hp); }
-  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(10); }
-  flatbuffers::String *mutable_name() { return GetPointer<flatbuffers::String *>(10); }
-  const flatbuffers::Vector<uint8_t> *inventory() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(14); }
-  flatbuffers::Vector<uint8_t> *mutable_inventory() { return GetPointer<flatbuffers::Vector<uint8_t> *>(14); }
-  Color color() const { return static_cast<Color>(GetField<int8_t>(16, 2)); }
-  bool mutate_color(Color _color) { return SetField(16, static_cast<int8_t>(_color)); }
+  enum {
+    VT_POS = 4,
+    VT_MANA = 6,
+    VT_HP = 8,
+    VT_NAME = 10,
+    VT_INVENTORY = 14,
+    VT_COLOR = 16,
+  };
+  const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
+  Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
+  int16_t mana() const { return GetField<int16_t>(VT_MANA, 150); }
+  bool mutate_mana(int16_t _mana) { return SetField(VT_MANA, _mana); }
+  int16_t hp() const { return GetField<int16_t>(VT_HP, 100); }
+  bool mutate_hp(int16_t _hp) { return SetField(VT_HP, _hp); }
+  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
+  flatbuffers::String *mutable_name() { return GetPointer<flatbuffers::String *>(VT_NAME); }
+  const flatbuffers::Vector<uint8_t> *inventory() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); }
+  flatbuffers::Vector<uint8_t> *mutable_inventory() { return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); }
+  Color color() const { return static_cast<Color>(GetField<int8_t>(VT_COLOR, 2)); }
+  bool mutate_color(Color _color) { return SetField(VT_COLOR, static_cast<int8_t>(_color)); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<Vec3>(verifier, 4 /* pos */) &&
-           VerifyField<int16_t>(verifier, 6 /* mana */) &&
-           VerifyField<int16_t>(verifier, 8 /* hp */) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 10 /* name */) &&
+           VerifyField<Vec3>(verifier, VT_POS) &&
+           VerifyField<int16_t>(verifier, VT_MANA) &&
+           VerifyField<int16_t>(verifier, VT_HP) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
            verifier.Verify(name()) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 14 /* inventory */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_INVENTORY) &&
            verifier.Verify(inventory()) &&
-           VerifyField<int8_t>(verifier, 16 /* color */) &&
+           VerifyField<int8_t>(verifier, VT_COLOR) &&
            verifier.EndTable();
   }
 };
@@ -88,12 +96,12 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
 struct MonsterBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
-  void add_pos(const Vec3 *pos) { fbb_.AddStruct(4, pos); }
-  void add_mana(int16_t mana) { fbb_.AddElement<int16_t>(6, mana, 150); }
-  void add_hp(int16_t hp) { fbb_.AddElement<int16_t>(8, hp, 100); }
-  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(10, name); }
-  void add_inventory(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory) { fbb_.AddOffset(14, inventory); }
-  void add_color(Color color) { fbb_.AddElement<int8_t>(16, static_cast<int8_t>(color), 2); }
+  void add_pos(const Vec3 *pos) { fbb_.AddStruct(Monster::VT_POS, pos); }
+  void add_mana(int16_t mana) { fbb_.AddElement<int16_t>(Monster::VT_MANA, mana, 150); }
+  void add_hp(int16_t hp) { fbb_.AddElement<int16_t>(Monster::VT_HP, hp, 100); }
+  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(Monster::VT_NAME, name); }
+  void add_inventory(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory) { fbb_.AddOffset(Monster::VT_INVENTORY, inventory); }
+  void add_color(Color color) { fbb_.AddElement<int8_t>(Monster::VT_COLOR, static_cast<int8_t>(color), 2); }
   MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   MonsterBuilder &operator=(const MonsterBuilder &);
   flatbuffers::Offset<Monster> Finish() {
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 7c39c325a..ca523dcda 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -242,6 +242,12 @@ std::string GenUnderlyingCast(const Parser &parser, const FieldDef &field,
       : val;
 }
 
+std::string GenFieldOffsetName(const FieldDef &field) {
+  std::string uname = field.name;
+  std::transform(uname.begin(), uname.end(), uname.begin(), ::toupper);
+  return "VT_" + uname;
+}
+
 // Generate an accessor struct, builder structs & function for a table.
 static void GenTable(const Parser &parser, StructDef &struct_def,
                      const GeneratorOptions &opts, std::string *code_ptr) {
@@ -254,6 +260,19 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
   code += "struct " + struct_def.name;
   code += " FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table";
   code += " {\n";
+  // Generate field id constants.
+  code += "  enum {\n";
+  for (auto it = struct_def.fields.vec.begin();
+       it != struct_def.fields.vec.end();
+       ++it) {
+    auto &field = **it;
+    if (!field.deprecated) {  // Deprecated fields won't be accessible.
+      code += "    " + GenFieldOffsetName(field) + " = ";
+      code += NumToString(field.value.offset) + ",\n";
+    }
+  }
+  code += "  };\n";
+  // Generate the accessors.
   for (auto it = struct_def.fields.vec.begin();
        it != struct_def.fields.vec.end();
        ++it) {
@@ -268,7 +287,7 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
       auto accessor = is_scalar
         ? "GetField<"
         : (IsStruct(field.value.type) ? "GetStruct<" : "GetPointer<");
-      auto offsetstr = NumToString(field.value.offset);
+      auto offsetstr = GenFieldOffsetName(field);
       auto call =
           accessor +
           GenTypeGet(parser, field.value.type, "", "const ", " *", false) +
@@ -347,8 +366,7 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
       code += prefix + "VerifyField";
       if (field.required) code += "Required";
       code += "<" + GenTypeSize(parser, field.value.type);
-      code += ">(verifier, " + NumToString(field.value.offset);
-      code += " /* " + field.name + " */)";
+      code += ">(verifier, " + GenFieldOffsetName(field) + ")";
       switch (field.value.type.base_type) {
         case BASE_TYPE_UNION:
           code += prefix + "Verify" + field.value.type.enum_def->name;
@@ -412,7 +430,7 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
       } else {
         code += "Offset";
       }
-      code += "(" + NumToString(field.value.offset) + ", ";
+      code += "(" + struct_def.name + "::" + GenFieldOffsetName(field) + ", ";
       code += GenUnderlyingCast(parser, field, false, field.name);
       if (IsScalar(field.value.type.base_type))
         code += ", " + field.value.constant;
@@ -433,7 +451,8 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
        ++it) {
     auto &field = **it;
     if (!field.deprecated && field.required) {
-      code += "    fbb_.Required(o, " + NumToString(field.value.offset);
+      code += "    fbb_.Required(o, ";
+      code += struct_def.name + "::" + GenFieldOffsetName(field);
       code += ");  // " + field.name + "\n";
     }
   }
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index 8a78de530..90814a94f 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -97,11 +97,14 @@ MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS {
 STRUCT_END(Vec3, 32);
 
 struct TestSimpleTableWithEnum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  Color color() const { return static_cast<Color>(GetField<int8_t>(4, 2)); }
-  bool mutate_color(Color _color) { return SetField(4, static_cast<int8_t>(_color)); }
+  enum {
+    VT_COLOR = 4,
+  };
+  Color color() const { return static_cast<Color>(GetField<int8_t>(VT_COLOR, 2)); }
+  bool mutate_color(Color _color) { return SetField(VT_COLOR, static_cast<int8_t>(_color)); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<int8_t>(verifier, 4 /* color */) &&
+           VerifyField<int8_t>(verifier, VT_COLOR) &&
            verifier.EndTable();
   }
 };
@@ -109,7 +112,7 @@ struct TestSimpleTableWithEnum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Ta
 struct TestSimpleTableWithEnumBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
-  void add_color(Color color) { fbb_.AddElement<int8_t>(4, static_cast<int8_t>(color), 2); }
+  void add_color(Color color) { fbb_.AddElement<int8_t>(TestSimpleTableWithEnum::VT_COLOR, static_cast<int8_t>(color), 2); }
   TestSimpleTableWithEnumBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   TestSimpleTableWithEnumBuilder &operator=(const TestSimpleTableWithEnumBuilder &);
   flatbuffers::Offset<TestSimpleTableWithEnum> Finish() {
@@ -126,18 +129,23 @@ inline flatbuffers::Offset<TestSimpleTableWithEnum> CreateTestSimpleTableWithEnu
 }
 
 struct Stat FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  const flatbuffers::String *id() const { return GetPointer<const flatbuffers::String *>(4); }
-  flatbuffers::String *mutable_id() { return GetPointer<flatbuffers::String *>(4); }
-  int64_t val() const { return GetField<int64_t>(6, 0); }
-  bool mutate_val(int64_t _val) { return SetField(6, _val); }
-  uint16_t count() const { return GetField<uint16_t>(8, 0); }
-  bool mutate_count(uint16_t _count) { return SetField(8, _count); }
+  enum {
+    VT_ID = 4,
+    VT_VAL = 6,
+    VT_COUNT = 8,
+  };
+  const flatbuffers::String *id() const { return GetPointer<const flatbuffers::String *>(VT_ID); }
+  flatbuffers::String *mutable_id() { return GetPointer<flatbuffers::String *>(VT_ID); }
+  int64_t val() const { return GetField<int64_t>(VT_VAL, 0); }
+  bool mutate_val(int64_t _val) { return SetField(VT_VAL, _val); }
+  uint16_t count() const { return GetField<uint16_t>(VT_COUNT, 0); }
+  bool mutate_count(uint16_t _count) { return SetField(VT_COUNT, _count); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 4 /* id */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_ID) &&
            verifier.Verify(id()) &&
-           VerifyField<int64_t>(verifier, 6 /* val */) &&
-           VerifyField<uint16_t>(verifier, 8 /* count */) &&
+           VerifyField<int64_t>(verifier, VT_VAL) &&
+           VerifyField<uint16_t>(verifier, VT_COUNT) &&
            verifier.EndTable();
   }
 };
@@ -145,9 +153,9 @@ struct Stat FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
 struct StatBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
-  void add_id(flatbuffers::Offset<flatbuffers::String> id) { fbb_.AddOffset(4, id); }
-  void add_val(int64_t val) { fbb_.AddElement<int64_t>(6, val, 0); }
-  void add_count(uint16_t count) { fbb_.AddElement<uint16_t>(8, count, 0); }
+  void add_id(flatbuffers::Offset<flatbuffers::String> id) { fbb_.AddOffset(Stat::VT_ID, id); }
+  void add_val(int64_t val) { fbb_.AddElement<int64_t>(Stat::VT_VAL, val, 0); }
+  void add_count(uint16_t count) { fbb_.AddElement<uint16_t>(Stat::VT_COUNT, count, 0); }
   StatBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   StatBuilder &operator=(const StatBuilder &);
   flatbuffers::Offset<Stat> Finish() {
@@ -169,96 +177,122 @@ inline flatbuffers::Offset<Stat> CreateStat(flatbuffers::FlatBufferBuilder &_fbb
 
 /// an example documentation comment: monster object
 struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  const Vec3 *pos() const { return GetStruct<const Vec3 *>(4); }
-  Vec3 *mutable_pos() { return GetStruct<Vec3 *>(4); }
-  int16_t mana() const { return GetField<int16_t>(6, 150); }
-  bool mutate_mana(int16_t _mana) { return SetField(6, _mana); }
-  int16_t hp() const { return GetField<int16_t>(8, 100); }
-  bool mutate_hp(int16_t _hp) { return SetField(8, _hp); }
-  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(10); }
-  flatbuffers::String *mutable_name() { return GetPointer<flatbuffers::String *>(10); }
+  enum {
+    VT_POS = 4,
+    VT_MANA = 6,
+    VT_HP = 8,
+    VT_NAME = 10,
+    VT_INVENTORY = 14,
+    VT_COLOR = 16,
+    VT_TEST_TYPE = 18,
+    VT_TEST = 20,
+    VT_TEST4 = 22,
+    VT_TESTARRAYOFSTRING = 24,
+    VT_TESTARRAYOFTABLES = 26,
+    VT_ENEMY = 28,
+    VT_TESTNESTEDFLATBUFFER = 30,
+    VT_TESTEMPTY = 32,
+    VT_TESTBOOL = 34,
+    VT_TESTHASHS32_FNV1 = 36,
+    VT_TESTHASHU32_FNV1 = 38,
+    VT_TESTHASHS64_FNV1 = 40,
+    VT_TESTHASHU64_FNV1 = 42,
+    VT_TESTHASHS32_FNV1A = 44,
+    VT_TESTHASHU32_FNV1A = 46,
+    VT_TESTHASHS64_FNV1A = 48,
+    VT_TESTHASHU64_FNV1A = 50,
+    VT_TESTARRAYOFBOOLS = 52,
+  };
+  const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
+  Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
+  int16_t mana() const { return GetField<int16_t>(VT_MANA, 150); }
+  bool mutate_mana(int16_t _mana) { return SetField(VT_MANA, _mana); }
+  int16_t hp() const { return GetField<int16_t>(VT_HP, 100); }
+  bool mutate_hp(int16_t _hp) { return SetField(VT_HP, _hp); }
+  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
+  flatbuffers::String *mutable_name() { return GetPointer<flatbuffers::String *>(VT_NAME); }
   bool KeyCompareLessThan(const Monster *o) const { return *name() < *o->name(); }
   int KeyCompareWithValue(const char *val) const { return strcmp(name()->c_str(), val); }
-  const flatbuffers::Vector<uint8_t> *inventory() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(14); }
-  flatbuffers::Vector<uint8_t> *mutable_inventory() { return GetPointer<flatbuffers::Vector<uint8_t> *>(14); }
-  Color color() const { return static_cast<Color>(GetField<int8_t>(16, 8)); }
-  bool mutate_color(Color _color) { return SetField(16, static_cast<int8_t>(_color)); }
-  Any test_type() const { return static_cast<Any>(GetField<uint8_t>(18, 0)); }
-  bool mutate_test_type(Any _test_type) { return SetField(18, static_cast<uint8_t>(_test_type)); }
-  const void *test() const { return GetPointer<const void *>(20); }
-  void *mutable_test() { return GetPointer<void *>(20); }
-  const flatbuffers::Vector<const Test *> *test4() const { return GetPointer<const flatbuffers::Vector<const Test *> *>(22); }
-  flatbuffers::Vector<const Test *> *mutable_test4() { return GetPointer<flatbuffers::Vector<const Test *> *>(22); }
-  const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *testarrayofstring() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *>(24); }
-  flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *mutable_testarrayofstring() { return GetPointer<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *>(24); }
+  const flatbuffers::Vector<uint8_t> *inventory() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); }
+  flatbuffers::Vector<uint8_t> *mutable_inventory() { return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); }
+  Color color() const { return static_cast<Color>(GetField<int8_t>(VT_COLOR, 8)); }
+  bool mutate_color(Color _color) { return SetField(VT_COLOR, static_cast<int8_t>(_color)); }
+  Any test_type() const { return static_cast<Any>(GetField<uint8_t>(VT_TEST_TYPE, 0)); }
+  bool mutate_test_type(Any _test_type) { return SetField(VT_TEST_TYPE, static_cast<uint8_t>(_test_type)); }
+  const void *test() const { return GetPointer<const void *>(VT_TEST); }
+  void *mutable_test() { return GetPointer<void *>(VT_TEST); }
+  const flatbuffers::Vector<const Test *> *test4() const { return GetPointer<const flatbuffers::Vector<const Test *> *>(VT_TEST4); }
+  flatbuffers::Vector<const Test *> *mutable_test4() { return GetPointer<flatbuffers::Vector<const Test *> *>(VT_TEST4); }
+  const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *testarrayofstring() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *>(VT_TESTARRAYOFSTRING); }
+  flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *mutable_testarrayofstring() { return GetPointer<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *>(VT_TESTARRAYOFSTRING); }
   /// an example documentation comment: this will end up in the generated code
   /// multiline too
-  const flatbuffers::Vector<flatbuffers::Offset<Monster>> *testarrayoftables() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Monster>> *>(26); }
-  flatbuffers::Vector<flatbuffers::Offset<Monster>> *mutable_testarrayoftables() { return GetPointer<flatbuffers::Vector<flatbuffers::Offset<Monster>> *>(26); }
-  const Monster *enemy() const { return GetPointer<const Monster *>(28); }
-  Monster *mutable_enemy() { return GetPointer<Monster *>(28); }
-  const flatbuffers::Vector<uint8_t> *testnestedflatbuffer() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(30); }
-  flatbuffers::Vector<uint8_t> *mutable_testnestedflatbuffer() { return GetPointer<flatbuffers::Vector<uint8_t> *>(30); }
+  const flatbuffers::Vector<flatbuffers::Offset<Monster>> *testarrayoftables() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Monster>> *>(VT_TESTARRAYOFTABLES); }
+  flatbuffers::Vector<flatbuffers::Offset<Monster>> *mutable_testarrayoftables() { return GetPointer<flatbuffers::Vector<flatbuffers::Offset<Monster>> *>(VT_TESTARRAYOFTABLES); }
+  const Monster *enemy() const { return GetPointer<const Monster *>(VT_ENEMY); }
+  Monster *mutable_enemy() { return GetPointer<Monster *>(VT_ENEMY); }
+  const flatbuffers::Vector<uint8_t> *testnestedflatbuffer() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_TESTNESTEDFLATBUFFER); }
+  flatbuffers::Vector<uint8_t> *mutable_testnestedflatbuffer() { return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_TESTNESTEDFLATBUFFER); }
   const MyGame::Example::Monster *testnestedflatbuffer_nested_root() const { return flatbuffers::GetRoot<MyGame::Example::Monster>(testnestedflatbuffer()->Data()); }
-  const Stat *testempty() const { return GetPointer<const Stat *>(32); }
-  Stat *mutable_testempty() { return GetPointer<Stat *>(32); }
-  bool testbool() const { return static_cast<bool>(GetField<uint8_t>(34, 0)); }
-  bool mutate_testbool(bool _testbool) { return SetField(34, static_cast<uint8_t>(_testbool)); }
-  int32_t testhashs32_fnv1() const { return GetField<int32_t>(36, 0); }
-  bool mutate_testhashs32_fnv1(int32_t _testhashs32_fnv1) { return SetField(36, _testhashs32_fnv1); }
-  uint32_t testhashu32_fnv1() const { return GetField<uint32_t>(38, 0); }
-  bool mutate_testhashu32_fnv1(uint32_t _testhashu32_fnv1) { return SetField(38, _testhashu32_fnv1); }
-  int64_t testhashs64_fnv1() const { return GetField<int64_t>(40, 0); }
-  bool mutate_testhashs64_fnv1(int64_t _testhashs64_fnv1) { return SetField(40, _testhashs64_fnv1); }
-  uint64_t testhashu64_fnv1() const { return GetField<uint64_t>(42, 0); }
-  bool mutate_testhashu64_fnv1(uint64_t _testhashu64_fnv1) { return SetField(42, _testhashu64_fnv1); }
-  int32_t testhashs32_fnv1a() const { return GetField<int32_t>(44, 0); }
-  bool mutate_testhashs32_fnv1a(int32_t _testhashs32_fnv1a) { return SetField(44, _testhashs32_fnv1a); }
-  uint32_t testhashu32_fnv1a() const { return GetField<uint32_t>(46, 0); }
-  bool mutate_testhashu32_fnv1a(uint32_t _testhashu32_fnv1a) { return SetField(46, _testhashu32_fnv1a); }
-  int64_t testhashs64_fnv1a() const { return GetField<int64_t>(48, 0); }
-  bool mutate_testhashs64_fnv1a(int64_t _testhashs64_fnv1a) { return SetField(48, _testhashs64_fnv1a); }
-  uint64_t testhashu64_fnv1a() const { return GetField<uint64_t>(50, 0); }
-  bool mutate_testhashu64_fnv1a(uint64_t _testhashu64_fnv1a) { return SetField(50, _testhashu64_fnv1a); }
-  const flatbuffers::Vector<uint8_t> *testarrayofbools() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(52); }
-  flatbuffers::Vector<uint8_t> *mutable_testarrayofbools() { return GetPointer<flatbuffers::Vector<uint8_t> *>(52); }
+  const Stat *testempty() const { return GetPointer<const Stat *>(VT_TESTEMPTY); }
+  Stat *mutable_testempty() { return GetPointer<Stat *>(VT_TESTEMPTY); }
+  bool testbool() const { return static_cast<bool>(GetField<uint8_t>(VT_TESTBOOL, 0)); }
+  bool mutate_testbool(bool _testbool) { return SetField(VT_TESTBOOL, static_cast<uint8_t>(_testbool)); }
+  int32_t testhashs32_fnv1() const { return GetField<int32_t>(VT_TESTHASHS32_FNV1, 0); }
+  bool mutate_testhashs32_fnv1(int32_t _testhashs32_fnv1) { return SetField(VT_TESTHASHS32_FNV1, _testhashs32_fnv1); }
+  uint32_t testhashu32_fnv1() const { return GetField<uint32_t>(VT_TESTHASHU32_FNV1, 0); }
+  bool mutate_testhashu32_fnv1(uint32_t _testhashu32_fnv1) { return SetField(VT_TESTHASHU32_FNV1, _testhashu32_fnv1); }
+  int64_t testhashs64_fnv1() const { return GetField<int64_t>(VT_TESTHASHS64_FNV1, 0); }
+  bool mutate_testhashs64_fnv1(int64_t _testhashs64_fnv1) { return SetField(VT_TESTHASHS64_FNV1, _testhashs64_fnv1); }
+  uint64_t testhashu64_fnv1() const { return GetField<uint64_t>(VT_TESTHASHU64_FNV1, 0); }
+  bool mutate_testhashu64_fnv1(uint64_t _testhashu64_fnv1) { return SetField(VT_TESTHASHU64_FNV1, _testhashu64_fnv1); }
+  int32_t testhashs32_fnv1a() const { return GetField<int32_t>(VT_TESTHASHS32_FNV1A, 0); }
+  bool mutate_testhashs32_fnv1a(int32_t _testhashs32_fnv1a) { return SetField(VT_TESTHASHS32_FNV1A, _testhashs32_fnv1a); }
+  uint32_t testhashu32_fnv1a() const { return GetField<uint32_t>(VT_TESTHASHU32_FNV1A, 0); }
+  bool mutate_testhashu32_fnv1a(uint32_t _testhashu32_fnv1a) { return SetField(VT_TESTHASHU32_FNV1A, _testhashu32_fnv1a); }
+  int64_t testhashs64_fnv1a() const { return GetField<int64_t>(VT_TESTHASHS64_FNV1A, 0); }
+  bool mutate_testhashs64_fnv1a(int64_t _testhashs64_fnv1a) { return SetField(VT_TESTHASHS64_FNV1A, _testhashs64_fnv1a); }
+  uint64_t testhashu64_fnv1a() const { return GetField<uint64_t>(VT_TESTHASHU64_FNV1A, 0); }
+  bool mutate_testhashu64_fnv1a(uint64_t _testhashu64_fnv1a) { return SetField(VT_TESTHASHU64_FNV1A, _testhashu64_fnv1a); }
+  const flatbuffers::Vector<uint8_t> *testarrayofbools() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_TESTARRAYOFBOOLS); }
+  flatbuffers::Vector<uint8_t> *mutable_testarrayofbools() { return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_TESTARRAYOFBOOLS); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<Vec3>(verifier, 4 /* pos */) &&
-           VerifyField<int16_t>(verifier, 6 /* mana */) &&
-           VerifyField<int16_t>(verifier, 8 /* hp */) &&
-           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, 10 /* name */) &&
+           VerifyField<Vec3>(verifier, VT_POS) &&
+           VerifyField<int16_t>(verifier, VT_MANA) &&
+           VerifyField<int16_t>(verifier, VT_HP) &&
+           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
            verifier.Verify(name()) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 14 /* inventory */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_INVENTORY) &&
            verifier.Verify(inventory()) &&
-           VerifyField<int8_t>(verifier, 16 /* color */) &&
-           VerifyField<uint8_t>(verifier, 18 /* test_type */) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 20 /* test */) &&
+           VerifyField<int8_t>(verifier, VT_COLOR) &&
+           VerifyField<uint8_t>(verifier, VT_TEST_TYPE) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_TEST) &&
            VerifyAny(verifier, test(), test_type()) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 22 /* test4 */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_TEST4) &&
            verifier.Verify(test4()) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 24 /* testarrayofstring */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_TESTARRAYOFSTRING) &&
            verifier.Verify(testarrayofstring()) &&
            verifier.VerifyVectorOfStrings(testarrayofstring()) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 26 /* testarrayoftables */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_TESTARRAYOFTABLES) &&
            verifier.Verify(testarrayoftables()) &&
            verifier.VerifyVectorOfTables(testarrayoftables()) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 28 /* enemy */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_ENEMY) &&
            verifier.VerifyTable(enemy()) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 30 /* testnestedflatbuffer */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_TESTNESTEDFLATBUFFER) &&
            verifier.Verify(testnestedflatbuffer()) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 32 /* testempty */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_TESTEMPTY) &&
            verifier.VerifyTable(testempty()) &&
-           VerifyField<uint8_t>(verifier, 34 /* testbool */) &&
-           VerifyField<int32_t>(verifier, 36 /* testhashs32_fnv1 */) &&
-           VerifyField<uint32_t>(verifier, 38 /* testhashu32_fnv1 */) &&
-           VerifyField<int64_t>(verifier, 40 /* testhashs64_fnv1 */) &&
-           VerifyField<uint64_t>(verifier, 42 /* testhashu64_fnv1 */) &&
-           VerifyField<int32_t>(verifier, 44 /* testhashs32_fnv1a */) &&
-           VerifyField<uint32_t>(verifier, 46 /* testhashu32_fnv1a */) &&
-           VerifyField<int64_t>(verifier, 48 /* testhashs64_fnv1a */) &&
-           VerifyField<uint64_t>(verifier, 50 /* testhashu64_fnv1a */) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 52 /* testarrayofbools */) &&
+           VerifyField<uint8_t>(verifier, VT_TESTBOOL) &&
+           VerifyField<int32_t>(verifier, VT_TESTHASHS32_FNV1) &&
+           VerifyField<uint32_t>(verifier, VT_TESTHASHU32_FNV1) &&
+           VerifyField<int64_t>(verifier, VT_TESTHASHS64_FNV1) &&
+           VerifyField<uint64_t>(verifier, VT_TESTHASHU64_FNV1) &&
+           VerifyField<int32_t>(verifier, VT_TESTHASHS32_FNV1A) &&
+           VerifyField<uint32_t>(verifier, VT_TESTHASHU32_FNV1A) &&
+           VerifyField<int64_t>(verifier, VT_TESTHASHS64_FNV1A) &&
+           VerifyField<uint64_t>(verifier, VT_TESTHASHU64_FNV1A) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_TESTARRAYOFBOOLS) &&
            verifier.Verify(testarrayofbools()) &&
            verifier.EndTable();
   }
@@ -267,35 +301,35 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
 struct MonsterBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
-  void add_pos(const Vec3 *pos) { fbb_.AddStruct(4, pos); }
-  void add_mana(int16_t mana) { fbb_.AddElement<int16_t>(6, mana, 150); }
-  void add_hp(int16_t hp) { fbb_.AddElement<int16_t>(8, hp, 100); }
-  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(10, name); }
-  void add_inventory(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory) { fbb_.AddOffset(14, inventory); }
-  void add_color(Color color) { fbb_.AddElement<int8_t>(16, static_cast<int8_t>(color), 8); }
-  void add_test_type(Any test_type) { fbb_.AddElement<uint8_t>(18, static_cast<uint8_t>(test_type), 0); }
-  void add_test(flatbuffers::Offset<void> test) { fbb_.AddOffset(20, test); }
-  void add_test4(flatbuffers::Offset<flatbuffers::Vector<const Test *>> test4) { fbb_.AddOffset(22, test4); }
-  void add_testarrayofstring(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> testarrayofstring) { fbb_.AddOffset(24, testarrayofstring); }
-  void add_testarrayoftables(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Monster>>> testarrayoftables) { fbb_.AddOffset(26, testarrayoftables); }
-  void add_enemy(flatbuffers::Offset<Monster> enemy) { fbb_.AddOffset(28, enemy); }
-  void add_testnestedflatbuffer(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testnestedflatbuffer) { fbb_.AddOffset(30, testnestedflatbuffer); }
-  void add_testempty(flatbuffers::Offset<Stat> testempty) { fbb_.AddOffset(32, testempty); }
-  void add_testbool(bool testbool) { fbb_.AddElement<uint8_t>(34, static_cast<uint8_t>(testbool), 0); }
-  void add_testhashs32_fnv1(int32_t testhashs32_fnv1) { fbb_.AddElement<int32_t>(36, testhashs32_fnv1, 0); }
-  void add_testhashu32_fnv1(uint32_t testhashu32_fnv1) { fbb_.AddElement<uint32_t>(38, testhashu32_fnv1, 0); }
-  void add_testhashs64_fnv1(int64_t testhashs64_fnv1) { fbb_.AddElement<int64_t>(40, testhashs64_fnv1, 0); }
-  void add_testhashu64_fnv1(uint64_t testhashu64_fnv1) { fbb_.AddElement<uint64_t>(42, testhashu64_fnv1, 0); }
-  void add_testhashs32_fnv1a(int32_t testhashs32_fnv1a) { fbb_.AddElement<int32_t>(44, testhashs32_fnv1a, 0); }
-  void add_testhashu32_fnv1a(uint32_t testhashu32_fnv1a) { fbb_.AddElement<uint32_t>(46, testhashu32_fnv1a, 0); }
-  void add_testhashs64_fnv1a(int64_t testhashs64_fnv1a) { fbb_.AddElement<int64_t>(48, testhashs64_fnv1a, 0); }
-  void add_testhashu64_fnv1a(uint64_t testhashu64_fnv1a) { fbb_.AddElement<uint64_t>(50, testhashu64_fnv1a, 0); }
-  void add_testarrayofbools(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testarrayofbools) { fbb_.AddOffset(52, testarrayofbools); }
+  void add_pos(const Vec3 *pos) { fbb_.AddStruct(Monster::VT_POS, pos); }
+  void add_mana(int16_t mana) { fbb_.AddElement<int16_t>(Monster::VT_MANA, mana, 150); }
+  void add_hp(int16_t hp) { fbb_.AddElement<int16_t>(Monster::VT_HP, hp, 100); }
+  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(Monster::VT_NAME, name); }
+  void add_inventory(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory) { fbb_.AddOffset(Monster::VT_INVENTORY, inventory); }
+  void add_color(Color color) { fbb_.AddElement<int8_t>(Monster::VT_COLOR, static_cast<int8_t>(color), 8); }
+  void add_test_type(Any test_type) { fbb_.AddElement<uint8_t>(Monster::VT_TEST_TYPE, static_cast<uint8_t>(test_type), 0); }
+  void add_test(flatbuffers::Offset<void> test) { fbb_.AddOffset(Monster::VT_TEST, test); }
+  void add_test4(flatbuffers::Offset<flatbuffers::Vector<const Test *>> test4) { fbb_.AddOffset(Monster::VT_TEST4, test4); }
+  void add_testarrayofstring(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> testarrayofstring) { fbb_.AddOffset(Monster::VT_TESTARRAYOFSTRING, testarrayofstring); }
+  void add_testarrayoftables(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Monster>>> testarrayoftables) { fbb_.AddOffset(Monster::VT_TESTARRAYOFTABLES, testarrayoftables); }
+  void add_enemy(flatbuffers::Offset<Monster> enemy) { fbb_.AddOffset(Monster::VT_ENEMY, enemy); }
+  void add_testnestedflatbuffer(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testnestedflatbuffer) { fbb_.AddOffset(Monster::VT_TESTNESTEDFLATBUFFER, testnestedflatbuffer); }
+  void add_testempty(flatbuffers::Offset<Stat> testempty) { fbb_.AddOffset(Monster::VT_TESTEMPTY, testempty); }
+  void add_testbool(bool testbool) { fbb_.AddElement<uint8_t>(Monster::VT_TESTBOOL, static_cast<uint8_t>(testbool), 0); }
+  void add_testhashs32_fnv1(int32_t testhashs32_fnv1) { fbb_.AddElement<int32_t>(Monster::VT_TESTHASHS32_FNV1, testhashs32_fnv1, 0); }
+  void add_testhashu32_fnv1(uint32_t testhashu32_fnv1) { fbb_.AddElement<uint32_t>(Monster::VT_TESTHASHU32_FNV1, testhashu32_fnv1, 0); }
+  void add_testhashs64_fnv1(int64_t testhashs64_fnv1) { fbb_.AddElement<int64_t>(Monster::VT_TESTHASHS64_FNV1, testhashs64_fnv1, 0); }
+  void add_testhashu64_fnv1(uint64_t testhashu64_fnv1) { fbb_.AddElement<uint64_t>(Monster::VT_TESTHASHU64_FNV1, testhashu64_fnv1, 0); }
+  void add_testhashs32_fnv1a(int32_t testhashs32_fnv1a) { fbb_.AddElement<int32_t>(Monster::VT_TESTHASHS32_FNV1A, testhashs32_fnv1a, 0); }
+  void add_testhashu32_fnv1a(uint32_t testhashu32_fnv1a) { fbb_.AddElement<uint32_t>(Monster::VT_TESTHASHU32_FNV1A, testhashu32_fnv1a, 0); }
+  void add_testhashs64_fnv1a(int64_t testhashs64_fnv1a) { fbb_.AddElement<int64_t>(Monster::VT_TESTHASHS64_FNV1A, testhashs64_fnv1a, 0); }
+  void add_testhashu64_fnv1a(uint64_t testhashu64_fnv1a) { fbb_.AddElement<uint64_t>(Monster::VT_TESTHASHU64_FNV1A, testhashu64_fnv1a, 0); }
+  void add_testarrayofbools(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testarrayofbools) { fbb_.AddOffset(Monster::VT_TESTARRAYOFBOOLS, testarrayofbools); }
   MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   MonsterBuilder &operator=(const MonsterBuilder &);
   flatbuffers::Offset<Monster> Finish() {
     auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 25));
-    fbb_.Required(o, 10);  // name
+    fbb_.Required(o, Monster::VT_NAME);  // name
     return o;
   }
 };

From 3881bbd6517f97deb239f32ff5ebec8db86e902f Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 30 Nov 2015 16:42:48 -0800
Subject: [PATCH 010/185] Multiple schemas parsed by flatc are now parsed
 independently.

It used to be such that later schemas could depend on earlier
schemas. This was a convenience from days before include files
were implemented. Nowadays they cause subtle bugs rather than being
useful, so this functionality has been removed.

You now need to explicitly include files you depend upon.

Change-Id: Id8292c3c621fc38fbd796da2d2cbdd63efc230d1
Tested: on Linux.
---
 docs/html/md__compiler.html |  4 ++--
 docs/source/Compiler.md     |  7 +++----
 include/flatbuffers/util.h  |  6 ++++++
 src/flatc.cpp               | 36 +++++++++++++++++++++---------------
 src/idl_parser.cpp          |  7 +++----
 5 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/docs/html/md__compiler.html b/docs/html/md__compiler.html
index ff3f7fe22..1b3cd1db4 100644
--- a/docs/html/md__compiler.html
+++ b/docs/html/md__compiler.html
@@ -63,8 +63,8 @@ $(document).ready(function(){initNavTree('md__compiler.html','');});
 <div class="contents">
 <div class="textblock"><p>Usage: </p><pre class="fragment">flatc [ GENERATOR OPTIONS ] [ -o PATH ] [ -I PATH ] [ -S ] FILES...
       [ -- FILES...]
-</pre><p>The files are read and parsed in order, and can contain either schemas or data (see below). Later files can make use of definitions in earlier files.</p>
-<p><code>--</code> indicates that the following files are binary files in FlatBuffer format conforming to the schema(s) indicated before it. Incompatible binary files currently will give unpredictable results (!)</p>
+</pre><p>The files are read and parsed in order, and can contain either schemas or data (see below). Data files are processed according to the definitions of the most recent schema specified.</p>
+<p><code>--</code> indicates that the following files are binary files in FlatBuffer format conforming to the schema indicated before it.</p>
 <p>Depending on the flags passed, additional files may be generated for each file processed:</p>
 <p>For any schema input files, one or more generators can be specified:</p>
 <ul>
diff --git a/docs/source/Compiler.md b/docs/source/Compiler.md
index 27ddf52e4..9d89cb104 100755
--- a/docs/source/Compiler.md
+++ b/docs/source/Compiler.md
@@ -6,12 +6,11 @@ Usage:
           [ -- FILES...]
 
 The files are read and parsed in order, and can contain either schemas
-or data (see below). Later files can make use of definitions in earlier
-files.
+or data (see below). Data files are processed according to the definitions of
+the most recent schema specified.
 
 `--` indicates that the following files are binary files in
-FlatBuffer format conforming to the schema(s) indicated before it.
-Incompatible binary files currently will give unpredictable results (!)
+FlatBuffer format conforming to the schema indicated before it.
 
 Depending on the flags passed, additional files may
 be generated for each file processed:
diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h
index 8e5d09908..ba73d67bd 100644
--- a/include/flatbuffers/util.h
+++ b/include/flatbuffers/util.h
@@ -174,6 +174,12 @@ inline std::string StripExtension(const std::string &filepath) {
   return i != std::string::npos ? filepath.substr(0, i) : filepath;
 }
 
+// Returns the extension, if any.
+inline std::string GetExtension(const std::string &filepath) {
+  size_t i = filepath.find_last_of(".");
+  return i != std::string::npos ? filepath.substr(i + 1) : "";
+}
+
 // Return the last component of the path, after the last separator.
 inline std::string StripPath(const std::string &filepath) {
   size_t i = filepath.find_last_of(PathSeparatorSet);
diff --git a/src/flatc.cpp b/src/flatc.cpp
index 2479da12b..86de77416 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -79,7 +79,8 @@ const Generator generators[] = {
     flatbuffers::GeneralMakeRule },
 };
 
-const char *program_name = NULL;
+const char *program_name = nullptr;
+flatbuffers::Parser *parser = nullptr;
 
 static void Error(const std::string &err, bool usage, bool show_exe_name) {
   if (show_exe_name) printf("%s: ", program_name);
@@ -122,6 +123,7 @@ static void Error(const std::string &err, bool usage, bool show_exe_name) {
       "example: %s -c -b schema1.fbs schema2.fbs data.json\n",
       program_name);
   }
+  if (parser) delete parser;
   exit(1);
 }
 
@@ -205,7 +207,7 @@ int main(int argc, const char *argv[]) {
     Error("no options: specify one of -c -g -j -t -b etc.", true);
 
   // Now process the files:
-  flatbuffers::Parser parser(opts.strict_json, proto_mode);
+  parser = new flatbuffers::Parser(opts.strict_json, proto_mode);
   for (auto file_it = filenames.begin();
             file_it != filenames.end();
           ++file_it) {
@@ -216,8 +218,8 @@ int main(int argc, const char *argv[]) {
       bool is_binary = static_cast<size_t>(file_it - filenames.begin()) >=
                        binary_files_from;
       if (is_binary) {
-        parser.builder_.Clear();
-        parser.builder_.PushFlatBuffer(
+        parser->builder_.Clear();
+        parser->builder_.PushFlatBuffer(
           reinterpret_cast<const uint8_t *>(contents.c_str()),
           contents.length());
         if (!raw_binary) {
@@ -226,30 +228,37 @@ int main(int argc, const char *argv[]) {
           // does not contain a file identifier.
           // We'd expect that typically any binary used as a file would have
           // such an identifier, so by default we require them to match.
-          if (!parser.file_identifier_.length()) {
+          if (!parser->file_identifier_.length()) {
             Error("current schema has no file_identifier: cannot test if \"" +
                  *file_it +
                  "\" matches the schema, use --raw-binary to read this file"
                  " anyway.");
           } else if (!flatbuffers::BufferHasIdentifier(contents.c_str(),
-                                             parser.file_identifier_.c_str())) {
+                                             parser->file_identifier_.c_str())) {
             Error("binary \"" +
                  *file_it +
                  "\" does not have expected file_identifier \"" +
-                 parser.file_identifier_ +
+                 parser->file_identifier_ +
                  "\", use --raw-binary to read this file anyway.");
           }
         }
       } else {
+        if (flatbuffers::GetExtension(*file_it) == "fbs") {
+          // If we're processing multiple schemas, make sure to start each
+          // one from scratch. If it depends on previous schemas it must do
+          // so explicitly using an include.
+          delete parser;
+          parser = new flatbuffers::Parser(opts.strict_json, proto_mode);
+        }
         auto local_include_directory = flatbuffers::StripFileName(*file_it);
         include_directories.push_back(local_include_directory.c_str());
         include_directories.push_back(nullptr);
-        if (!parser.Parse(contents.c_str(), &include_directories[0],
+        if (!parser->Parse(contents.c_str(), &include_directories[0],
                           file_it->c_str()))
-          Error(parser.error_, false, false);
+          Error(parser->error_, false, false);
         if (schema_binary) {
-          parser.Serialize();
-          parser.file_extension_ = reflection::SchemaExtension();
+          parser->Serialize();
+          parser->file_extension_ = reflection::SchemaExtension();
         }
         include_directories.pop_back();
         include_directories.pop_back();
@@ -280,11 +289,8 @@ int main(int argc, const char *argv[]) {
       }
 
       if (proto_mode) GenerateFBS(parser, output_path, filebase, opts);
-
-      // We do not want to generate code for the definitions in this file
-      // in any files coming up next.
-      parser.MarkGenerated();
   }
 
+  delete parser;
   return 0;
 }
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 233eeceef..f2b7fc9c4 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -1072,10 +1072,9 @@ bool Parser::SetRootType(const char *name) {
 }
 
 void Parser::MarkGenerated() {
-  // Since the Parser object retains definitions across files, we must
-  // ensure we only output code for definitions once, in the file they are first
-  // declared. This function marks all existing definitions as having already
-  // been generated.
+  // This function marks all existing definitions as having already
+  // been generated, which signals no code for included files should be
+  // generated.
   for (auto it = enums_.vec.begin();
            it != enums_.vec.end(); ++it) {
     (*it)->generated = true;

From d7f2488099e9045cee3ee958fe29e04ff1cabb34 Mon Sep 17 00:00:00 2001
From: Perry Hung <iperry@gmail.com>
Date: Mon, 30 Nov 2015 19:41:54 -0500
Subject: [PATCH 011/185] Link clang builds against libc++abi on Linux

Simply running clang with -stdlib=libc++ requires a manual link against
libc++abi on Linux. This is documented in the libc++ documentation:
    http://libcxx.llvm.org/

Tested on Arch Linux, using clang 3.7.0 RELEASE.

Signed-off-by: Perry Hung <iperry@gmail.com>
---
 CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47a428230..6dc73e7a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,7 +84,9 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
     "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra -Werror=shadow")
 elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   set(CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
+      "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
+  set(CMAKE_EXE_LINKER_FLAGS
+      "${CMAKE_EXE_LINKER_FLAGS} -lc++abi")
 endif()
 
 if(FLATBUFFERS_CODE_COVERAGE)

From 47478117d8df4ea4a4b052dd15e07712913486c7 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 30 Nov 2015 17:49:51 -0800
Subject: [PATCH 012/185] Fixed implicit dereference in flatc.

Change-Id: If2e62a325b47399561b4c20d2def55ede4831d19
Tested: on Linux.
---
 src/flatc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/flatc.cpp b/src/flatc.cpp
index 86de77416..a27af7950 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -272,7 +272,7 @@ int main(int argc, const char *argv[]) {
         if (generator_enabled[i]) {
           if (!print_make_rules) {
             flatbuffers::EnsureDirExists(output_path);
-            if (!generators[i].generate(parser, output_path, filebase, opts)) {
+            if (!generators[i].generate(*parser, output_path, filebase, opts)) {
               Error(std::string("Unable to generate ") +
                     generators[i].lang_name +
                     " for " +
@@ -280,7 +280,7 @@ int main(int argc, const char *argv[]) {
             }
           } else {
             std::string make_rule = generators[i].make_rule(
-                parser, output_path, *file_it, opts);
+                *parser, output_path, *file_it, opts);
             if (!make_rule.empty())
               printf("%s\n", flatbuffers::WordWrap(
                   make_rule, 80, " ", " \\").c_str());
@@ -288,7 +288,7 @@ int main(int argc, const char *argv[]) {
         }
       }
 
-      if (proto_mode) GenerateFBS(parser, output_path, filebase, opts);
+      if (proto_mode) GenerateFBS(*parser, output_path, filebase, opts);
   }
 
   delete parser;

From 45bda6e08de1436e8a25e791b776e0bcc38f232b Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 30 Nov 2015 17:42:19 -0800
Subject: [PATCH 013/185] Added --gen-all to generate code for a schema and all
 its includes.

Also refactored the way options are stored.

Change-Id: I709ac908cd2aba396c9c282725cf1d42ccce0882
Tested: on Linux.
---
 docs/html/md__compiler.html |   1 +
 docs/source/Compiler.md     |   5 ++
 include/flatbuffers/idl.h   | 131 ++++++++++++++++--------------------
 samples/sample_text.cpp     |   3 +-
 src/flatc.cpp               |  50 +++++++-------
 src/idl_gen_cpp.cpp         |  53 +++++++--------
 src/idl_gen_fbs.cpp         |  10 ++-
 src/idl_gen_general.cpp     | 111 +++++++++++++++---------------
 src/idl_gen_go.cpp          |   3 +-
 src/idl_gen_js.cpp          |  13 ++--
 src/idl_gen_php.cpp         |  35 +++++-----
 src/idl_gen_python.cpp      |   3 +-
 src/idl_gen_text.cpp        |  35 +++++-----
 src/idl_parser.cpp          |  28 ++++----
 tests/test.cpp              |  27 ++++----
 15 files changed, 240 insertions(+), 268 deletions(-)

diff --git a/docs/html/md__compiler.html b/docs/html/md__compiler.html
index 1b3cd1db4..d82b5b475 100644
--- a/docs/html/md__compiler.html
+++ b/docs/html/md__compiler.html
@@ -94,6 +94,7 @@ $(document).ready(function(){initNavTree('md__compiler.html','');});
 <li><code>--no-includes</code> : Don't generate include statements for included schemas the generated file depends on (C++).</li>
 <li><code>--gen-mutable</code> : Generate additional non-const accessors for mutating FlatBuffers in-place.</li>
 <li><code>--gen-onefile</code> : Generate single output file (useful for C#)</li>
+<li><code>--gen-all</code>: Generate not just code for the current schema files, but for all files it includes as well. If the language uses a single file for output (by default the case for C++ and JS), all code will end up in this one file.</li>
 <li><code>--raw-binary</code> : Allow binaries without a file_indentifier to be read. This may crash flatc given a mismatched schema.</li>
 <li><code>--proto</code>: Expect input files to be .proto files (protocol buffers). Output the corresponding .fbs file. Currently supports: <code>package</code>, <code>message</code>, <code>enum</code>, nested declarations, <code>import</code> (use <code>-I</code> for paths), <code>extend</code>, <code>oneof</code>, <code>group</code>. Does not support, but will skip without error: <code>option</code>, <code>service</code>, <code>extensions</code>, and most everything else.</li>
 <li><code>--schema</code>: Serialize schemas instead of JSON (use with -b). This will output a binary version of the specified schema that itself corresponds to the reflection/reflection.fbs schema. Loading this binary file is the basis for reflection functionality.</li>
diff --git a/docs/source/Compiler.md b/docs/source/Compiler.md
index 9d89cb104..6c93fb4b9 100755
--- a/docs/source/Compiler.md
+++ b/docs/source/Compiler.md
@@ -80,6 +80,11 @@ Additional options:
 
 -   `--gen-onefile` :  Generate single output file (useful for C#)
 
+-   `--gen-all`: Generate not just code for the current schema files, but
+    for all files it includes as well. If the language uses a single file for
+    output (by default the case for C++ and JS), all code will end up in
+    this one file.
+
 -   `--raw-binary` : Allow binaries without a file_indentifier to be read.
     This may crash flatc given a mismatched schema.
 
diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index f1276f01b..1ed360be1 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -306,15 +306,48 @@ struct EnumDef : public Definition {
   Type underlying_type;
 };
 
+// Container of options that may apply to any of the source/text generators.
+struct IDLOptions {
+  bool strict_json;
+  bool skip_js_exports;
+  bool output_default_scalars_in_json;
+  int indent_step;
+  bool output_enum_identifiers;
+  bool prefixed_enums;
+  bool scoped_enums;
+  bool include_dependence_headers;
+  bool mutable_buffer;
+  bool one_file;
+  bool proto_mode;
+  bool generate_all;
+
+  // Possible options for the more general generator below.
+  enum Language { kJava, kCSharp, kGo, kMAX };
+
+  Language lang;
+
+  IDLOptions()
+    : strict_json(false),
+      skip_js_exports(false),
+      output_default_scalars_in_json(false),
+      indent_step(2),
+      output_enum_identifiers(true), prefixed_enums(true), scoped_enums(false),
+      include_dependence_headers(true),
+      mutable_buffer(false),
+      one_file(false),
+      proto_mode(false),
+      generate_all(false),
+      lang(IDLOptions::kJava) {}
+};
+
 class Parser {
  public:
-  Parser(bool strict_json = false, bool proto_mode = false)
+  explicit Parser(const IDLOptions &options = IDLOptions())
     : root_struct_def_(nullptr),
+      opts(options),
       source_(nullptr),
       cursor_(nullptr),
       line_(1),
-      proto_mode_(proto_mode),
-      strict_json_(strict_json),
       anonymous_counter(0) {
     // Just in case none are declared:
     namespaces_.push_back(new Namespace());
@@ -415,13 +448,14 @@ class Parser {
   std::map<std::string, bool> included_files_;
   std::map<std::string, std::set<std::string>> files_included_per_file_;
 
+  IDLOptions opts;
+
  private:
   const char *source_, *cursor_;
   int line_;  // the current line being parsed
   int token_;
   std::string files_being_parsed_;
-  bool proto_mode_;
-  bool strict_json_;
+
   std::string attribute_;
   std::vector<std::string> doc_comment_;
 
@@ -443,35 +477,6 @@ extern void GenComment(const std::vector<std::string> &dc,
                        const CommentConfig *config,
                        const char *prefix = "");
 
-// Container of options that may apply to any of the source/text generators.
-struct GeneratorOptions {
-  bool strict_json;
-  bool skip_js_exports;
-  bool output_default_scalars_in_json;
-  int indent_step;
-  bool output_enum_identifiers;
-  bool prefixed_enums;
-  bool scoped_enums;
-  bool include_dependence_headers;
-  bool mutable_buffer;
-  bool one_file;
-
-  // Possible options for the more general generator below.
-  enum Language { kJava, kCSharp, kGo, kMAX };
-
-  Language lang;
-
-  GeneratorOptions() : strict_json(false),
-                       skip_js_exports(false),
-                       output_default_scalars_in_json(false),
-                       indent_step(2),
-                       output_enum_identifiers(true), prefixed_enums(true), scoped_enums(false),
-                       include_dependence_headers(true),
-                       mutable_buffer(false),
-                       one_file(false),
-                       lang(GeneratorOptions::kJava) {}
-};
-
 // Generate text (JSON) from a given FlatBuffer, and a given Parser
 // object that has been populated with the corresponding schema.
 // If ident_step is 0, no indentation will be generated. Additionally,
@@ -480,126 +485,106 @@ struct GeneratorOptions {
 // strict_json adds "quotes" around field names if true.
 extern void GenerateText(const Parser &parser,
                          const void *flatbuffer,
-                         const GeneratorOptions &opts,
                          std::string *text);
 extern bool GenerateTextFile(const Parser &parser,
                              const std::string &path,
-                             const std::string &file_name,
-                             const GeneratorOptions &opts);
+                             const std::string &file_name);
 
 // Generate binary files from a given FlatBuffer, and a given Parser
 // object that has been populated with the corresponding schema.
 // See idl_gen_general.cpp.
 extern bool GenerateBinary(const Parser &parser,
                            const std::string &path,
-                           const std::string &file_name,
-                           const GeneratorOptions &opts);
+                           const std::string &file_name);
 
 // Generate a C++ header from the definitions in the Parser object.
 // See idl_gen_cpp.
 extern std::string GenerateCPP(const Parser &parser,
-                               const std::string &include_guard_ident,
-                               const GeneratorOptions &opts);
+                               const std::string &include_guard_ident);
 extern bool GenerateCPP(const Parser &parser,
                         const std::string &path,
-                        const std::string &file_name,
-                        const GeneratorOptions &opts);
+                        const std::string &file_name);
 
 // Generate JavaScript code from the definitions in the Parser object.
 // See idl_gen_js.
-extern std::string GenerateJS(const Parser &parser,
-                              const GeneratorOptions &opts);
+extern std::string GenerateJS(const Parser &parser);
 extern bool GenerateJS(const Parser &parser,
                        const std::string &path,
-                       const std::string &file_name,
-                       const GeneratorOptions &opts);
+                       const std::string &file_name);
 
 // Generate Go files from the definitions in the Parser object.
 // See idl_gen_go.cpp.
 extern bool GenerateGo(const Parser &parser,
                        const std::string &path,
-                       const std::string &file_name,
-                       const GeneratorOptions &opts);
+                       const std::string &file_name);
 
 // Generate Java files from the definitions in the Parser object.
 // See idl_gen_java.cpp.
 extern bool GenerateJava(const Parser &parser,
                          const std::string &path,
-                         const std::string &file_name,
-                         const GeneratorOptions &opts);
+                         const std::string &file_name);
 
 // Generate Php code from the definitions in the Parser object.
 // See idl_gen_php.
 extern bool GeneratePhp(const Parser &parser,
        const std::string &path,
-       const std::string &file_name,
-       const GeneratorOptions &opts);
+       const std::string &file_name);
 
 // Generate Python files from the definitions in the Parser object.
 // See idl_gen_python.cpp.
 extern bool GeneratePython(const Parser &parser,
                            const std::string &path,
-                           const std::string &file_name,
-                           const GeneratorOptions &opts);
+                           const std::string &file_name);
 
 // Generate C# files from the definitions in the Parser object.
 // See idl_gen_csharp.cpp.
 extern bool GenerateCSharp(const Parser &parser,
                            const std::string &path,
-                           const std::string &file_name,
-                           const GeneratorOptions &opts);
+                           const std::string &file_name);
 
 // Generate Java/C#/.. files from the definitions in the Parser object.
 // See idl_gen_general.cpp.
 extern bool GenerateGeneral(const Parser &parser,
                             const std::string &path,
-                            const std::string &file_name,
-                            const GeneratorOptions &opts);
+                            const std::string &file_name);
 
 // Generate a schema file from the internal representation, useful after
 // parsing a .proto schema.
 extern std::string GenerateFBS(const Parser &parser,
-                               const std::string &file_name,
-                               const GeneratorOptions &opts);
+                               const std::string &file_name);
 extern bool GenerateFBS(const Parser &parser,
                         const std::string &path,
-                        const std::string &file_name,
-                        const GeneratorOptions &opts);
+                        const std::string &file_name);
 
 // Generate a make rule for the generated JavaScript code.
 // See idl_gen_js.cpp.
 extern std::string JSMakeRule(const Parser &parser,
                               const std::string &path,
-                              const std::string &file_name,
-                              const GeneratorOptions &opts);
+                              const std::string &file_name);
 
 // Generate a make rule for the generated C++ header.
 // See idl_gen_cpp.cpp.
 extern std::string CPPMakeRule(const Parser &parser,
                                const std::string &path,
-                               const std::string &file_name,
-                               const GeneratorOptions &opts);
+                               const std::string &file_name);
 
 // Generate a make rule for the generated Java/C#/... files.
 // See idl_gen_general.cpp.
 extern std::string GeneralMakeRule(const Parser &parser,
                                    const std::string &path,
-                                   const std::string &file_name,
-                                   const GeneratorOptions &opts);
+                                   const std::string &file_name);
 
 // Generate a make rule for the generated text (JSON) files.
 // See idl_gen_text.cpp.
 extern std::string TextMakeRule(const Parser &parser,
                                 const std::string &path,
-                                const std::string &file_name,
-                                const GeneratorOptions &opts);
+                                const std::string &file_names);
 
 // Generate a make rule for the generated binary files.
 // See idl_gen_general.cpp.
 extern std::string BinaryMakeRule(const Parser &parser,
                                   const std::string &path,
-                                  const std::string &file_name,
-                                  const GeneratorOptions &opts);
+                                  const std::string &file_name);
 
 }  // namespace flatbuffers
 
diff --git a/samples/sample_text.cpp b/samples/sample_text.cpp
index 88d761cbc..e1a3bf7e7 100644
--- a/samples/sample_text.cpp
+++ b/samples/sample_text.cpp
@@ -47,8 +47,7 @@ int main(int /*argc*/, const char * /*argv*/[]) {
   // to ensure it is correct, we now generate text back from the binary,
   // and compare the two:
   std::string jsongen;
-  GenerateText(parser, parser.builder_.GetBufferPointer(),
-               flatbuffers::GeneratorOptions(), &jsongen);
+  GenerateText(parser, parser.builder_.GetBufferPointer(), &jsongen);
 
   if (jsongen != jsonfile) {
     printf("%s----------------\n%s", jsongen.c_str(), jsonfile.c_str());
diff --git a/src/flatc.cpp b/src/flatc.cpp
index a27af7950..a51e488d1 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -26,55 +26,53 @@ static void Error(const std::string &err, bool usage = false,
 struct Generator {
   bool (*generate)(const flatbuffers::Parser &parser,
                    const std::string &path,
-                   const std::string &file_name,
-                   const flatbuffers::GeneratorOptions &opts);
+                   const std::string &file_name);
   const char *generator_opt_short;
   const char *generator_opt_long;
   const char *lang_name;
-  flatbuffers::GeneratorOptions::Language lang;
+  flatbuffers::IDLOptions::Language lang;
   const char *generator_help;
 
   std::string (*make_rule)(const flatbuffers::Parser &parser,
                            const std::string &path,
-                           const std::string &file_name,
-                           const flatbuffers::GeneratorOptions &opts);
+                           const std::string &file_name);
 };
 
 const Generator generators[] = {
   { flatbuffers::GenerateBinary,   "-b", "--binary", "binary",
-    flatbuffers::GeneratorOptions::kMAX,
+    flatbuffers::IDLOptions::kMAX,
     "Generate wire format binaries for any data definitions",
     flatbuffers::BinaryMakeRule },
   { flatbuffers::GenerateTextFile, "-t", "--json", "text",
-    flatbuffers::GeneratorOptions::kMAX,
+    flatbuffers::IDLOptions::kMAX,
     "Generate text output for any data definitions",
     flatbuffers::TextMakeRule },
   { flatbuffers::GenerateCPP,      "-c", "--cpp", "C++",
-    flatbuffers::GeneratorOptions::kMAX,
+    flatbuffers::IDLOptions::kMAX,
     "Generate C++ headers for tables/structs",
     flatbuffers::CPPMakeRule },
   { flatbuffers::GenerateGo,       "-g", "--go", "Go",
-    flatbuffers::GeneratorOptions::kGo,
+    flatbuffers::IDLOptions::kGo,
     "Generate Go files for tables/structs",
     flatbuffers::GeneralMakeRule },
   { flatbuffers::GenerateGeneral,  "-j", "--java", "Java",
-    flatbuffers::GeneratorOptions::kJava,
+    flatbuffers::IDLOptions::kJava,
     "Generate Java classes for tables/structs",
     flatbuffers::GeneralMakeRule },
   { flatbuffers::GenerateJS,       "-s", "--js", "JavaScript",
-    flatbuffers::GeneratorOptions::kMAX,
+    flatbuffers::IDLOptions::kMAX,
     "Generate JavaScript code for tables/structs",
     flatbuffers::JSMakeRule },
   { flatbuffers::GenerateGeneral,  "-n", "--csharp", "C#",
-    flatbuffers::GeneratorOptions::kCSharp,
+    flatbuffers::IDLOptions::kCSharp,
     "Generate C# classes for tables/structs",
     flatbuffers::GeneralMakeRule },
   { flatbuffers::GeneratePython,   "-p", "--python", "Python",
-    flatbuffers::GeneratorOptions::kMAX,
+    flatbuffers::IDLOptions::kMAX,
     "Generate Python files for tables/structs",
     flatbuffers::GeneralMakeRule },
     { flatbuffers::GeneratePhp, nullptr, "--php", "PHP",
-    flatbuffers::GeneratorOptions::kMAX,
+    flatbuffers::IDLOptions::kMAX,
     "Generate PHP files for tables/structs",
     flatbuffers::GeneralMakeRule },
 };
@@ -129,13 +127,12 @@ static void Error(const std::string &err, bool usage, bool show_exe_name) {
 
 int main(int argc, const char *argv[]) {
   program_name = argv[0];
-  flatbuffers::GeneratorOptions opts;
+  flatbuffers::IDLOptions opts;
   std::string output_path;
   const size_t num_generators = sizeof(generators) / sizeof(generators[0]);
   bool generator_enabled[num_generators] = { false };
   bool any_generator = false;
   bool print_make_rules = false;
-  bool proto_mode = false;
   bool raw_binary = false;
   bool schema_binary = false;
   std::vector<std::string> filenames;
@@ -165,6 +162,9 @@ int main(int argc, const char *argv[]) {
         opts.scoped_enums = true;
       } else if(arg == "--gen-mutable") {
         opts.mutable_buffer = true;
+      } else if(arg == "--gen-all") {
+        opts.generate_all = true;
+        opts.include_dependence_headers = false;
       } 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");
@@ -177,7 +177,7 @@ int main(int argc, const char *argv[]) {
       } else if(arg == "--") {  // Separator between text and binary inputs.
         binary_files_from = filenames.size();
       } else if(arg == "--proto") {
-        proto_mode = true;
+        opts.proto_mode = true;
         any_generator = true;
       } else if(arg == "--schema") {
         schema_binary = true;
@@ -204,10 +204,10 @@ int main(int argc, const char *argv[]) {
   if (!filenames.size()) Error("missing input files", false, true);
 
   if (!any_generator)
-    Error("no options: specify one of -c -g -j -t -b etc.", true);
+    Error("no options: specify at least one generator.", true);
 
   // Now process the files:
-  parser = new flatbuffers::Parser(opts.strict_json, proto_mode);
+  parser = new flatbuffers::Parser(opts);
   for (auto file_it = filenames.begin();
             file_it != filenames.end();
           ++file_it) {
@@ -248,7 +248,7 @@ int main(int argc, const char *argv[]) {
           // one from scratch. If it depends on previous schemas it must do
           // so explicitly using an include.
           delete parser;
-          parser = new flatbuffers::Parser(opts.strict_json, proto_mode);
+          parser = new flatbuffers::Parser(opts);
         }
         auto local_include_directory = flatbuffers::StripFileName(*file_it);
         include_directories.push_back(local_include_directory.c_str());
@@ -272,7 +272,7 @@ int main(int argc, const char *argv[]) {
         if (generator_enabled[i]) {
           if (!print_make_rules) {
             flatbuffers::EnsureDirExists(output_path);
-            if (!generators[i].generate(*parser, output_path, filebase, opts)) {
+            if (!generators[i].generate(*parser, output_path, filebase)) {
               Error(std::string("Unable to generate ") +
                     generators[i].lang_name +
                     " for " +
@@ -280,7 +280,7 @@ int main(int argc, const char *argv[]) {
             }
           } else {
             std::string make_rule = generators[i].make_rule(
-                *parser, output_path, *file_it, opts);
+                *parser, output_path, *file_it);
             if (!make_rule.empty())
               printf("%s\n", flatbuffers::WordWrap(
                   make_rule, 80, " ", " \\").c_str());
@@ -288,7 +288,11 @@ int main(int argc, const char *argv[]) {
         }
       }
 
-      if (proto_mode) GenerateFBS(*parser, output_path, filebase, opts);
+      if (opts.proto_mode) GenerateFBS(*parser, output_path, filebase);
+
+      // We do not want to generate code for the definitions in this file
+      // in any files coming up next.
+      parser->MarkGenerated();
   }
 
   delete parser;
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index ca523dcda..8a440e853 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -127,18 +127,18 @@ static std::string GenTypeGet(const Parser &parser, const Type &type,
 }
 
 static std::string GenEnumDecl(const EnumDef &enum_def,
-                               const GeneratorOptions &opts) {
+                               const IDLOptions &opts) {
   return (opts.scoped_enums ? "enum class " : "enum ") + enum_def.name;
 }
 
 static std::string GenEnumVal(const EnumDef &enum_def, const EnumVal &enum_val,
-                              const GeneratorOptions &opts) {
+                              const IDLOptions &opts) {
   return opts.prefixed_enums ? enum_def.name + "_" + enum_val.name
                              : enum_val.name;
 }
 
 static std::string GetEnumVal(const EnumDef &enum_def, const EnumVal &enum_val,
-                              const GeneratorOptions &opts) {
+                              const IDLOptions &opts) {
   if (opts.scoped_enums) {
       return enum_def.name + "::" + enum_val.name;
   } else if (opts.prefixed_enums) {
@@ -150,14 +150,13 @@ static std::string GetEnumVal(const EnumDef &enum_def, const EnumVal &enum_val,
 
 // Generate an enum declaration and an enum string lookup table.
 static void GenEnum(const Parser &parser, EnumDef &enum_def,
-                    std::string *code_ptr, std::string *code_ptr_post,
-                    const GeneratorOptions &opts) {
+                    std::string *code_ptr, std::string *code_ptr_post) {
   if (enum_def.generated) return;
   std::string &code = *code_ptr;
   std::string &code_post = *code_ptr_post;
   GenComment(enum_def.doc_comment, code_ptr, nullptr);
-  code += GenEnumDecl(enum_def, opts);
-  if (opts.scoped_enums)
+  code += GenEnumDecl(enum_def, parser.opts);
+  if (parser.opts.scoped_enums)
     code += " : " + GenTypeBasic(parser, enum_def.underlying_type, false);
   code += " {\n";
   for (auto it = enum_def.vals.vec.begin();
@@ -165,7 +164,7 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
        ++it) {
     auto &ev = **it;
     GenComment(ev.doc_comment, code_ptr, nullptr, "  ");
-    code += "  " + GenEnumVal(enum_def, ev, opts) + " = ";
+    code += "  " + GenEnumVal(enum_def, ev, parser.opts) + " = ";
     code += NumToString(ev.value);
     code += (it + 1) != enum_def.vals.vec.end() ? ",\n" : "\n";
   }
@@ -196,7 +195,7 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
     code += "()[static_cast<int>(e)";
     if (enum_def.vals.vec.front()->value) {
       code += " - static_cast<int>(";
-      code += GetEnumVal(enum_def, *enum_def.vals.vec.front(), opts) +")";
+      code += GetEnumVal(enum_def, *enum_def.vals.vec.front(), parser.opts) +")";
     }
     code += "]; }\n\n";
   }
@@ -216,7 +215,7 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
          it != enum_def.vals.vec.end();
          ++it) {
       auto &ev = **it;
-      code_post += "    case " + GetEnumVal(enum_def, ev, opts);
+      code_post += "    case " + GetEnumVal(enum_def, ev, parser.opts);
       if (!ev.value) {
         code_post += ": return true;\n";  // "NONE" enum value.
       } else {
@@ -250,7 +249,7 @@ std::string GenFieldOffsetName(const FieldDef &field) {
 
 // Generate an accessor struct, builder structs & function for a table.
 static void GenTable(const Parser &parser, StructDef &struct_def,
-                     const GeneratorOptions &opts, std::string *code_ptr) {
+                     std::string *code_ptr) {
   if (struct_def.generated) return;
   std::string &code = *code_ptr;
 
@@ -298,7 +297,7 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
       call += ")";
       code += GenUnderlyingCast(parser, field, true, call);
       code += "; }\n";
-      if (opts.mutable_buffer) {
+      if (parser.opts.mutable_buffer) {
         if (is_scalar) {
           code += "  bool mutate_" + field.name + "(";
           code += GenTypeBasic(parser, field.value.type, true);
@@ -339,7 +338,7 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
           code += "const char *val) const { return strcmp(" + field.name;
           code += "()->c_str(), val); }\n";
         } else {
-          if (opts.scoped_enums &&
+          if (parser.opts.scoped_enums &&
             field.value.type.enum_def &&
             IsScalar(field.value.type.base_type)) {
             code += GenTypeGet(parser, field.value.type, " ", "const ", " *",
@@ -477,7 +476,7 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
           code += WrapInNameSpace(parser,
                                   field.value.type.enum_def->defined_namespace,
                                   GetEnumVal(*field.value.type.enum_def, *ev,
-                                             opts));
+                                             parser.opts));
         } else {
           code += GenUnderlyingCast(parser, field, true, field.value.constant);
         }
@@ -518,7 +517,7 @@ static void GenPadding(const FieldDef &field,
 
 // Generate an accessor struct with constructor for a flatbuffers struct.
 static void GenStruct(const Parser &parser, StructDef &struct_def,
-                      const GeneratorOptions &opts,  std::string *code_ptr) {
+                      std::string *code_ptr) {
   if (struct_def.generated) return;
   std::string &code = *code_ptr;
 
@@ -602,7 +601,7 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
         ? "flatbuffers::EndianScalar(" + field.name + "_)"
         : field.name + "_");
     code += "; }\n";
-    if (opts.mutable_buffer) {
+    if (parser.opts.mutable_buffer) {
       if (is_scalar) {
         code += "  void mutate_" + field.name + "(";
         code += GenTypeBasic(parser, field.value.type, true);
@@ -639,15 +638,14 @@ void CloseNestedNameSpaces(Namespace *ns, std::string *code_ptr) {
 // Iterate through all definitions we haven't generate code for (enums, structs,
 // and tables) and output them to a single file.
 std::string GenerateCPP(const Parser &parser,
-                        const std::string &file_name,
-                        const GeneratorOptions &opts) {
+                        const std::string &file_name) {
   using namespace cpp;
 
   // Generate code for all the enum declarations.
   std::string enum_code, enum_code_post;
   for (auto it = parser.enums_.vec.begin();
        it != parser.enums_.vec.end(); ++it) {
-    GenEnum(parser, **it, &enum_code, &enum_code_post, opts);
+    GenEnum(parser, **it, &enum_code, &enum_code_post);
   }
 
   // Generate forward declarations for all structs/tables, since they may
@@ -688,11 +686,11 @@ std::string GenerateCPP(const Parser &parser,
   std::string decl_code;
   for (auto it = parser.structs_.vec.begin();
        it != parser.structs_.vec.end(); ++it) {
-    if ((**it).fixed) GenStruct(parser, **it, opts, &decl_code);
+    if ((**it).fixed) GenStruct(parser, **it, &decl_code);
   }
   for (auto it = parser.structs_.vec.begin();
        it != parser.structs_.vec.end(); ++it) {
-    if (!(**it).fixed) GenTable(parser, **it, opts, &decl_code);
+    if (!(**it).fixed) GenTable(parser, **it, &decl_code);
   }
 
   // Only output file-level code if there were any declarations.
@@ -725,7 +723,7 @@ std::string GenerateCPP(const Parser &parser,
 
     code += "#include \"flatbuffers/flatbuffers.h\"\n\n";
 
-    if (opts.include_dependence_headers) {
+    if (parser.opts.include_dependence_headers) {
       int num_includes = 0;
       for (auto it = parser.included_files_.begin();
            it != parser.included_files_.end(); ++it) {
@@ -765,7 +763,7 @@ std::string GenerateCPP(const Parser &parser,
       code += name;
       code += "(const void *buf) { return flatbuffers::GetRoot<";
       code += cpp_qualified_name + ">(buf); }\n\n";
-      if (opts.mutable_buffer) {
+      if (parser.opts.mutable_buffer) {
         code += "inline " + name + " *GetMutable";
         code += name;
         code += "(void *buf) { return flatbuffers::GetMutableRoot<";
@@ -806,7 +804,6 @@ std::string GenerateCPP(const Parser &parser,
       if (parser.file_identifier_.length())
         code += ", " + name + "Identifier()";
       code += "); }\n\n";
-
     }
 
     CloseNestedNameSpaces(name_space, &code);
@@ -827,17 +824,15 @@ static std::string GeneratedFileName(const std::string &path,
 
 bool GenerateCPP(const Parser &parser,
                  const std::string &path,
-                 const std::string &file_name,
-                 const GeneratorOptions &opts) {
-    auto code = GenerateCPP(parser, file_name, opts);
+                 const std::string &file_name) {
+    auto code = GenerateCPP(parser, file_name);
     return !code.length() ||
            SaveFile(GeneratedFileName(path, file_name).c_str(), code, false);
 }
 
 std::string CPPMakeRule(const Parser &parser,
                         const std::string &path,
-                        const std::string &file_name,
-                        const GeneratorOptions & /*opts*/) {
+                        const std::string &file_name) {
   std::string filebase = flatbuffers::StripPath(
       flatbuffers::StripExtension(file_name));
   std::string make_rule = GeneratedFileName(path, filebase) + ": ";
diff --git a/src/idl_gen_fbs.cpp b/src/idl_gen_fbs.cpp
index a55d42a88..00afe25d4 100644
--- a/src/idl_gen_fbs.cpp
+++ b/src/idl_gen_fbs.cpp
@@ -52,8 +52,7 @@ static void GenNameSpace(const Namespace &name_space, std::string *_schema,
 }
 
 // Generate a flatbuffer schema from the Parser's internal representation.
-std::string GenerateFBS(const Parser &parser, const std::string &file_name,
-                        const GeneratorOptions &opts) {
+std::string GenerateFBS(const Parser &parser, const std::string &file_name) {
   // Proto namespaces may clash with table names, so we have to prefix all:
   for (auto it = parser.namespaces_.begin(); it != parser.namespaces_.end();
        ++it) {
@@ -65,7 +64,7 @@ std::string GenerateFBS(const Parser &parser, const std::string &file_name,
 
   std::string schema;
   schema += "// Generated from " + file_name + ".proto\n\n";
-  if (opts.include_dependence_headers) {
+  if (parser.opts.include_dependence_headers) {
     #ifdef FBS_GEN_INCLUDES  // TODO: currently all in one file.
     int num_includes = 0;
     for (auto it = parser.included_files_.begin();
@@ -120,10 +119,9 @@ std::string GenerateFBS(const Parser &parser, const std::string &file_name,
 
 bool GenerateFBS(const Parser &parser,
                  const std::string &path,
-                 const std::string &file_name,
-                 const GeneratorOptions &opts) {
+                 const std::string &file_name) {
   return SaveFile((path + file_name + ".fbs").c_str(),
-                  GenerateFBS(parser, file_name, opts), false);
+                  GenerateFBS(parser, file_name), false);
 }
 
 }  // namespace flatbuffers
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index 33b863e6b..88aa4daee 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -69,10 +69,10 @@ void GenComment(const std::vector<std::string> &dc, std::string *code_ptr,
   }
 }
 
-// These arrays need to correspond to the GeneratorOptions::k enum.
+// These arrays need to correspond to the IDLOptions::k enum.
 
 struct LanguageParameters {
-  GeneratorOptions::Language language;
+  IDLOptions::Language language;
   // Whether function names in the language typically start with uppercase.
   bool first_camel_upper;
   const char *file_extension;
@@ -98,7 +98,7 @@ struct LanguageParameters {
 
 LanguageParameters language_parameters[] = {
   {
-    GeneratorOptions::kJava,
+    IDLOptions::kJava,
     false,
     ".java",
     "String",
@@ -126,7 +126,7 @@ LanguageParameters language_parameters[] = {
     },
   },
   {
-    GeneratorOptions::kCSharp,
+    IDLOptions::kCSharp,
     true,
     ".cs",
     "string",
@@ -155,7 +155,7 @@ LanguageParameters language_parameters[] = {
   // TODO: add Go support to the general generator.
   // WARNING: this is currently only used for generating make rules for Go.
   {
-    GeneratorOptions::kGo,
+    IDLOptions::kGo,
     true,
     ".go",
     "string",
@@ -184,12 +184,12 @@ LanguageParameters language_parameters[] = {
 };
 
 static_assert(sizeof(language_parameters) / sizeof(LanguageParameters) ==
-              GeneratorOptions::kMAX,
+              IDLOptions::kMAX,
               "Please add extra elements to the arrays above.");
 
 static std::string FunctionStart(const LanguageParameters &lang, char upper) {
   return std::string() +
-      (lang.language == GeneratorOptions::kJava
+      (lang.language == IDLOptions::kJava
          ? static_cast<char>(tolower(upper))
          : upper);
 }
@@ -209,13 +209,13 @@ static std::string GenTypeBasic(const LanguageParameters &lang,
   };
 
   if (enableLangOverrides) {
-    if (lang.language == GeneratorOptions::kCSharp) {
+    if (lang.language == IDLOptions::kCSharp) {
       if (IsEnum(type)) return type.enum_def->name;
       if (type.base_type == BASE_TYPE_STRUCT) return "Offset<" + type.struct_def->name + ">";
     }
   }
 
-  return gtypename[type.base_type * GeneratorOptions::kMAX + lang.language];
+  return gtypename[type.base_type * IDLOptions::kMAX + lang.language];
 }
 
 static std::string GenTypeBasic(const LanguageParameters &lang, const Type &type) {
@@ -236,7 +236,7 @@ static std::string GenTypePointer(const LanguageParameters &lang,
       return type.struct_def->name;
     case BASE_TYPE_UNION:
       // Unions in C# use a generic Table-derived type for better type safety
-      if (lang.language == GeneratorOptions::kCSharp) return "TTable";
+      if (lang.language == IDLOptions::kCSharp) return "TTable";
       // fall through
     default:
       return "Table";
@@ -254,7 +254,7 @@ static std::string GenTypeGet(const LanguageParameters &lang,
 // one size higher signed types for unsigned serialized values in Java).
 static Type DestinationType(const LanguageParameters &lang, const Type &type,
                             bool vectorelem) {
-  if (lang.language != GeneratorOptions::kJava) return type;
+  if (lang.language != IDLOptions::kJava) return type;
   switch (type.base_type) {
     // We use int for both uchar/ushort, since that generally means less casting
     // than using short for uchar.
@@ -270,7 +270,7 @@ static Type DestinationType(const LanguageParameters &lang, const Type &type,
 }
 
 static std::string GenOffsetType(const LanguageParameters &lang, const StructDef &struct_def) {
-  if(lang.language == GeneratorOptions::kCSharp) {
+  if(lang.language == IDLOptions::kCSharp) {
     return "Offset<" + struct_def.name + ">";
   } else {
     return "int";
@@ -281,14 +281,14 @@ static std::string GenOffsetConstruct(const LanguageParameters &lang,
                                       const StructDef &struct_def,
                                       const std::string &variable_name)
 {
-  if(lang.language == GeneratorOptions::kCSharp) {
+  if(lang.language == IDLOptions::kCSharp) {
     return "new Offset<" + struct_def.name + ">(" + variable_name + ")";
   }
   return variable_name;
 }
 
 static std::string GenVectorOffsetType(const LanguageParameters &lang) {
-  if(lang.language == GeneratorOptions::kCSharp) {
+  if(lang.language == IDLOptions::kCSharp) {
     return "VectorOffset";
   } else {
     return "int";
@@ -304,7 +304,7 @@ static std::string GenTypeNameDest(const LanguageParameters &lang, const Type &t
 // Mask to turn serialized value into destination type value.
 static std::string DestinationMask(const LanguageParameters &lang,
                                    const Type &type, bool vectorelem) {
-  if (lang.language != GeneratorOptions::kJava) return "";
+  if (lang.language != IDLOptions::kJava) return "";
   switch (type.base_type) {
     case BASE_TYPE_UCHAR:  return " & 0xFF";
     case BASE_TYPE_USHORT: return " & 0xFFFF";
@@ -324,12 +324,12 @@ static std::string DestinationCast(const LanguageParameters &lang,
     return DestinationCast(lang, type.VectorType());
   } else {
     switch (lang.language) {
-    case GeneratorOptions::kJava:
+    case IDLOptions::kJava:
       // Cast necessary to correctly read serialized unsigned values.
       if (type.base_type == BASE_TYPE_UINT) return "(long)";
       break;
 
-    case GeneratorOptions::kCSharp:
+    case IDLOptions::kCSharp:
       // Cast from raw integral types to enum.
       if (IsEnum(type)) return "(" + type.enum_def->name + ")";
       break;
@@ -352,14 +352,14 @@ static std::string SourceCast(const LanguageParameters &lang,
     return SourceCast(lang, type.VectorType(), castFromDest);
   } else {
     switch (lang.language) {
-      case GeneratorOptions::kJava:
+      case IDLOptions::kJava:
         if (castFromDest) {
           if (type.base_type == BASE_TYPE_UINT) return "(int)";
           else if (type.base_type == BASE_TYPE_USHORT) return "(short)";
           else if (type.base_type == BASE_TYPE_UCHAR) return "(byte)";
         }
         break;
-      case GeneratorOptions::kCSharp:
+      case IDLOptions::kCSharp:
         if (IsEnum(type)) return "(" + GenTypeBasic(lang, type, false) + ")";
         break;
       default:
@@ -406,7 +406,7 @@ static std::string GenEnumDefaultValue(const Value &value) {
 static std::string GenDefaultValue(const LanguageParameters &lang, const Value &value, bool enableLangOverrides) {
   if (enableLangOverrides) {
     // handles both enum case and vector of enum case
-    if (lang.language == GeneratorOptions::kCSharp &&
+    if (lang.language == IDLOptions::kCSharp &&
         value.type.enum_def != nullptr &&
         value.type.base_type != BASE_TYPE_UNION) {
       return GenEnumDefaultValue(value);
@@ -424,7 +424,7 @@ static std::string GenDefaultValue(const LanguageParameters &lang, const Value &
 static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Value &value, bool enableLangOverrides) {
   if (!IsScalar(value.type.base_type)) {
     if (enableLangOverrides) {
-      if (lang.language == GeneratorOptions::kCSharp) {
+      if (lang.language == IDLOptions::kCSharp) {
         switch (value.type.base_type) {
         case BASE_TYPE_STRING:
           return "default(StringOffset)";
@@ -458,11 +458,11 @@ static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def,
   // That, and Java Enums are expensive, and not universally liked.
   GenComment(enum_def.doc_comment, code_ptr, &lang.comment_config);
   code += std::string("public ") + lang.enum_decl + enum_def.name;
-  if (lang.language == GeneratorOptions::kCSharp) {
+  if (lang.language == IDLOptions::kCSharp) {
     code += lang.inheritance_marker + GenTypeBasic(lang, enum_def.underlying_type, false);
   }
   code += lang.open_curly;
-  if (lang.language == GeneratorOptions::kJava) {
+  if (lang.language == IDLOptions::kJava) {
     code += "  private " + enum_def.name + "() { }\n";
   }
   for (auto it = enum_def.vals.vec.begin();
@@ -470,7 +470,7 @@ static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def,
        ++it) {
     auto &ev = **it;
     GenComment(ev.doc_comment, code_ptr, &lang.comment_config, "  ");
-    if (lang.language != GeneratorOptions::kCSharp) {
+    if (lang.language != IDLOptions::kCSharp) {
       code += "  public static";
       code += lang.const_decl;
       code += GenTypeBasic(lang, enum_def.underlying_type, false);
@@ -482,7 +482,7 @@ static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def,
 
   // Generate a generate string table for enum values.
   // We do not do that for C# where this functionality is native.
-  if (lang.language != GeneratorOptions::kCSharp) {
+  if (lang.language != IDLOptions::kCSharp) {
     // Problem is, if values are very sparse that could generate really big
     // tables. Ideally in that case we generate a map lookup instead, but for
     // the moment we simply don't output a table at all.
@@ -544,7 +544,7 @@ static std::string GenSetter(const LanguageParameters &lang,
                              const Type &type) {
   if (IsScalar(type.base_type)) {
     std::string setter = "bb." + FunctionStart(lang, 'P') + "ut";
-    if (GenTypeBasic(lang, type, false) != "byte" && 
+    if (GenTypeBasic(lang, type, false) != "byte" &&
         type.base_type != BASE_TYPE_BOOL) {
       setter += MakeCamel(GenTypeBasic(lang, type, false));
     }
@@ -619,8 +619,7 @@ static void GenStructBody(const LanguageParameters &lang,
 }
 
 static void GenStruct(const LanguageParameters &lang, const Parser &parser,
-                      StructDef &struct_def, const GeneratorOptions &opts,
-                      std::string *code_ptr) {
+                      StructDef &struct_def, std::string *code_ptr) {
   if (struct_def.generated) return;
   std::string &code = *code_ptr;
 
@@ -692,13 +691,13 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
     // Generate the accessors that don't do object reuse.
     if (field.value.type.base_type == BASE_TYPE_STRUCT) {
       // Calls the accessor that takes an accessor object with a new object.
-      if (lang.language == GeneratorOptions::kCSharp) {
+      if (lang.language == IDLOptions::kCSharp) {
         code += method_start + " { get { return Get";
         code += MakeCamel(field.name, lang.first_camel_upper);
         code += "(new ";
         code += type_name + "()); } }\n";
         method_start = "  public " + type_name_dest + " Get" + MakeCamel(field.name, lang.first_camel_upper);
-      } 
+      }
       else {
         code += method_start + "() { return ";
         code += MakeCamel(field.name, lang.first_camel_upper);
@@ -709,7 +708,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
                field.value.type.element == BASE_TYPE_STRUCT) {
       // Accessors for vectors of structs also take accessor objects, this
       // generates a variant without that argument.
-      if (lang.language == GeneratorOptions::kCSharp) {
+      if (lang.language == IDLOptions::kCSharp) {
         method_start = "  public " + type_name_dest + " Get" + MakeCamel(field.name, lang.first_camel_upper);
         code += method_start + "(int j) { return Get";
       } else {
@@ -719,11 +718,11 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
       code += "(new ";
       code += type_name + "(), j); }\n";
     } else if (field.value.type.base_type == BASE_TYPE_VECTOR) {
-      if (lang.language == GeneratorOptions::kCSharp) {
+      if (lang.language == IDLOptions::kCSharp) {
         method_start = "  public " + type_name_dest + " Get" + MakeCamel(field.name, lang.first_camel_upper);
       }
     } else if (field.value.type.base_type == BASE_TYPE_UNION) {
-      if (lang.language == GeneratorOptions::kCSharp) {
+      if (lang.language == IDLOptions::kCSharp) {
         // union types in C# use generic Table-derived type for better type safety
         method_start = "  public " + type_name_dest + " Get" + MakeCamel(field.name, lang.first_camel_upper) + "<TTable>";
         offset_prefix = " where TTable : Table" + offset_prefix;
@@ -734,8 +733,8 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
     code += method_start;
     std::string default_cast = "";
     // only create default casts for c# scalars or vectors of scalars
-    if (lang.language == GeneratorOptions::kCSharp && 
-        (IsScalar(field.value.type.base_type) || 
+    if (lang.language == IDLOptions::kCSharp &&
+        (IsScalar(field.value.type.base_type) ||
          (field.value.type.base_type == BASE_TYPE_VECTOR && IsScalar(field.value.type.element)))) {
       // For scalars, default value will be returned by GetDefaultValue(). If the scalar is an enum, GetDefaultValue()
       // returns an actual c# enum that doesn't need to be casted. However, default values for enum elements of
@@ -827,7 +826,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
     if (((field.value.type.base_type == BASE_TYPE_VECTOR &&
           IsScalar(field.value.type.VectorType().base_type)) ||
          field.value.type.base_type == BASE_TYPE_STRING) &&
-        lang.language == GeneratorOptions::kJava) {
+        lang.language == IDLOptions::kJava) {
       code += "  public ByteBuffer ";
       code += MakeCamel(field.name, lang.first_camel_upper);
       code += "AsByteBuffer() { return __vector_as_bytebuffer(";
@@ -838,7 +837,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
     }
 
     // generate mutators for scalar fields or vectors of scalars
-    if (opts.mutable_buffer) {
+    if (parser.opts.mutable_buffer) {
       auto underlying_type = field.value.type.base_type == BASE_TYPE_VECTOR
                     ? field.value.type.VectorType()
                     : field.value.type;
@@ -852,7 +851,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
       auto setter_index = field.value.type.base_type == BASE_TYPE_VECTOR
                     ? "__vector(o) + j * " + NumToString(InlineSize(underlying_type))
                     : (struct_def.fixed ? "bb_pos + " + NumToString(field.value.offset) : "o + bb_pos");
-      if (IsScalar(field.value.type.base_type) || 
+      if (IsScalar(field.value.type.base_type) ||
           (field.value.type.base_type == BASE_TYPE_VECTOR &&
           IsScalar(field.value.type.VectorType().base_type))) {
         code += "  public ";
@@ -916,7 +915,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
 
         // Java doesn't have defaults, which means this method must always
         // supply all arguments, and thus won't compile when fields are added.
-        if (lang.language != GeneratorOptions::kJava) {
+        if (lang.language != IDLOptions::kJava) {
           code += " = ";
           code += GenDefaultValueBasic(lang, field.value);
         }
@@ -970,7 +969,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
       code += NumToString(it - struct_def.fields.vec.begin()) + ", ";
       code += SourceCastBasic(lang, field.value.type);
       code += argname;
-      if(!IsScalar(field.value.type.base_type) && field.value.type.base_type != BASE_TYPE_UNION && lang.language == GeneratorOptions::kCSharp) {
+      if(!IsScalar(field.value.type.base_type) && field.value.type.base_type != BASE_TYPE_UNION && lang.language == IDLOptions::kCSharp) {
         code += ".Value";
       }
       code += ", " + GenDefaultValue(lang, field.value, false);
@@ -996,7 +995,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
           code += "(";
           code += SourceCastBasic(lang, vector_type, false);
           code += "data[i]";
-          if (lang.language == GeneratorOptions::kCSharp &&
+          if (lang.language == IDLOptions::kCSharp &&
             (vector_type.base_type == BASE_TYPE_STRUCT || vector_type.base_type == BASE_TYPE_STRING))
             code += ".Value";
           code += "); return ";
@@ -1032,7 +1031,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
       code += FunctionStart(lang, 'F') + "inish" + struct_def.name;
       code += "Buffer(FlatBufferBuilder builder, " + GenOffsetType(lang, struct_def) + " offset) {";
       code += " builder." + FunctionStart(lang, 'F') + "inish(offset";
-      if (lang.language == GeneratorOptions::kCSharp) {
+      if (lang.language == IDLOptions::kCSharp) {
         code += ".Value";
       }
 
@@ -1080,18 +1079,17 @@ static bool SaveClass(const LanguageParameters &lang, const Parser &parser,
 
 bool GenerateGeneral(const Parser &parser,
                      const std::string &path,
-                     const std::string & file_name,
-                     const GeneratorOptions &opts) {
+                     const std::string & file_name) {
 
-  assert(opts.lang <= GeneratorOptions::kMAX);
-  auto lang = language_parameters[opts.lang];
+  assert(parser.opts.lang <= IDLOptions::kMAX);
+  auto lang = language_parameters[parser.opts.lang];
   std::string one_file_code;
 
   for (auto it = parser.enums_.vec.begin();
        it != parser.enums_.vec.end(); ++it) {
     std::string enumcode;
     GenEnum(lang, **it, &enumcode);
-    if (opts.one_file) {
+    if (parser.opts.one_file) {
       one_file_code += enumcode;
     }
     else {
@@ -1103,8 +1101,8 @@ bool GenerateGeneral(const Parser &parser,
   for (auto it = parser.structs_.vec.begin();
        it != parser.structs_.vec.end(); ++it) {
     std::string declcode;
-    GenStruct(lang, parser, **it, opts, &declcode);
-    if (opts.one_file) {
+    GenStruct(lang, parser, **it, &declcode);
+    if (parser.opts.one_file) {
       one_file_code += declcode;
     }
     else {
@@ -1113,7 +1111,7 @@ bool GenerateGeneral(const Parser &parser,
     }
   }
 
-  if (opts.one_file) {
+  if (parser.opts.one_file) {
     return SaveClass(lang, parser, file_name, one_file_code,path, true, true);
   }
   return true;
@@ -1139,10 +1137,9 @@ static std::string ClassFileName(const LanguageParameters &lang,
 
 std::string GeneralMakeRule(const Parser &parser,
                             const std::string &path,
-                            const std::string &file_name,
-                            const GeneratorOptions &opts) {
-  assert(opts.lang <= GeneratorOptions::kMAX);
-  auto lang = language_parameters[opts.lang];
+                            const std::string &file_name) {
+  assert(parser.opts.lang <= IDLOptions::kMAX);
+  auto lang = language_parameters[parser.opts.lang];
 
   std::string make_rule;
 
@@ -1178,8 +1175,7 @@ std::string BinaryFileName(const Parser &parser,
 
 bool GenerateBinary(const Parser &parser,
                     const std::string &path,
-                    const std::string &file_name,
-                    const GeneratorOptions & /*opts*/) {
+                    const std::string &file_name) {
   return !parser.builder_.GetSize() ||
          flatbuffers::SaveFile(
            BinaryFileName(parser, path, file_name).c_str(),
@@ -1190,8 +1186,7 @@ bool GenerateBinary(const Parser &parser,
 
 std::string BinaryMakeRule(const Parser &parser,
                            const std::string &path,
-                           const std::string &file_name,
-                           const GeneratorOptions & /*opts*/) {
+                           const std::string &file_name) {
   if (!parser.builder_.GetSize()) return "";
   std::string filebase = flatbuffers::StripPath(
       flatbuffers::StripExtension(file_name));
diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp
index 04ee3dbd3..88ce1f2a5 100644
--- a/src/idl_gen_go.cpp
+++ b/src/idl_gen_go.cpp
@@ -664,8 +664,7 @@ static void GenStructBuilder(const StructDef &struct_def,
 
 bool GenerateGo(const Parser &parser,
                 const std::string &path,
-                const std::string & /*file_name*/,
-                const GeneratorOptions & /*opts*/) {
+                const std::string & /*file_name*/) {
   for (auto it = parser.enums_.vec.begin();
        it != parser.enums_.vec.end(); ++it) {
     std::string enumcode;
diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp
index 84ee6ae8c..7efc39571 100644
--- a/src/idl_gen_js.cpp
+++ b/src/idl_gen_js.cpp
@@ -653,8 +653,7 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
 
 // Iterate through all definitions we haven't generate code for (enums, structs,
 // and tables) and output them to a single file.
-std::string GenerateJS(const Parser &parser,
-                       const GeneratorOptions &opts) {
+std::string GenerateJS(const Parser &parser) {
   using namespace js;
 
   // Generate code for all the enum declarations.
@@ -684,7 +683,7 @@ std::string GenerateJS(const Parser &parser,
     code += enum_code;
     code += decl_code;
 
-    if (!exports_code.empty() && !opts.skip_js_exports) {
+    if (!exports_code.empty() && !parser.opts.skip_js_exports) {
       code += "// Exports for Node.js and RequireJS\n";
       code += exports_code;
     }
@@ -702,17 +701,15 @@ static std::string GeneratedFileName(const std::string &path,
 
 bool GenerateJS(const Parser &parser,
                 const std::string &path,
-                const std::string &file_name,
-                const GeneratorOptions &opts) {
-    auto code = GenerateJS(parser, opts);
+                const std::string &file_name) {
+    auto code = GenerateJS(parser);
     return !code.length() ||
            SaveFile(GeneratedFileName(path, file_name).c_str(), code, false);
 }
 
 std::string JSMakeRule(const Parser &parser,
                        const std::string &path,
-                       const std::string &file_name,
-                       const GeneratorOptions & /*opts*/) {
+                       const std::string &file_name) {
   std::string filebase = flatbuffers::StripPath(
       flatbuffers::StripExtension(file_name));
   std::string make_rule = GeneratedFileName(path, filebase) + ": ";
diff --git a/src/idl_gen_php.cpp b/src/idl_gen_php.cpp
index aba16507e..2aa7e222e 100644
--- a/src/idl_gen_php.cpp
+++ b/src/idl_gen_php.cpp
@@ -140,8 +140,8 @@ namespace php {
       code += Indent + " * @return " + struct_def.name + "\n";
       code += Indent + " **/\n";
       code += Indent + "public function init($_i, ByteBuffer $_bb)\n";
-	  code += Indent + "{\n";
-	  code += Indent + Indent + "$this->bb_pos = $_i;\n";
+      code += Indent + "{\n";
+      code += Indent + Indent + "$this->bb_pos = $_i;\n";
       code += Indent + Indent + "$this->bb = $_bb;\n";
       code += Indent + Indent + "return $this;\n";
       code += Indent + "}\n\n";
@@ -241,7 +241,7 @@ namespace php {
       code += Indent + "public function get";
       code += MakeCamel(field.name);
       code += "()\n";
-	  code += Indent + "{\n";
+      code += Indent + "{\n";
       code += Indent + Indent + "$obj = new ";
       code += MakeCamel(GenTypeGet(field.value.type)) + "();\n";
       code += Indent + Indent +
@@ -251,8 +251,6 @@ namespace php {
       code += Indent + Indent;
       code += "return $o != 0 ? $obj->init($o + $this->bb_pos, $this->bb) : ";
       code += GenDefaultValue(field.value) + ";\n";
-
-
       code += Indent + "}\n\n";
     }
 
@@ -263,7 +261,7 @@ namespace php {
       code += Indent + "public function get";
       code += MakeCamel(field.name);
       code += "()\n";
-	  code += Indent + "{\n";
+      code += Indent + "{\n";
       code += Indent + Indent +
         "$o = $this->__offset(" +
         NumToString(field.value.offset) +
@@ -307,7 +305,7 @@ namespace php {
       code += Indent + "public function get";
       code += MakeCamel(field.name);
       code += "($j)\n";
-	  code += Indent + "{\n";
+      code += Indent + "{\n";
       code += Indent + Indent +
         "$o = $this->__offset(" +
         NumToString(field.value.offset) +
@@ -371,7 +369,7 @@ namespace php {
       code += Indent + "public function get";
       code += MakeCamel(field.name);
       code += "($j)\n";
-	  code += Indent + "{\n";
+      code += Indent + "{\n";
       code += Indent + Indent +
         "$o = $this->__offset(" +
         NumToString(field.value.offset) +
@@ -456,7 +454,7 @@ namespace php {
       code += Indent + " */\n";
       code += Indent + "public static function start" + struct_def.name;
       code += "(FlatBufferBuilder $builder)\n";
-	  code += Indent + "{\n";
+      code += Indent + "{\n";
       code += Indent + Indent + "$builder->StartObject(";
       code += NumToString(struct_def.fields.vec.size());
       code += ");\n";
@@ -528,7 +526,7 @@ namespace php {
       code += "(FlatBufferBuilder $builder, ";
       code += "$" + MakeCamel(field.name, false);
       code += ")\n";
-	  code += Indent + "{\n";
+      code += Indent + "{\n";
       code += Indent + Indent + "$builder->add";
       code += GenMethod(field) + "X(";
       code += NumToString(offset) + ", ";
@@ -562,7 +560,7 @@ namespace php {
       code += Indent + "public static function create";
       code += MakeCamel(field.name);
       code += "Vector(FlatBufferBuilder $builder, array $data)\n";
-	  code += Indent + "{\n";
+      code += Indent + "{\n";
       code += Indent + Indent + "$builder->startVector(";
       code += NumToString(elem_size);
       code += ", count($data), " + NumToString(alignment);
@@ -591,7 +589,7 @@ namespace php {
       code += Indent + "public static function start";
       code += MakeCamel(field.name);
       code += "Vector(FlatBufferBuilder $builder, $numElems)\n";
-	  code += Indent + "{\n";
+      code += Indent + "{\n";
       code += Indent + Indent +  "$builder->startVector(";
       code += NumToString(elem_size);
       code += ", $numElems, " + NumToString(alignment);
@@ -612,7 +610,7 @@ namespace php {
       code += Indent + " */\n";
       code += Indent + "public static function end" + struct_def.name;
       code += "(FlatBufferBuilder $builder)\n";
-	  code += Indent + "{\n";
+      code += Indent + "{\n";
       code += Indent + Indent + "$o = $builder->endObject();\n";
 
 
@@ -644,7 +642,7 @@ namespace php {
       }
     }
 
-	// Generate a struct field, conditioned on its child type(s).
+  // Generate a struct field, conditioned on its child type(s).
     static void GenStructAccessor(const StructDef &struct_def,
       const FieldDef &field,
       std::string *code_ptr) {
@@ -707,7 +705,7 @@ namespace php {
           code += Indent + "public static function add";
           code += MakeCamel(field.name);
           code += "(FlatBufferBuilder $builder, $offset)\n";
-		  code += Indent + "{\n";
+          code += Indent + "{\n";
           code += Indent + Indent + "$builder->addOffsetX(";
           code += NumToString(offset) + ", $offset, 0);\n";
           code += Indent + "}\n\n";
@@ -815,7 +813,7 @@ namespace php {
 
       code += Indent + ");\n\n";
       code += Indent + "public static function Name($e)\n";
-	  code += Indent + "{\n";
+      code += Indent + "{\n";
       code += Indent + Indent + "if (!isset(self::$names[$e])) {\n";
       code += Indent + Indent + Indent + "throw new \\Exception();\n";
       code += Indent + Indent + "}\n";
@@ -943,7 +941,7 @@ namespace php {
       code += "(FlatBufferBuilder $builder";
       StructBuilderArgs(struct_def, "", code_ptr);
       code += ")\n";
-	  code += Indent + "{\n";
+      code += Indent + "{\n";
 
       StructBuilderBody(struct_def, "", code_ptr);
 
@@ -955,8 +953,7 @@ namespace php {
 
   bool GeneratePhp(const Parser &parser,
     const std::string &path,
-    const std::string & /*file_name*/,
-    const GeneratorOptions & /*opts*/) {
+    const std::string & /*file_name*/) {
     for (auto it = parser.enums_.vec.begin();
     it != parser.enums_.vec.end(); ++it) {
       std::string enumcode;
diff --git a/src/idl_gen_python.cpp b/src/idl_gen_python.cpp
index de47a99cf..7cd09cfcd 100644
--- a/src/idl_gen_python.cpp
+++ b/src/idl_gen_python.cpp
@@ -638,8 +638,7 @@ static void GenStructBuilder(const StructDef &struct_def,
 
 bool GeneratePython(const Parser &parser,
                     const std::string &path,
-                    const std::string & /*file_name*/,
-                    const GeneratorOptions & /*opts*/) {
+                    const std::string & /*file_name*/) {
   for (auto it = parser.enums_.vec.begin();
        it != parser.enums_.vec.end(); ++it) {
     std::string enumcode;
diff --git a/src/idl_gen_text.cpp b/src/idl_gen_text.cpp
index 18bebc32d..dd96912cd 100644
--- a/src/idl_gen_text.cpp
+++ b/src/idl_gen_text.cpp
@@ -23,21 +23,21 @@
 namespace flatbuffers {
 
 static void GenStruct(const StructDef &struct_def, const Table *table,
-                      int indent, const GeneratorOptions &opts,
+                      int indent, const IDLOptions &opts,
                       std::string *_text);
 
 // If indentation is less than 0, that indicates we don't want any newlines
 // either.
-const char *NewLine(const GeneratorOptions &opts) {
+const char *NewLine(const IDLOptions &opts) {
   return opts.indent_step >= 0 ? "\n" : "";
 }
 
-int Indent(const GeneratorOptions &opts) {
+int Indent(const IDLOptions &opts) {
   return std::max(opts.indent_step, 0);
 }
 
 // Output an identifier with or without quotes depending on strictness.
-void OutputIdentifier(const std::string &name, const GeneratorOptions &opts,
+void OutputIdentifier(const std::string &name, const IDLOptions &opts,
                       std::string *_text) {
   std::string &text = *_text;
   if (opts.strict_json) text += "\"";
@@ -50,7 +50,7 @@ void OutputIdentifier(const std::string &name, const GeneratorOptions &opts,
 // The general case for scalars:
 template<typename T> void Print(T val, Type type, int /*indent*/,
                                 StructDef * /*union_sd*/,
-                                const GeneratorOptions &opts,
+                                const IDLOptions &opts,
                                 std::string *_text) {
   std::string &text = *_text;
   if (type.enum_def && opts.output_enum_identifiers) {
@@ -70,7 +70,7 @@ template<typename T> void Print(T val, Type type, int /*indent*/,
 
 // Print a vector a sequence of JSON values, comma separated, wrapped in "[]".
 template<typename T> void PrintVector(const Vector<T> &v, Type type,
-                                      int indent, const GeneratorOptions &opts,
+                                      int indent, const IDLOptions &opts,
                                       std::string *_text) {
   std::string &text = *_text;
   text += "[";
@@ -136,7 +136,7 @@ static void EscapeString(const String &s, std::string *_text) {
 template<> void Print<const void *>(const void *val,
                                     Type type, int indent,
                                     StructDef *union_sd,
-                                    const GeneratorOptions &opts,
+                                    const IDLOptions &opts,
                                     std::string *_text) {
   switch (type.base_type) {
     case BASE_TYPE_UNION:
@@ -181,7 +181,7 @@ template<> void Print<const void *>(const void *val,
 // Generate text for a scalar field.
 template<typename T> static void GenField(const FieldDef &fd,
                                           const Table *table, bool fixed,
-                                          const GeneratorOptions &opts,
+                                          const IDLOptions &opts,
                                           int indent,
                                           std::string *_text) {
   Print(fixed ?
@@ -193,7 +193,7 @@ template<typename T> static void GenField(const FieldDef &fd,
 // Generate text for non-scalar field.
 static void GenFieldOffset(const FieldDef &fd, const Table *table, bool fixed,
                            int indent, StructDef *union_sd,
-                           const GeneratorOptions &opts, std::string *_text) {
+                           const IDLOptions &opts, std::string *_text) {
   const void *val = nullptr;
   if (fixed) {
     // The only non-scalar fields in structs are structs.
@@ -211,7 +211,7 @@ static void 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 void GenStruct(const StructDef &struct_def, const Table *table,
-                      int indent, const GeneratorOptions &opts,
+                      int indent, const IDLOptions &opts,
                       std::string *_text) {
   std::string &text = *_text;
   text += "{";
@@ -273,16 +273,16 @@ static void GenStruct(const StructDef &struct_def, const Table *table,
 
 // Generate a text representation of a flatbuffer in JSON format.
 void GenerateText(const Parser &parser, const void *flatbuffer,
-                  const GeneratorOptions &opts, std::string *_text) {
+                  std::string *_text) {
   std::string &text = *_text;
   assert(parser.root_struct_def_);  // call SetRootType()
   text.reserve(1024);   // Reduce amount of inevitable reallocs.
   GenStruct(*parser.root_struct_def_,
             GetRoot<Table>(flatbuffer),
             0,
-            opts,
+            parser.opts,
             _text);
-  text += NewLine(opts);
+  text += NewLine(parser.opts);
 }
 
 std::string TextFileName(const std::string &path,
@@ -292,12 +292,10 @@ std::string TextFileName(const std::string &path,
 
 bool GenerateTextFile(const Parser &parser,
                       const std::string &path,
-                      const std::string &file_name,
-                      const GeneratorOptions &opts) {
+                      const std::string &file_name) {
   if (!parser.builder_.GetSize() || !parser.root_struct_def_) return true;
   std::string text;
-  GenerateText(parser, parser.builder_.GetBufferPointer(), opts,
-               &text);
+  GenerateText(parser, parser.builder_.GetBufferPointer(), &text);
   return flatbuffers::SaveFile(TextFileName(path, file_name).c_str(),
                                text,
                                false);
@@ -305,8 +303,7 @@ bool GenerateTextFile(const Parser &parser,
 
 std::string TextMakeRule(const Parser &parser,
                          const std::string &path,
-                         const std::string &file_name,
-                         const GeneratorOptions & /*opts*/) {
+                         const std::string &file_name) {
   if (!parser.builder_.GetSize() || !parser.root_struct_def_) return "";
   std::string filebase = flatbuffers::StripPath(
       flatbuffers::StripExtension(file_name));
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index f2b7fc9c4..663ccd1d2 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -589,10 +589,10 @@ uoffset_t Parser::ParseTable(const StructDef &struct_def, std::string *value) {
   Expect('{');
   size_t fieldn = 0;
   for (;;) {
-    if ((!strict_json_ || !fieldn) && IsNext('}')) break;
+    if ((!opts.strict_json || !fieldn) && IsNext('}')) break;
     std::string name = attribute_;
     if (!IsNext(kTokenStringConstant))
-      Expect(strict_json_ ? kTokenStringConstant : kTokenIdentifier);
+      Expect(opts.strict_json ? kTokenStringConstant : kTokenIdentifier);
     auto field = struct_def.fields.Lookup(name);
     if (!field) Error("unknown field: " + name);
     Expect(':');
@@ -685,7 +685,7 @@ uoffset_t Parser::ParseTable(const StructDef &struct_def, std::string *value) {
 uoffset_t Parser::ParseVector(const Type &type) {
   int count = 0;
   for (;;) {
-    if ((!strict_json_ || !count) && IsNext(']')) break;
+    if ((!opts.strict_json || !count) && IsNext(']')) break;
     Value val;
     val.type = type;
     ParseAnyValue(val, nullptr, 0);
@@ -903,7 +903,7 @@ EnumDef &Parser::ParseEnum(bool is_union) {
     enum_def.underlying_type.base_type = BASE_TYPE_UTYPE;
     enum_def.underlying_type.enum_def = &enum_def;
   } else {
-    if (proto_mode_) {
+    if (opts.proto_mode) {
       enum_def.underlying_type.base_type = BASE_TYPE_INT;
     } else {
       // Give specialized error message, since this type spec used to
@@ -922,7 +922,7 @@ EnumDef &Parser::ParseEnum(bool is_union) {
   Expect('{');
   if (is_union) enum_def.vals.Add("NONE", new EnumVal("NONE", 0));
   do {
-    if (proto_mode_ && attribute_ == "option") {
+    if (opts.proto_mode && attribute_ == "option") {
       ParseProtoOption();
     } else {
       auto value_name = attribute_;
@@ -944,17 +944,17 @@ EnumDef &Parser::ParseEnum(bool is_union) {
       if (IsNext('=')) {
         ev.value = atoi(attribute_.c_str());
         Expect(kTokenIntegerConstant);
-        if (!proto_mode_ && prevsize &&
+        if (!opts.proto_mode && prevsize &&
             enum_def.vals.vec[prevsize - 1]->value >= ev.value)
           Error("enum values must be specified in ascending order");
       }
-      if (proto_mode_ && IsNext('[')) {
+      if (opts.proto_mode && IsNext('[')) {
         // ignore attributes on enums.
         while (token_ != ']') Next();
         Next();
       }
     }
-  } while (IsNext(proto_mode_ ? ';' : ',') && token_ != '}');
+  } while (IsNext(opts.proto_mode ? ';' : ',') && token_ != '}');
   Expect('}');
   if (enum_def.attributes.Lookup("bit_flags")) {
     for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
@@ -1372,15 +1372,15 @@ bool Parser::Parse(const char *source, const char **include_paths,
     // Includes must come before type declarations:
     for (;;) {
       // Parse pre-include proto statements if any:
-      if (proto_mode_  &&
+      if (opts.proto_mode  &&
           (attribute_ == "option" || attribute_ == "syntax" ||
            attribute_ == "package")) {
           ParseProtoDecl();
       } else if (IsNext(kTokenInclude) ||
-                 (proto_mode_ &&
+                 (opts.proto_mode &&
                   attribute_ == "import" &&
                   IsNext(kTokenIdentifier))) {
-        if (proto_mode_ && attribute_ == "public") Next();
+        if (opts.proto_mode && attribute_ == "public") Next();
         auto name = attribute_;
         Expect(kTokenStringConstant);
         // Look for the file in include_paths.
@@ -1403,8 +1403,8 @@ bool Parser::Parse(const char *source, const char **include_paths,
             // Any errors, we're done.
             return false;
           }
-          // We do not want to output code for any included files:
-          MarkGenerated();
+          // We generally do not want to output code for any included files:
+          if (!opts.generate_all) MarkGenerated();
           // This is the easiest way to continue this file after an include:
           // instead of saving and restoring all the state, we simply start the
           // file anew. This will cause it to encounter the same include statement
@@ -1421,7 +1421,7 @@ bool Parser::Parse(const char *source, const char **include_paths,
     }
     // Now parse all other kinds of declarations:
     while (token_ != kTokenEof) {
-      if (proto_mode_) {
+      if (opts.proto_mode) {
         ParseProtoDecl();
       } else if (token_ == kTokenNameSpace) {
         ParseNamespace();
diff --git a/tests/test.cpp b/tests/test.cpp
index d25fa1358..be364d407 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -281,8 +281,7 @@ void ParseAndGenerateTextTest() {
   // to ensure it is correct, we now generate text back from the binary,
   // and compare the two:
   std::string jsongen;
-  flatbuffers::GeneratorOptions opts;
-  GenerateText(parser, parser.builder_.GetBufferPointer(), opts, &jsongen);
+  GenerateText(parser, parser.builder_.GetBufferPointer(), &jsongen);
 
   if (jsongen != jsonfile) {
     printf("%s----------------\n%s", jsongen.c_str(), jsonfile.c_str());
@@ -426,15 +425,17 @@ void ParseProtoTest() {
   TEST_EQ(flatbuffers::LoadFile(
     "tests/prototest/test.golden", false, &goldenfile), true);
 
+  flatbuffers::IDLOptions opts;
+  opts.include_dependence_headers = false;
+  opts.proto_mode = true;
+
   // Parse proto.
-  flatbuffers::Parser parser(false, true);
+  flatbuffers::Parser parser(opts);
   const char *include_directories[] = { "tests/prototest", nullptr };
   TEST_EQ(parser.Parse(protofile.c_str(), include_directories), true);
 
   // Generate fbs.
-  flatbuffers::GeneratorOptions opts;
-  opts.include_dependence_headers = false;
-  auto fbs = flatbuffers::GenerateFBS(parser, "test", opts);
+  auto fbs = flatbuffers::GenerateFBS(parser, "test");
 
   // Ensure generated file is parsable.
   flatbuffers::Parser parser2;
@@ -677,9 +678,8 @@ void FuzzTest2() {
   TEST_EQ(parser.Parse(json.c_str()), true);
 
   std::string jsongen;
-  flatbuffers::GeneratorOptions opts;
-  opts.indent_step = 0;
-  GenerateText(parser, parser.builder_.GetBufferPointer(), opts, &jsongen);
+  parser.opts.indent_step = 0;
+  GenerateText(parser, parser.builder_.GetBufferPointer(), &jsongen);
 
   if (jsongen != json) {
     // These strings are larger than a megabyte, so we show the bytes around
@@ -706,7 +706,9 @@ void FuzzTest2() {
 // Test that parser errors are actually generated.
 void TestError(const char *src, const char *error_substr,
                bool strict_json = false) {
-  flatbuffers::Parser parser(strict_json);
+  flatbuffers::IDLOptions opts;
+  opts.strict_json = strict_json;
+  flatbuffers::Parser parser(opts);
   TEST_EQ(parser.Parse(src), false);  // Must signal error
   // Must be the error we're expecting
   TEST_NOTNULL(strstr(parser.error_.c_str(), error_substr));
@@ -794,9 +796,8 @@ void UnicodeTest() {
                        "{ F:\"\\u20AC\\u00A2\\u30E6\\u30FC\\u30B6\\u30FC"
                        "\\u5225\\u30B5\\u30A4\\u30C8\\x01\\x80\" }"), true);
   std::string jsongen;
-  flatbuffers::GeneratorOptions opts;
-  opts.indent_step = -1;
-  GenerateText(parser, parser.builder_.GetBufferPointer(), opts, &jsongen);
+  parser.opts.indent_step = -1;
+  GenerateText(parser, parser.builder_.GetBufferPointer(), &jsongen);
   TEST_EQ(jsongen == "{F: \"\\u20AC\\u00A2\\u30E6\\u30FC\\u30B6\\u30FC"
                      "\\u5225\\u30B5\\u30A4\\u30C8\\x01\\x80\"}", true);
 }

From fe2f8d32aa7ffb23baf5989a208477189cc98f99 Mon Sep 17 00:00:00 2001
From: Jason Sanmiya <jsanmiya@google.com>
Date: Fri, 4 Dec 2015 07:09:16 -0800
Subject: [PATCH 014/185] Do not create empty enums.

Mac build issued a warning for enum{}.

Change-Id: I9cab958538ac3cec61aeae289d1da0118ecac15f
Tested: Mac build no longer issues warnings.
---
 src/idl_gen_cpp.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 8a440e853..facd7d286 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -260,17 +260,19 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
   code += " FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table";
   code += " {\n";
   // Generate field id constants.
-  code += "  enum {\n";
-  for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
-       ++it) {
-    auto &field = **it;
-    if (!field.deprecated) {  // Deprecated fields won't be accessible.
-      code += "    " + GenFieldOffsetName(field) + " = ";
-      code += NumToString(field.value.offset) + ",\n";
+  if (struct_def.fields.vec.size() > 0) {
+    code += "  enum {\n";
+    for (auto it = struct_def.fields.vec.begin();
+         it != struct_def.fields.vec.end();
+         ++it) {
+      auto &field = **it;
+      if (!field.deprecated) {  // Deprecated fields won't be accessible.
+        code += "    " + GenFieldOffsetName(field) + " = ";
+        code += NumToString(field.value.offset) + ",\n";
+      }
     }
+    code += "  };\n";
   }
-  code += "  };\n";
   // Generate the accessors.
   for (auto it = struct_def.fields.vec.begin();
        it != struct_def.fields.vec.end();

From e083e466b85c1ae512193cee74e0dbd60be5ab87 Mon Sep 17 00:00:00 2001
From: Michael Collins <michael.collins@neudesic.com>
Date: Sun, 4 Oct 2015 19:57:39 -0700
Subject: [PATCH 015/185] Add Get Bytes Method Generator for C#

I updated idl_gen_general.cpp to add support for generating a Get Bytes
method for a vector to the generated C# source code. Given a byte vector
field named Foo, a method named GetFooBytes() will be generated in the
C# source code that will return an ArraySegment<byte> value referencing
the vector data in the underlying ByteBuffer.

I added a method to Table.cs named __vector_as_arraysegment that is used
by the code generated by the change to the C# generator.
__vector_as_arraysegment will take the offset of the vector and will
return the ArraySegment<byte> value corresponding to the bytes that
store the vector data.

I updated FlatBuffersExampleTests.cs to add tests to validate my
implementation of Table.__vector_as_arraysegment. I added tests to
demonstrate that the bytes for the monster's name can be extracted from
the underlying byte array. I also added tests to show that
Table.__vector_as_arraysegment returns a null value if the vector is not
present in the FlatBuffer.

I used the updated flatc.exe program to regenerate the C# source files
for the MyGame example. The new Monster class includes the GetXXXBytes
methods to return the byte arrays containing data for vectors.
---
 net/FlatBuffers/Table.cs                      | 15 ++++++++
 src/idl_gen_general.cpp                       | 36 ++++++++++++-------
 tests/FlatBuffers.Test/Assert.cs              |  8 +++++
 .../FlatBuffersExampleTests.cs                | 13 +++++++
 tests/MyGame/Example/Monster.cs               |  5 +++
 tests/MyGame/Example/Stat.cs                  |  2 ++
 tests/MyGame/Example/Test.cs                  |  1 +
 .../MyGame/Example/TestSimpleTableWithEnum.cs |  1 +
 tests/MyGame/Example/Vec3.cs                  |  1 +
 9 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/net/FlatBuffers/Table.cs b/net/FlatBuffers/Table.cs
index 09b002850..bd5e36419 100644
--- a/net/FlatBuffers/Table.cs
+++ b/net/FlatBuffers/Table.cs
@@ -67,6 +67,21 @@ namespace FlatBuffers
             return offset + bb.GetInt(offset) + sizeof(int);  // data starts after the length
         }
 
+        // Get the data of a vector whoses offset is stored at "offset" in this object as an
+        // ArraySegment&lt;byte&gt;. If the vector is not present in the ByteBuffer,
+        // then a null value will be returned.
+        protected ArraySegment<byte>? __vector_as_arraysegment(int offset) {
+            var o = this.__offset(offset);
+            if (0 == o)
+            {
+                return null;
+            }
+
+            var pos = this.__vector(o);
+            var len = this.__vector_len(o);
+            return new ArraySegment<byte>(this.bb.Data, pos, len);
+        }
+
         // Initialize any Table-derived type to point to the union at the given offset.
         protected TTable __union<TTable>(TTable t, int offset) where TTable : Table
         {
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index 88aa4daee..15dd48204 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -145,7 +145,7 @@ LanguageParameters language_parameters[] = {
     "",
     "Position",
     "Offset",
-    "using FlatBuffers;\n\n",
+    "using System;\nusing FlatBuffers;\n\n",
     {
       nullptr,
       "///",
@@ -823,17 +823,29 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
       code += "}\n";
     }
     // Generate a ByteBuffer accessor for strings & vectors of scalars.
-    if (((field.value.type.base_type == BASE_TYPE_VECTOR &&
-          IsScalar(field.value.type.VectorType().base_type)) ||
-         field.value.type.base_type == BASE_TYPE_STRING) &&
-        lang.language == IDLOptions::kJava) {
-      code += "  public ByteBuffer ";
-      code += MakeCamel(field.name, lang.first_camel_upper);
-      code += "AsByteBuffer() { return __vector_as_bytebuffer(";
-      code += NumToString(field.value.offset) + ", ";
-      code += NumToString(field.value.type.base_type == BASE_TYPE_STRING ? 1 :
-                          InlineSize(field.value.type.VectorType()));
-      code += "); }\n";
+    if ((field.value.type.base_type == BASE_TYPE_VECTOR &&
+         IsScalar(field.value.type.VectorType().base_type)) ||
+         field.value.type.base_type == BASE_TYPE_STRING) {
+      switch (lang.language) {
+        case IDLOptions::kJava:
+          code += "  public ByteBuffer ";
+          code += MakeCamel(field.name, lang.first_camel_upper);
+          code += "AsByteBuffer() { return __vector_as_bytebuffer(";
+          code += NumToString(field.value.offset) + ", ";
+          code += NumToString(field.value.type.base_type == BASE_TYPE_STRING ? 1 :
+                              InlineSize(field.value.type.VectorType()));
+          code += "); }\n";
+          break;
+        case IDLOptions::kCSharp:
+          code += "  public ArraySegment<byte>? Get";
+          code += MakeCamel(field.name, lang.first_camel_upper);
+          code += "Bytes() { return __vector_as_arraysegment(";
+          code += NumToString(field.value.offset);
+          code += "); }\n";
+          break;
+        default:
+          break;
+      }
     }
 
     // generate mutators for scalar fields or vectors of scalars
diff --git a/tests/FlatBuffers.Test/Assert.cs b/tests/FlatBuffers.Test/Assert.cs
index 1bcf95f28..83344cf3b 100644
--- a/tests/FlatBuffers.Test/Assert.cs
+++ b/tests/FlatBuffers.Test/Assert.cs
@@ -107,6 +107,14 @@ namespace FlatBuffers.Test
             }
         }
 
+        public static void IsFalse(bool value)
+        {
+            if (value)
+            {
+                throw new AssertFailedException(false, value);
+            }
+        }
+
         public static void Throws<T>(Action action) where T : Exception
         {
             var caught = false;
diff --git a/tests/FlatBuffers.Test/FlatBuffersExampleTests.cs b/tests/FlatBuffers.Test/FlatBuffersExampleTests.cs
index 53d74c395..43754c77f 100644
--- a/tests/FlatBuffers.Test/FlatBuffersExampleTests.cs
+++ b/tests/FlatBuffers.Test/FlatBuffersExampleTests.cs
@@ -15,6 +15,7 @@
  */
 
 using System.IO;
+using System.Text;
 using MyGame.Example;
 
 namespace FlatBuffers.Test
@@ -184,6 +185,18 @@ namespace FlatBuffers.Test
             Assert.AreEqual("test2", monster.GetTestarrayofstring(1));
 
             Assert.AreEqual(false, monster.Testbool);
+
+            var nameBytes = monster.GetNameBytes().Value;
+            Assert.AreEqual("MyMonster", Encoding.UTF8.GetString(nameBytes.Array, nameBytes.Offset, nameBytes.Count));
+
+            if (0 == monster.TestarrayofboolsLength)
+            {
+                Assert.IsFalse(monster.GetTestarrayofboolsBytes().HasValue);
+            }
+            else
+            {
+                Assert.IsTrue(monster.GetTestarrayofboolsBytes().HasValue);
+            }
         }
 
         [FlatBuffersTestMethod]
diff --git a/tests/MyGame/Example/Monster.cs b/tests/MyGame/Example/Monster.cs
index c31bd7b56..b324a8d5c 100644
--- a/tests/MyGame/Example/Monster.cs
+++ b/tests/MyGame/Example/Monster.cs
@@ -3,6 +3,7 @@
 namespace MyGame.Example
 {
 
+using System;
 using FlatBuffers;
 
 /// an example documentation comment: monster object
@@ -19,8 +20,10 @@ public sealed class Monster : Table {
   public short Hp { get { int o = __offset(8); return o != 0 ? bb.GetShort(o + bb_pos) : (short)100; } }
   public bool MutateHp(short hp) { int o = __offset(8); if (o != 0) { bb.PutShort(o + bb_pos, hp); return true; } else { return false; } }
   public string Name { get { int o = __offset(10); return o != 0 ? __string(o + bb_pos) : null; } }
+  public ArraySegment<byte>? GetNameBytes() { return __vector_as_arraysegment(10); }
   public byte GetInventory(int j) { int o = __offset(14); return o != 0 ? bb.Get(__vector(o) + j * 1) : (byte)0; }
   public int InventoryLength { get { int o = __offset(14); return o != 0 ? __vector_len(o) : 0; } }
+  public ArraySegment<byte>? GetInventoryBytes() { return __vector_as_arraysegment(14); }
   public bool MutateInventory(int j, byte inventory) { int o = __offset(14); if (o != 0) { bb.Put(__vector(o) + j * 1, inventory); return true; } else { return false; } }
   public Color Color { get { int o = __offset(16); return o != 0 ? (Color)bb.GetSbyte(o + bb_pos) : Color.Blue; } }
   public bool MutateColor(Color color) { int o = __offset(16); if (o != 0) { bb.PutSbyte(o + bb_pos, (sbyte)color); return true; } else { return false; } }
@@ -41,6 +44,7 @@ public sealed class Monster : Table {
   public Monster GetEnemy(Monster obj) { int o = __offset(28); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
   public byte GetTestnestedflatbuffer(int j) { int o = __offset(30); return o != 0 ? bb.Get(__vector(o) + j * 1) : (byte)0; }
   public int TestnestedflatbufferLength { get { int o = __offset(30); return o != 0 ? __vector_len(o) : 0; } }
+  public ArraySegment<byte>? GetTestnestedflatbufferBytes() { return __vector_as_arraysegment(30); }
   public bool MutateTestnestedflatbuffer(int j, byte testnestedflatbuffer) { int o = __offset(30); if (o != 0) { bb.Put(__vector(o) + j * 1, testnestedflatbuffer); return true; } else { return false; } }
   public Stat Testempty { get { return GetTestempty(new Stat()); } }
   public Stat GetTestempty(Stat obj) { int o = __offset(32); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
@@ -64,6 +68,7 @@ public sealed class Monster : Table {
   public bool MutateTesthashu64Fnv1a(ulong testhashu64_fnv1a) { int o = __offset(50); if (o != 0) { bb.PutUlong(o + bb_pos, testhashu64_fnv1a); return true; } else { return false; } }
   public bool GetTestarrayofbools(int j) { int o = __offset(52); return o != 0 ? 0!=bb.Get(__vector(o) + j * 1) : false; }
   public int TestarrayofboolsLength { get { int o = __offset(52); return o != 0 ? __vector_len(o) : 0; } }
+  public ArraySegment<byte>? GetTestarrayofboolsBytes() { return __vector_as_arraysegment(52); }
   public bool MutateTestarrayofbools(int j, bool testarrayofbools) { int o = __offset(52); if (o != 0) { bb.Put(__vector(o) + j * 1, (byte)(testarrayofbools ? 1 : 0)); return true; } else { return false; } }
 
   public static void StartMonster(FlatBufferBuilder builder) { builder.StartObject(25); }
diff --git a/tests/MyGame/Example/Stat.cs b/tests/MyGame/Example/Stat.cs
index 22a2e009a..2b3f5375f 100644
--- a/tests/MyGame/Example/Stat.cs
+++ b/tests/MyGame/Example/Stat.cs
@@ -3,6 +3,7 @@
 namespace MyGame.Example
 {
 
+using System;
 using FlatBuffers;
 
 public sealed class Stat : Table {
@@ -11,6 +12,7 @@ public sealed class Stat : Table {
   public Stat __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
 
   public string Id { get { int o = __offset(4); return o != 0 ? __string(o + bb_pos) : null; } }
+  public ArraySegment<byte>? GetIdBytes() { return __vector_as_arraysegment(4); }
   public long Val { get { int o = __offset(6); return o != 0 ? bb.GetLong(o + bb_pos) : (long)0; } }
   public bool MutateVal(long val) { int o = __offset(6); if (o != 0) { bb.PutLong(o + bb_pos, val); return true; } else { return false; } }
   public ushort Count { get { int o = __offset(8); return o != 0 ? bb.GetUshort(o + bb_pos) : (ushort)0; } }
diff --git a/tests/MyGame/Example/Test.cs b/tests/MyGame/Example/Test.cs
index 182c26b7b..5bd2e58dd 100644
--- a/tests/MyGame/Example/Test.cs
+++ b/tests/MyGame/Example/Test.cs
@@ -3,6 +3,7 @@
 namespace MyGame.Example
 {
 
+using System;
 using FlatBuffers;
 
 public sealed class Test : Struct {
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.cs b/tests/MyGame/Example/TestSimpleTableWithEnum.cs
index f21441d18..daaa0b97a 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.cs
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.cs
@@ -3,6 +3,7 @@
 namespace MyGame.Example
 {
 
+using System;
 using FlatBuffers;
 
 public sealed class TestSimpleTableWithEnum : Table {
diff --git a/tests/MyGame/Example/Vec3.cs b/tests/MyGame/Example/Vec3.cs
index 56b9b4759..e5fa2f674 100644
--- a/tests/MyGame/Example/Vec3.cs
+++ b/tests/MyGame/Example/Vec3.cs
@@ -3,6 +3,7 @@
 namespace MyGame.Example
 {
 
+using System;
 using FlatBuffers;
 
 public sealed class Vec3 : Struct {

From c9ad6d54961b199d7667d116d23ede8bdc69dd5d Mon Sep 17 00:00:00 2001
From: Oli Wilkinson <oli@evolutional.co.uk>
Date: Sun, 29 Nov 2015 15:31:55 -0500
Subject: [PATCH 016/185] Fix to #360 - Updated the general generator (Java/C#)
 to emit fully qualified names where the referenced object isn't directly in
 this namespace. Added test fbs files to verify compilation.

---
 src/idl_gen_general.cpp                       | 207 ++++++++++--------
 .../FlatBuffers.Test/FlatBuffers.Test.csproj  |  12 +
 tests/JavaTest.bat                            |   4 +-
 tests/JavaTest.java                           |  17 ++
 tests/JavaTest.sh                             |   4 +-
 .../NamespaceA/NamespaceB/EnumInNestedNS.cs   |  14 ++
 .../NamespaceA/NamespaceB/EnumInNestedNS.go   |   9 +
 .../NamespaceA/NamespaceB/EnumInNestedNS.java |  15 ++
 .../NamespaceA/NamespaceB/EnumInNestedNS.php  |  25 +++
 .../NamespaceA/NamespaceB/StructInNestedNS.cs |  25 +++
 .../NamespaceA/NamespaceB/StructInNestedNS.go |  25 +++
 .../NamespaceB/StructInNestedNS.java          |  26 +++
 .../NamespaceB/StructInNestedNS.php           |  52 +++++
 .../NamespaceA/NamespaceB/TableInNestedNS.cs  |  32 +++
 .../NamespaceA/NamespaceB/TableInNestedNS.go  |  27 +++
 .../NamespaceB/TableInNestedNS.java           |  33 +++
 .../NamespaceA/NamespaceB/TableInNestedNS.php |  84 +++++++
 .../NamespaceA/TableInFirstNS.cs              |  31 +++
 .../NamespaceA/TableInFirstNS.go              |  55 +++++
 .../NamespaceA/TableInFirstNS.java            |  32 +++
 .../NamespaceA/TableInFirstNS.php             | 120 ++++++++++
 tests/namespace_test/namespace_test1.fbs      |  17 ++
 .../namespace_test1_generated.h               |  76 +++++++
 tests/namespace_test/namespace_test2.fbs      |  10 +
 .../namespace_test2_generated.h               |  63 ++++++
 25 files changed, 922 insertions(+), 93 deletions(-)
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php
 create mode 100644 tests/namespace_test/NamespaceA/TableInFirstNS.cs
 create mode 100644 tests/namespace_test/NamespaceA/TableInFirstNS.go
 create mode 100644 tests/namespace_test/NamespaceA/TableInFirstNS.java
 create mode 100644 tests/namespace_test/NamespaceA/TableInFirstNS.php
 create mode 100644 tests/namespace_test/namespace_test1.fbs
 create mode 100644 tests/namespace_test/namespace_test1_generated.h
 create mode 100644 tests/namespace_test/namespace_test2.fbs
 create mode 100644 tests/namespace_test/namespace_test2_generated.h

diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index 88aa4daee..936892fe7 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -198,7 +198,28 @@ static bool IsEnum(const Type& type) {
   return type.enum_def != nullptr && IsInteger(type.base_type);
 }
 
-static std::string GenTypeBasic(const LanguageParameters &lang,
+// Ensure that a type is prefixed with its namespace whenever it is used
+// outside of its namespace.
+static std::string WrapInNameSpace(const Parser &parser, const Namespace *ns,
+    const std::string &name) {
+        if (parser.namespaces_.back() != ns) {
+            std::string qualified_name;
+            for (auto it = ns->components.begin();
+                it != ns->components.end(); ++it) {
+                    qualified_name += *it + ".";
+            }
+            return qualified_name + name;
+        } else {
+            return name;
+        }
+}
+
+static std::string WrapInNameSpace(const Parser &parser,
+    const Definition &def) {
+        return WrapInNameSpace(parser, def.defined_namespace, def.name);
+}
+
+static std::string GenTypeBasic(const LanguageParameters &lang, const Parser &parser,
                                 const Type &type,
                                 bool enableLangOverrides) {
   static const char *gtypename[] = {
@@ -210,30 +231,33 @@ static std::string GenTypeBasic(const LanguageParameters &lang,
 
   if (enableLangOverrides) {
     if (lang.language == IDLOptions::kCSharp) {
-      if (IsEnum(type)) return type.enum_def->name;
-      if (type.base_type == BASE_TYPE_STRUCT) return "Offset<" + type.struct_def->name + ">";
+      if (IsEnum(type)) return WrapInNameSpace(parser, *type.enum_def);
+      if (type.base_type == BASE_TYPE_STRUCT) {
+          return "Offset<" + WrapInNameSpace(parser, *type.struct_def) + ">";
+      }
     }
   }
 
   return gtypename[type.base_type * IDLOptions::kMAX + lang.language];
 }
 
-static std::string GenTypeBasic(const LanguageParameters &lang, const Type &type) {
-  return GenTypeBasic(lang, type, true);
+static std::string GenTypeBasic(const LanguageParameters &lang, const Parser &parser,
+                                const Type &type) {
+  return GenTypeBasic(lang, parser, type, true);
 }
 
-static std::string GenTypeGet(const LanguageParameters &lang,
+static std::string GenTypeGet(const LanguageParameters &lang, const Parser &parser,
                               const Type &type);
 
-static std::string GenTypePointer(const LanguageParameters &lang,
+static std::string GenTypePointer(const LanguageParameters &lang, const Parser &parser,
                                   const Type &type) {
   switch (type.base_type) {
     case BASE_TYPE_STRING:
       return lang.string_type;
     case BASE_TYPE_VECTOR:
-      return GenTypeGet(lang, type.VectorType());
+      return GenTypeGet(lang, parser, type.VectorType());
     case BASE_TYPE_STRUCT:
-      return type.struct_def->name;
+      return WrapInNameSpace(parser, *type.struct_def);
     case BASE_TYPE_UNION:
       // Unions in C# use a generic Table-derived type for better type safety
       if (lang.language == IDLOptions::kCSharp) return "TTable";
@@ -243,16 +267,16 @@ static std::string GenTypePointer(const LanguageParameters &lang,
   }
 }
 
-static std::string GenTypeGet(const LanguageParameters &lang,
+static std::string GenTypeGet(const LanguageParameters &lang, const Parser &parser,
                               const Type &type) {
   return IsScalar(type.base_type)
-    ? GenTypeBasic(lang, type)
-    : GenTypePointer(lang, type);
+    ? GenTypeBasic(lang, parser, type)
+    : GenTypePointer(lang, parser, type);
 }
 
 // Find the destination type the user wants to receive the value in (e.g.
 // one size higher signed types for unsigned serialized values in Java).
-static Type DestinationType(const LanguageParameters &lang, const Type &type,
+static Type DestinationType(const LanguageParameters &lang, const Parser &parser, const Type &type,
                             bool vectorelem) {
   if (lang.language != IDLOptions::kJava) return type;
   switch (type.base_type) {
@@ -263,26 +287,27 @@ static Type DestinationType(const LanguageParameters &lang, const Type &type,
     case BASE_TYPE_UINT:   return Type(BASE_TYPE_LONG);
     case BASE_TYPE_VECTOR:
       if (vectorelem)
-        return DestinationType(lang, type.VectorType(), vectorelem);
+        return DestinationType(lang, parser, type.VectorType(), vectorelem);
       // else fall thru:
     default: return type;
   }
 }
 
-static std::string GenOffsetType(const LanguageParameters &lang, const StructDef &struct_def) {
+static std::string GenOffsetType(const LanguageParameters &lang, const Parser &parser, 
+                                 const StructDef &struct_def) {
   if(lang.language == IDLOptions::kCSharp) {
-    return "Offset<" + struct_def.name + ">";
+    return "Offset<" + WrapInNameSpace(parser, struct_def) + ">";
   } else {
     return "int";
   }
 }
 
-static std::string GenOffsetConstruct(const LanguageParameters &lang,
+static std::string GenOffsetConstruct(const LanguageParameters &lang, const Parser &parser,
                                       const StructDef &struct_def,
                                       const std::string &variable_name)
 {
   if(lang.language == IDLOptions::kCSharp) {
-    return "new Offset<" + struct_def.name + ">(" + variable_name + ")";
+    return "new Offset<" + WrapInNameSpace(parser, struct_def) + ">(" + variable_name + ")";
   }
   return variable_name;
 }
@@ -296,9 +321,9 @@ static std::string GenVectorOffsetType(const LanguageParameters &lang) {
 }
 
 // Generate destination type name
-static std::string GenTypeNameDest(const LanguageParameters &lang, const Type &type)
+static std::string GenTypeNameDest(const LanguageParameters &lang, const Parser &parser, const Type &type)
 {
-  return GenTypeGet(lang, DestinationType(lang, type, true));
+  return GenTypeGet(lang, parser, DestinationType(lang, parser, type, true));
 }
 
 // Mask to turn serialized value into destination type value.
@@ -318,10 +343,10 @@ static std::string DestinationMask(const LanguageParameters &lang,
 }
 
 // Casts necessary to correctly read serialized data
-static std::string DestinationCast(const LanguageParameters &lang,
+static std::string DestinationCast(const LanguageParameters &lang, const Parser &parser,
                                    const Type &type) {
   if (type.base_type == BASE_TYPE_VECTOR) {
-    return DestinationCast(lang, type.VectorType());
+    return DestinationCast(lang, parser, type.VectorType());
   } else {
     switch (lang.language) {
     case IDLOptions::kJava:
@@ -331,7 +356,7 @@ static std::string DestinationCast(const LanguageParameters &lang,
 
     case IDLOptions::kCSharp:
       // Cast from raw integral types to enum.
-      if (IsEnum(type)) return "(" + type.enum_def->name + ")";
+      if (IsEnum(type)) return "(" + WrapInNameSpace(parser, *type.enum_def) + ")";
       break;
 
     default:
@@ -345,11 +370,11 @@ static std::string DestinationCast(const LanguageParameters &lang,
 // In Java, parameters representing unsigned numbers need to be cast down to their respective type.
 // For example, a long holding an unsigned int value would be cast down to int before being put onto the buffer.
 // In C#, one cast directly cast an Enum to its underlying type, which is essential before putting it onto the buffer.
-static std::string SourceCast(const LanguageParameters &lang,
+static std::string SourceCast(const LanguageParameters &lang, const Parser &parser,
                               const Type &type,
                               bool castFromDest) {
   if (type.base_type == BASE_TYPE_VECTOR) {
-    return SourceCast(lang, type.VectorType(), castFromDest);
+    return SourceCast(lang, parser, type.VectorType(), castFromDest);
   } else {
     switch (lang.language) {
       case IDLOptions::kJava:
@@ -360,7 +385,7 @@ static std::string SourceCast(const LanguageParameters &lang,
         }
         break;
       case IDLOptions::kCSharp:
-        if (IsEnum(type)) return "(" + GenTypeBasic(lang, type, false) + ")";
+        if (IsEnum(type)) return "(" + GenTypeBasic(lang, parser, type, false) + ")";
         break;
       default:
         break;
@@ -369,24 +394,24 @@ static std::string SourceCast(const LanguageParameters &lang,
   return "";
 }
 
-static std::string SourceCast(const LanguageParameters &lang,
+static std::string SourceCast(const LanguageParameters &lang, const Parser &parser,
                               const Type &type) {
-  return SourceCast(lang, type, true);
+  return SourceCast(lang, parser, type, true);
 }
 
-static std::string SourceCastBasic(const LanguageParameters &lang,
+static std::string SourceCastBasic(const LanguageParameters &lang, const Parser &parser,
                                    const Type &type,
                                    bool castFromDest) {
-  return IsScalar(type.base_type) ? SourceCast(lang, type, castFromDest) : "";
+  return IsScalar(type.base_type) ? SourceCast(lang, parser, type, castFromDest) : "";
 }
 
-static std::string SourceCastBasic(const LanguageParameters &lang,
+static std::string SourceCastBasic(const LanguageParameters &lang, const Parser &parser,
                                    const Type &type) {
-  return SourceCastBasic(lang, type, true);
+  return SourceCastBasic(lang, parser, type, true);
 }
 
 
-static std::string GenEnumDefaultValue(const Value &value) {
+static std::string GenEnumDefaultValue(const Parser &parser, const Value &value) {
   auto enum_def = value.type.enum_def;
   auto vec = enum_def->vals.vec;
   auto default_value = StringToInt(value.constant.c_str());
@@ -395,7 +420,7 @@ static std::string GenEnumDefaultValue(const Value &value) {
   for (auto it = vec.begin(); it != vec.end(); ++it) {
     auto enum_val = **it;
     if (enum_val.value == default_value) {
-      result = enum_def->name + "." + enum_val.name;
+      result = WrapInNameSpace(parser, *enum_def) + "." + enum_val.name;
       break;
     }
   }
@@ -403,13 +428,14 @@ static std::string GenEnumDefaultValue(const Value &value) {
   return result;
 }
 
-static std::string GenDefaultValue(const LanguageParameters &lang, const Value &value, bool enableLangOverrides) {
+static std::string GenDefaultValue(const LanguageParameters &lang, const Parser &parser, 
+                                   const Value &value, bool enableLangOverrides) {
   if (enableLangOverrides) {
     // handles both enum case and vector of enum case
     if (lang.language == IDLOptions::kCSharp &&
         value.type.enum_def != nullptr &&
         value.type.base_type != BASE_TYPE_UNION) {
-      return GenEnumDefaultValue(value);
+      return GenEnumDefaultValue(parser, value);
     }
   }
   return value.type.base_type == BASE_TYPE_BOOL
@@ -417,11 +443,13 @@ static std::string GenDefaultValue(const LanguageParameters &lang, const Value &
            : value.constant;
 }
 
-static std::string GenDefaultValue(const LanguageParameters &lang, const Value &value) {
-  return GenDefaultValue(lang, value, true);
+static std::string GenDefaultValue(const LanguageParameters &lang, const Parser &parser,
+                                   const Value &value) {
+  return GenDefaultValue(lang, parser, value, true);
 }
 
-static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Value &value, bool enableLangOverrides) {
+static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Parser &parser, 
+                                        const Value &value, bool enableLangOverrides) {
   if (!IsScalar(value.type.base_type)) {
     if (enableLangOverrides) {
       if (lang.language == IDLOptions::kCSharp) {
@@ -429,7 +457,7 @@ static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Va
         case BASE_TYPE_STRING:
           return "default(StringOffset)";
         case BASE_TYPE_STRUCT:
-          return "default(Offset<" + value.type.struct_def->name + ">)";
+          return "default(Offset<" + WrapInNameSpace(parser, *value.type.struct_def) + ">)";
         case BASE_TYPE_VECTOR:
           return "default(VectorOffset)";
         default:
@@ -439,14 +467,15 @@ static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Va
     }
     return "0";
   }
-  return GenDefaultValue(lang, value, enableLangOverrides);
+  return GenDefaultValue(lang, parser, value, enableLangOverrides);
 }
 
-static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Value &value) {
-  return GenDefaultValueBasic(lang, value, true);
+static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Parser &parser, 
+                                        const Value &value) {
+  return GenDefaultValueBasic(lang, parser, value, true);
 }
 
-static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def,
+static void GenEnum(const LanguageParameters &lang, const Parser &parser, EnumDef &enum_def,
                     std::string *code_ptr) {
   std::string &code = *code_ptr;
   if (enum_def.generated) return;
@@ -459,7 +488,7 @@ static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def,
   GenComment(enum_def.doc_comment, code_ptr, &lang.comment_config);
   code += std::string("public ") + lang.enum_decl + enum_def.name;
   if (lang.language == IDLOptions::kCSharp) {
-    code += lang.inheritance_marker + GenTypeBasic(lang, enum_def.underlying_type, false);
+    code += lang.inheritance_marker + GenTypeBasic(lang, parser, enum_def.underlying_type, false);
   }
   code += lang.open_curly;
   if (lang.language == IDLOptions::kJava) {
@@ -473,7 +502,7 @@ static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def,
     if (lang.language != IDLOptions::kCSharp) {
       code += "  public static";
       code += lang.const_decl;
-      code += GenTypeBasic(lang, enum_def.underlying_type, false);
+      code += GenTypeBasic(lang, parser, enum_def.underlying_type, false);
     }
     code += " " + ev.name + " = ";
     code += NumToString(ev.value);
@@ -519,19 +548,19 @@ static void GenEnum(const LanguageParameters &lang, EnumDef &enum_def,
 }
 
 // Returns the function name that is able to read a value of the given type.
-static std::string GenGetter(const LanguageParameters &lang,
+static std::string GenGetter(const LanguageParameters &lang, const Parser &parser,
                              const Type &type) {
   switch (type.base_type) {
     case BASE_TYPE_STRING: return "__string";
     case BASE_TYPE_STRUCT: return "__struct";
     case BASE_TYPE_UNION:  return "__union";
-    case BASE_TYPE_VECTOR: return GenGetter(lang, type.VectorType());
+    case BASE_TYPE_VECTOR: return GenGetter(lang, parser, type.VectorType());
     default: {
       std::string getter = "bb." + FunctionStart(lang, 'G') + "et";
       if (type.base_type == BASE_TYPE_BOOL) {
         getter = "0!=" + getter;
-      } else if (GenTypeBasic(lang, type, false) != "byte") {
-        getter += MakeCamel(GenTypeBasic(lang, type, false));
+      } else if (GenTypeBasic(lang, parser, type, false) != "byte") {
+        getter += MakeCamel(GenTypeBasic(lang, parser, type, false));
       }
       return getter;
     }
@@ -540,13 +569,13 @@ static std::string GenGetter(const LanguageParameters &lang,
 
 // Direct mutation is only allowed for scalar fields.
 // Hence a setter method will only be generated for such fields.
-static std::string GenSetter(const LanguageParameters &lang,
+static std::string GenSetter(const LanguageParameters &lang, const Parser &parser,
                              const Type &type) {
   if (IsScalar(type.base_type)) {
     std::string setter = "bb." + FunctionStart(lang, 'P') + "ut";
-    if (GenTypeBasic(lang, type, false) != "byte" &&
+    if (GenTypeBasic(lang, parser, type, false) != "byte" && 
         type.base_type != BASE_TYPE_BOOL) {
-      setter += MakeCamel(GenTypeBasic(lang, type, false));
+      setter += MakeCamel(GenTypeBasic(lang, parser, type, false));
     }
     return setter;
   } else {
@@ -555,15 +584,15 @@ static std::string GenSetter(const LanguageParameters &lang,
 }
 
 // Returns the method name for use with add/put calls.
-static std::string GenMethod(const LanguageParameters &lang, const Type &type) {
+static std::string GenMethod(const LanguageParameters &lang, const Parser &parser, const Type &type) {
   return IsScalar(type.base_type)
-    ? MakeCamel(GenTypeBasic(lang, type, false))
+    ? MakeCamel(GenTypeBasic(lang, parser, type, false))
     : (IsStruct(type) ? "Struct" : "Offset");
 }
 
 // Recursively generate arguments for a constructor, to deal with nested
 // structs.
-static void GenStructArgs(const LanguageParameters &lang,
+static void GenStructArgs(const LanguageParameters &lang, const Parser &parser,
                           const StructDef &struct_def,
                           std::string *code_ptr, const char *nameprefix) {
   std::string &code = *code_ptr;
@@ -575,11 +604,11 @@ static void GenStructArgs(const LanguageParameters &lang,
       // Generate arguments for a struct inside a struct. To ensure names
       // don't clash, and to make it obvious these arguments are constructing
       // a nested struct, prefix the name with the field name.
-      GenStructArgs(lang, *field.value.type.struct_def, code_ptr,
+      GenStructArgs(lang, parser, *field.value.type.struct_def, code_ptr,
                     (nameprefix + (field.name + "_")).c_str());
     } else {
       code += ", ";
-      code += GenTypeBasic(lang, DestinationType(lang,field.value.type, false));
+      code += GenTypeBasic(lang, parser, DestinationType(lang, parser, field.value.type, false));
       code += " ";
       code += nameprefix;
       code += MakeCamel(field.name, lang.first_camel_upper);
@@ -590,7 +619,7 @@ static void GenStructArgs(const LanguageParameters &lang,
 // Recusively generate struct construction statements of the form:
 // builder.putType(name);
 // and insert manual padding.
-static void GenStructBody(const LanguageParameters &lang,
+static void GenStructBody(const LanguageParameters &lang, const Parser &parser,
                           const StructDef &struct_def,
                           std::string *code_ptr, const char *nameprefix) {
   std::string &code = *code_ptr;
@@ -605,12 +634,12 @@ static void GenStructBody(const LanguageParameters &lang,
       code += NumToString(field.padding) + ");\n";
     }
     if (IsStruct(field.value.type)) {
-      GenStructBody(lang, *field.value.type.struct_def, code_ptr,
+      GenStructBody(lang, parser, *field.value.type.struct_def, code_ptr,
                     (nameprefix + (field.name + "_")).c_str());
     } else {
       code += "    builder." + FunctionStart(lang, 'P') + "ut";
-      code += GenMethod(lang, field.value.type) + "(";
-      code += SourceCast(lang, field.value.type);
+      code += GenMethod(lang, parser, field.value.type) + "(";
+      code += SourceCast(lang, parser, field.value.type);
       auto argname = nameprefix + MakeCamel(field.name, lang.first_camel_upper);
       code += argname;
       code += ");\n";
@@ -675,11 +704,11 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
     auto &field = **it;
     if (field.deprecated) continue;
     GenComment(field.doc_comment, code_ptr, &lang.comment_config, "  ");
-    std::string type_name = GenTypeGet(lang, field.value.type);
-    std::string type_name_dest = GenTypeNameDest(lang, field.value.type);
+    std::string type_name = GenTypeGet(lang, parser, field.value.type);
+    std::string type_name_dest = GenTypeNameDest(lang, parser, field.value.type);
     std::string dest_mask = DestinationMask(lang, field.value.type, true);
-    std::string dest_cast = DestinationCast(lang, field.value.type);
-    std::string src_cast = SourceCast(lang, field.value.type);
+    std::string dest_cast = DestinationCast(lang, parser, field.value.type);
+    std::string src_cast = SourceCast(lang, parser, field.value.type);
     std::string method_start = "  public " + type_name_dest + " " +
                                MakeCamel(field.name, lang.first_camel_upper);
 
@@ -729,7 +758,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
         type_name = type_name_dest;
       }
     }
-    std::string getter = dest_cast + GenGetter(lang, field.value.type);
+    std::string getter = dest_cast + GenGetter(lang, parser, field.value.type);
     code += method_start;
     std::string default_cast = "";
     // only create default casts for c# scalars or vectors of scalars
@@ -754,7 +783,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
       } else {
         code += offset_prefix + getter;
         code += "(o + bb_pos)" + dest_mask + " : " + default_cast;
-        code += GenDefaultValue(lang, field.value);
+        code += GenDefaultValue(lang, parser, field.value);
       }
     } else {
       switch (field.value.type.base_type) {
@@ -846,7 +875,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
       auto mutator_prefix = MakeCamel("mutate", lang.first_camel_upper);
       //a vector mutator also needs the index of the vector element it should mutate
       auto mutator_params = (field.value.type.base_type == BASE_TYPE_VECTOR ? "(int j, " : "(") +
-                            GenTypeNameDest(lang, underlying_type) + " " +
+                            GenTypeNameDest(lang, parser, underlying_type) + " " +
                             field.name + ") { ";
       auto setter_index = field.value.type.base_type == BASE_TYPE_VECTOR
                     ? "__vector(o) + j * " + NumToString(InlineSize(underlying_type))
@@ -859,11 +888,11 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
         code += mutator_prefix + MakeCamel(field.name, true);
         code += mutator_params;
         if (struct_def.fixed) {
-          code += GenSetter(lang, underlying_type) + "(" + setter_index + ", ";
+          code += GenSetter(lang, parser, underlying_type) + "(" + setter_index + ", ";
           code += src_cast + setter_parameter + "); }\n";
         } else {
           code += "int o = __offset(" + NumToString(field.value.offset) + ");";
-          code += " if (o != 0) { " + GenSetter(lang, underlying_type);
+          code += " if (o != 0) { " + GenSetter(lang, parser, underlying_type);
           code += "(" + setter_index + ", " + src_cast + setter_parameter + "); return true; } else { return false; } }\n";
         }
       }
@@ -872,14 +901,14 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
   code += "\n";
   if (struct_def.fixed) {
     // create a struct constructor function
-    code += "  public static " + GenOffsetType(lang, struct_def) + " ";
+    code += "  public static " + GenOffsetType(lang, parser, struct_def) + " ";
     code += FunctionStart(lang, 'C') + "reate";
     code += struct_def.name + "(FlatBufferBuilder builder";
-    GenStructArgs(lang, struct_def, code_ptr, "");
+    GenStructArgs(lang, parser, struct_def, code_ptr, "");
     code += ") {\n";
-    GenStructBody(lang, struct_def, code_ptr, "");
+    GenStructBody(lang, parser, struct_def, code_ptr, "");
     code += "    return ";
-    code += GenOffsetConstruct(lang, struct_def, "builder." + std::string(lang.get_fbb_offset));
+    code += GenOffsetConstruct(lang, parser, struct_def, "builder." + std::string(lang.get_fbb_offset));
     code += ";\n  }\n";
   } else {
     // Generate a method that creates a table in one go. This is only possible
@@ -900,7 +929,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
     if (has_no_struct_fields && num_fields) {
       // Generate a table constructor of the form:
       // public static int createName(FlatBufferBuilder builder, args...)
-      code += "  public static " + GenOffsetType(lang, struct_def) + " ";
+      code += "  public static " + GenOffsetType(lang, parser, struct_def) + " ";
       code += FunctionStart(lang, 'C') + "reate" + struct_def.name;
       code += "(FlatBufferBuilder builder";
       for (auto it = struct_def.fields.vec.begin();
@@ -908,7 +937,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
         auto &field = **it;
         if (field.deprecated) continue;
         code += ",\n      ";
-        code += GenTypeBasic(lang, DestinationType(lang, field.value.type, false));
+        code += GenTypeBasic(lang, parser, DestinationType(lang, parser, field.value.type, false));
         code += " ";
         code += field.name;
         if (!IsScalar(field.value.type.base_type)) code += "Offset";
@@ -917,7 +946,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
         // supply all arguments, and thus won't compile when fields are added.
         if (lang.language != IDLOptions::kJava) {
           code += " = ";
-          code += GenDefaultValueBasic(lang, field.value);
+          code += GenDefaultValueBasic(lang, parser, field.value);
         }
       }
       code += ") {\n    builder.";
@@ -961,18 +990,18 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
       code += "  public static void " + FunctionStart(lang, 'A') + "dd";
       code += MakeCamel(field.name);
       code += "(FlatBufferBuilder builder, ";
-      code += GenTypeBasic(lang, DestinationType(lang, field.value.type, false));
+      code += GenTypeBasic(lang, parser, DestinationType(lang, parser, field.value.type, false));
       auto argname = MakeCamel(field.name, false);
       if (!IsScalar(field.value.type.base_type)) argname += "Offset";
       code += " " + argname + ") { builder." + FunctionStart(lang, 'A') + "dd";
-      code += GenMethod(lang, field.value.type) + "(";
+      code += GenMethod(lang, parser, field.value.type) + "(";
       code += NumToString(it - struct_def.fields.vec.begin()) + ", ";
-      code += SourceCastBasic(lang, field.value.type);
+      code += SourceCastBasic(lang, parser, field.value.type);
       code += argname;
       if(!IsScalar(field.value.type.base_type) && field.value.type.base_type != BASE_TYPE_UNION && lang.language == IDLOptions::kCSharp) {
         code += ".Value";
       }
-      code += ", " + GenDefaultValue(lang, field.value, false);
+      code += ", " + GenDefaultValue(lang, parser, field.value, false);
       code += "); }\n";
       if (field.value.type.base_type == BASE_TYPE_VECTOR) {
         auto vector_type = field.value.type.VectorType();
@@ -983,7 +1012,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
           code += "  public static " + GenVectorOffsetType(lang) + " " + FunctionStart(lang, 'C') + "reate";
           code += MakeCamel(field.name);
           code += "Vector(FlatBufferBuilder builder, ";
-          code += GenTypeBasic(lang, vector_type) + "[] data) ";
+          code += GenTypeBasic(lang, parser, vector_type) + "[] data) ";
           code += "{ builder." + FunctionStart(lang, 'S') + "tartVector(";
           code += NumToString(elem_size);
           code += ", data." + FunctionStart(lang, 'L') + "ength, ";
@@ -991,9 +1020,9 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
           code += "); for (int i = data.";
           code += FunctionStart(lang, 'L') + "ength - 1; i >= 0; i--) builder.";
           code += FunctionStart(lang, 'A') + "dd";
-          code += GenMethod(lang, vector_type);
+          code += GenMethod(lang, parser, vector_type);
           code += "(";
-          code += SourceCastBasic(lang, vector_type, false);
+          code += SourceCastBasic(lang, parser, vector_type, false);
           code += "data[i]";
           if (lang.language == IDLOptions::kCSharp &&
             (vector_type.base_type == BASE_TYPE_STRUCT || vector_type.base_type == BASE_TYPE_STRING))
@@ -1011,7 +1040,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
         code += "); }\n";
       }
     }
-    code += "  public static " + GenOffsetType(lang, struct_def) + " ";
+    code += "  public static " + GenOffsetType(lang, parser, struct_def) + " ";
     code += FunctionStart(lang, 'E') + "nd" + struct_def.name;
     code += "(FlatBufferBuilder builder) {\n    int o = builder.";
     code += FunctionStart(lang, 'E') + "ndObject();\n";
@@ -1025,11 +1054,11 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
         code += ");  // " + field.name + "\n";
       }
     }
-    code += "    return " + GenOffsetConstruct(lang, struct_def, "o") + ";\n  }\n";
+    code += "    return " + GenOffsetConstruct(lang, parser, struct_def, "o") + ";\n  }\n";
     if (parser.root_struct_def_ == &struct_def) {
       code += "  public static void ";
       code += FunctionStart(lang, 'F') + "inish" + struct_def.name;
-      code += "Buffer(FlatBufferBuilder builder, " + GenOffsetType(lang, struct_def) + " offset) {";
+      code += "Buffer(FlatBufferBuilder builder, " + GenOffsetType(lang, parser, struct_def) + " offset) {";
       code += " builder." + FunctionStart(lang, 'F') + "inish(offset";
       if (lang.language == IDLOptions::kCSharp) {
         code += ".Value";
@@ -1088,7 +1117,7 @@ bool GenerateGeneral(const Parser &parser,
   for (auto it = parser.enums_.vec.begin();
        it != parser.enums_.vec.end(); ++it) {
     std::string enumcode;
-    GenEnum(lang, **it, &enumcode);
+    GenEnum(lang, parser, **it, &enumcode);
     if (parser.opts.one_file) {
       one_file_code += enumcode;
     }
diff --git a/tests/FlatBuffers.Test/FlatBuffers.Test.csproj b/tests/FlatBuffers.Test/FlatBuffers.Test.csproj
index c292a9c9c..13b1faaee 100644
--- a/tests/FlatBuffers.Test/FlatBuffers.Test.csproj
+++ b/tests/FlatBuffers.Test/FlatBuffers.Test.csproj
@@ -77,6 +77,18 @@
     <Compile Include="..\MyGame\Example\Vec3.cs">
       <Link>MyGame\Example\Vec3.cs</Link>
     </Compile>
+    <Compile Include="..\namespace_test\NamespaceA\NamespaceB\EnumInNestedNS.cs">
+      <Link>NamespaceA\NamespaceB\EnumInNestedNS.cs</Link>
+    </Compile>
+    <Compile Include="..\namespace_test\NamespaceA\NamespaceB\StructInNestedNS.cs">
+      <Link>NamespaceA\NamespaceB\StructInNestedNS.cs</Link>
+    </Compile>
+    <Compile Include="..\namespace_test\NamespaceA\NamespaceB\TableInNestedNS.cs">
+      <Link>NamespaceA\NamespaceB\TableInNestedNS.cs</Link>
+    </Compile>
+    <Compile Include="..\namespace_test\NamespaceA\TableInFirstNS.cs">
+      <Link>NamespaceA\TableInFirstNS.cs</Link>
+    </Compile>
     <Compile Include="Assert.cs" />
     <Compile Include="ByteBufferTests.cs" />
     <Compile Include="FlatBuffersFuzzTests.cs" />
diff --git a/tests/JavaTest.bat b/tests/JavaTest.bat
index 9ee9c4bd6..aa7261300 100755
--- a/tests/JavaTest.bat
+++ b/tests/JavaTest.bat
@@ -17,5 +17,5 @@ rem Compile then run the Java test.
 
 set batch_file_dir=%~d0%~p0
 
-javac -g -classpath %batch_file_dir%\..\java;%batch_file_dir% JavaTest.java
-java -classpath %batch_file_dir%\..\java;%batch_file_dir% JavaTest
+javac -g -classpath %batch_file_dir%\..\java;%batch_file_dir%;%batch_file_dir%\namespace_test JavaTest.java
+java -classpath %batch_file_dir%\..\java;%batch_file_dir%;%batch_file_dir%\namespace_test JavaTest
diff --git a/tests/JavaTest.java b/tests/JavaTest.java
index e01701699..0bc0dbadb 100755
--- a/tests/JavaTest.java
+++ b/tests/JavaTest.java
@@ -17,6 +17,8 @@
 import java.io.*;
 import java.nio.ByteBuffer;
 import MyGame.Example.*;
+import NamespaceA.*;
+import NamespaceA.NamespaceB.*;
 import com.google.flatbuffers.FlatBufferBuilder;
 
 class JavaTest {
@@ -155,6 +157,8 @@ class JavaTest {
 
         TestExtendedBuffer(fbb.dataBuffer().asReadOnlyBuffer());
 
+        TestNamespaceNesting();
+
         System.out.println("FlatBuffers test: completed successfully");
     }
 
@@ -225,6 +229,19 @@ class JavaTest {
 
         TestEq(monster.testhashu32Fnv1(), Integer.MAX_VALUE + 1L);
     }
+    
+    static void TestNamespaceNesting() {
+        // reference / manipulate these to verify compilation
+        FlatBufferBuilder fbb = new FlatBufferBuilder(1);
+        
+        TableInNestedNS.startTableInNestedNS(fbb);
+        TableInNestedNS.addFoo(fbb, 1234);
+        int nestedTableOff = TableInNestedNS.endTableInNestedNS(fbb);
+        
+        TableInFirstNS.startTableInFirstNS(fbb);      
+        TableInFirstNS.addFooTable(fbb, nestedTableOff);
+        int off = TableInFirstNS.endTableInFirstNS(fbb);
+    }
 
     static <T> void TestEq(T a, T b) {
         if (!a.equals(b)) {
diff --git a/tests/JavaTest.sh b/tests/JavaTest.sh
index 1a93aec62..7dd7ea98e 100755
--- a/tests/JavaTest.sh
+++ b/tests/JavaTest.sh
@@ -25,5 +25,5 @@ if [[ "$testdir" != "$thisdir" ]]; then
 	exit 1
 fi
 
-javac -classpath ${testdir}/../java:${testdir} JavaTest.java
-java -classpath ${testdir}/../java:${testdir} JavaTest
+javac -classpath ${testdir}/../java:${testdir}:${testdir}/namespace_test JavaTest.java
+java -classpath ${testdir}/../java:${testdir}:${testdir}/namespace_test JavaTest
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs
new file mode 100644
index 000000000..e57e1dc7c
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs
@@ -0,0 +1,14 @@
+// automatically generated, do not modify
+
+namespace NamespaceA.NamespaceB
+{
+
+public enum EnumInNestedNS : sbyte
+{
+ A = 0,
+ B = 1,
+ C = 2,
+};
+
+
+}
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
new file mode 100644
index 000000000..4de2d0e3e
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
@@ -0,0 +1,9 @@
+// automatically generated, do not modify
+
+package NamespaceB
+
+const (
+	EnumInNestedNSA = 0
+	EnumInNestedNSB = 1
+	EnumInNestedNSC = 2
+)
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java
new file mode 100644
index 000000000..a919ace6c
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java
@@ -0,0 +1,15 @@
+// automatically generated, do not modify
+
+package NamespaceA.NamespaceB;
+
+public final class EnumInNestedNS {
+  private EnumInNestedNS() { }
+  public static final byte A = 0;
+  public static final byte B = 1;
+  public static final byte C = 2;
+
+  private static final String[] names = { "A", "B", "C", };
+
+  public static String name(int e) { return names[e]; }
+};
+
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php
new file mode 100644
index 000000000..a39c0d731
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php
@@ -0,0 +1,25 @@
+<?php
+// automatically generated, do not modify
+
+namespace NamespaceA\NamespaceB;
+
+class EnumInNestedNS
+{
+    const A = 0;
+    const B = 1;
+    const C = 2;
+
+    private static $names = array(
+        "A",
+        "B",
+        "C",
+    );
+
+    public static function Name($e)
+    {
+        if (!isset(self::$names[$e])) {
+            throw new \Exception();
+        }
+        return self::$names[$e];
+    }
+}
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
new file mode 100644
index 000000000..9eb853c74
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
@@ -0,0 +1,25 @@
+// automatically generated, do not modify
+
+namespace NamespaceA.NamespaceB
+{
+
+using FlatBuffers;
+
+public sealed class StructInNestedNS : Struct {
+  public StructInNestedNS __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+  public int A { get { return bb.GetInt(bb_pos + 0); } }
+  public void MutateA(int a) { bb.PutInt(bb_pos + 0, a); }
+  public int B { get { return bb.GetInt(bb_pos + 4); } }
+  public void MutateB(int b) { bb.PutInt(bb_pos + 4, b); }
+
+  public static Offset<StructInNestedNS> CreateStructInNestedNS(FlatBufferBuilder builder, int A, int B) {
+    builder.Prep(4, 8);
+    builder.PutInt(B);
+    builder.PutInt(A);
+    return new Offset<StructInNestedNS>(builder.Offset);
+  }
+};
+
+
+}
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
new file mode 100644
index 000000000..66943e3cd
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
@@ -0,0 +1,25 @@
+// automatically generated, do not modify
+
+package NamespaceB
+
+import (
+	flatbuffers "github.com/google/flatbuffers/go"
+)
+type StructInNestedNS struct {
+	_tab flatbuffers.Struct
+}
+
+func (rcv *StructInNestedNS) Init(buf []byte, i flatbuffers.UOffsetT) {
+	rcv._tab.Bytes = buf
+	rcv._tab.Pos = i
+}
+
+func (rcv *StructInNestedNS) A() int32 { return rcv._tab.GetInt32(rcv._tab.Pos + flatbuffers.UOffsetT(0)) }
+func (rcv *StructInNestedNS) B() int32 { return rcv._tab.GetInt32(rcv._tab.Pos + flatbuffers.UOffsetT(4)) }
+
+func CreateStructInNestedNS(builder *flatbuffers.Builder, a int32, b int32) flatbuffers.UOffsetT {
+    builder.Prep(4, 8)
+    builder.PrependInt32(b)
+    builder.PrependInt32(a)
+    return builder.Offset()
+}
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java
new file mode 100644
index 000000000..dfbe23e8d
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java
@@ -0,0 +1,26 @@
+// automatically generated, do not modify
+
+package NamespaceA.NamespaceB;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class StructInNestedNS extends Struct {
+  public StructInNestedNS __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+  public int a() { return bb.getInt(bb_pos + 0); }
+  public void mutateA(int a) { bb.putInt(bb_pos + 0, a); }
+  public int b() { return bb.getInt(bb_pos + 4); }
+  public void mutateB(int b) { bb.putInt(bb_pos + 4, b); }
+
+  public static int createStructInNestedNS(FlatBufferBuilder builder, int a, int b) {
+    builder.prep(4, 8);
+    builder.putInt(b);
+    builder.putInt(a);
+    return builder.offset();
+  }
+};
+
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php
new file mode 100644
index 000000000..962ea2c6a
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php
@@ -0,0 +1,52 @@
+<?php
+// automatically generated, do not modify
+
+namespace NamespaceA\NamespaceB;
+
+use \Google\FlatBuffers\Struct;
+use \Google\FlatBuffers\Table;
+use \Google\FlatBuffers\ByteBuffer;
+use \Google\FlatBuffers\FlatBufferBuilder;
+
+class StructInNestedNS extends Struct
+{
+    /**
+     * @param int $_i offset
+     * @param ByteBuffer $_bb
+     * @return StructInNestedNS
+     **/
+    public function init($_i, ByteBuffer $_bb)
+    {
+        $this->bb_pos = $_i;
+        $this->bb = $_bb;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function GetA()
+    {
+        return $this->bb->getInt($this->bb_pos + 0);
+    }
+
+    /**
+     * @return int
+     */
+    public function GetB()
+    {
+        return $this->bb->getInt($this->bb_pos + 4);
+    }
+
+
+    /**
+     * @return int offset
+     */
+    public static function createStructInNestedNS(FlatBufferBuilder $builder, $a, $b)
+    {
+        $builder->prep(4, 8);
+        $builder->putInt($b);
+        $builder->putInt($a);
+        return $builder->offset();
+    }
+}
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
new file mode 100644
index 000000000..e04bc7cb2
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
@@ -0,0 +1,32 @@
+// automatically generated, do not modify
+
+namespace NamespaceA.NamespaceB
+{
+
+using FlatBuffers;
+
+public sealed class TableInNestedNS : Table {
+  public static TableInNestedNS GetRootAsTableInNestedNS(ByteBuffer _bb) { return GetRootAsTableInNestedNS(_bb, new TableInNestedNS()); }
+  public static TableInNestedNS GetRootAsTableInNestedNS(ByteBuffer _bb, TableInNestedNS obj) { return (obj.__init(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
+  public TableInNestedNS __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+  public int Foo { get { int o = __offset(4); return o != 0 ? bb.GetInt(o + bb_pos) : (int)0; } }
+  public bool MutateFoo(int foo) { int o = __offset(4); if (o != 0) { bb.PutInt(o + bb_pos, foo); return true; } else { return false; } }
+
+  public static Offset<TableInNestedNS> CreateTableInNestedNS(FlatBufferBuilder builder,
+      int foo = 0) {
+    builder.StartObject(1);
+    TableInNestedNS.AddFoo(builder, foo);
+    return TableInNestedNS.EndTableInNestedNS(builder);
+  }
+
+  public static void StartTableInNestedNS(FlatBufferBuilder builder) { builder.StartObject(1); }
+  public static void AddFoo(FlatBufferBuilder builder, int foo) { builder.AddInt(0, foo, 0); }
+  public static Offset<TableInNestedNS> EndTableInNestedNS(FlatBufferBuilder builder) {
+    int o = builder.EndObject();
+    return new Offset<TableInNestedNS>(o);
+  }
+};
+
+
+}
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
new file mode 100644
index 000000000..09815c454
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
@@ -0,0 +1,27 @@
+// automatically generated, do not modify
+
+package NamespaceB
+
+import (
+	flatbuffers "github.com/google/flatbuffers/go"
+)
+type TableInNestedNS struct {
+	_tab flatbuffers.Table
+}
+
+func (rcv *TableInNestedNS) Init(buf []byte, i flatbuffers.UOffsetT) {
+	rcv._tab.Bytes = buf
+	rcv._tab.Pos = i
+}
+
+func (rcv *TableInNestedNS) Foo() int32 {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
+	if o != 0 {
+		return rcv._tab.GetInt32(o + rcv._tab.Pos)
+	}
+	return 0
+}
+
+func TableInNestedNSStart(builder *flatbuffers.Builder) { builder.StartObject(1) }
+func TableInNestedNSAddFoo(builder *flatbuffers.Builder, foo int32) { builder.PrependInt32Slot(0, foo, 0) }
+func TableInNestedNSEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT { return builder.EndObject() }
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java
new file mode 100644
index 000000000..344005d5f
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java
@@ -0,0 +1,33 @@
+// automatically generated, do not modify
+
+package NamespaceA.NamespaceB;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class TableInNestedNS extends Table {
+  public static TableInNestedNS getRootAsTableInNestedNS(ByteBuffer _bb) { return getRootAsTableInNestedNS(_bb, new TableInNestedNS()); }
+  public static TableInNestedNS getRootAsTableInNestedNS(ByteBuffer _bb, TableInNestedNS obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__init(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public TableInNestedNS __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+  public int foo() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
+  public boolean mutateFoo(int foo) { int o = __offset(4); if (o != 0) { bb.putInt(o + bb_pos, foo); return true; } else { return false; } }
+
+  public static int createTableInNestedNS(FlatBufferBuilder builder,
+      int foo) {
+    builder.startObject(1);
+    TableInNestedNS.addFoo(builder, foo);
+    return TableInNestedNS.endTableInNestedNS(builder);
+  }
+
+  public static void startTableInNestedNS(FlatBufferBuilder builder) { builder.startObject(1); }
+  public static void addFoo(FlatBufferBuilder builder, int foo) { builder.addInt(0, foo, 0); }
+  public static int endTableInNestedNS(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+};
+
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php
new file mode 100644
index 000000000..6bedae9d1
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php
@@ -0,0 +1,84 @@
+<?php
+// automatically generated, do not modify
+
+namespace NamespaceA\NamespaceB;
+
+use \Google\FlatBuffers\Struct;
+use \Google\FlatBuffers\Table;
+use \Google\FlatBuffers\ByteBuffer;
+use \Google\FlatBuffers\FlatBufferBuilder;
+
+class TableInNestedNS extends Table
+{
+    /**
+     * @param ByteBuffer $bb
+     * @return TableInNestedNS
+     */
+    public static function getRootAsTableInNestedNS(ByteBuffer $bb)
+    {
+        $obj = new TableInNestedNS();
+        return ($obj->init($bb->getInt($bb->getPosition()) + $bb->getPosition(), $bb));
+    }
+
+    /**
+     * @param int $_i offset
+     * @param ByteBuffer $_bb
+     * @return TableInNestedNS
+     **/
+    public function init($_i, ByteBuffer $_bb)
+    {
+        $this->bb_pos = $_i;
+        $this->bb = $_bb;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getFoo()
+    {
+        $o = $this->__offset(4);
+        return $o != 0 ? $this->bb->getInt($o + $this->bb_pos) : 0;
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return void
+     */
+    public static function startTableInNestedNS(FlatBufferBuilder $builder)
+    {
+        $builder->StartObject(1);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return TableInNestedNS
+     */
+    public static function createTableInNestedNS(FlatBufferBuilder $builder, $foo)
+    {
+        $builder->startObject(1);
+        self::addFoo($builder, $foo);
+        $o = $builder->endObject();
+        return $o;
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param int
+     * @return void
+     */
+    public static function addFoo(FlatBufferBuilder $builder, $foo)
+    {
+        $builder->addIntX(0, $foo, 0);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return int table offset
+     */
+    public static function endTableInNestedNS(FlatBufferBuilder $builder)
+    {
+        $o = $builder->endObject();
+        return $o;
+    }
+}
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.cs b/tests/namespace_test/NamespaceA/TableInFirstNS.cs
new file mode 100644
index 000000000..a82b83cc1
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.cs
@@ -0,0 +1,31 @@
+// automatically generated, do not modify
+
+namespace NamespaceA
+{
+
+using FlatBuffers;
+
+public sealed class TableInFirstNS : Table {
+  public static TableInFirstNS GetRootAsTableInFirstNS(ByteBuffer _bb) { return GetRootAsTableInFirstNS(_bb, new TableInFirstNS()); }
+  public static TableInFirstNS GetRootAsTableInFirstNS(ByteBuffer _bb, TableInFirstNS obj) { return (obj.__init(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
+  public TableInFirstNS __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+  public NamespaceA.NamespaceB.TableInNestedNS FooTable { get { return GetFooTable(new NamespaceA.NamespaceB.TableInNestedNS()); } }
+  public NamespaceA.NamespaceB.TableInNestedNS GetFooTable(NamespaceA.NamespaceB.TableInNestedNS obj) { int o = __offset(4); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
+  public NamespaceA.NamespaceB.EnumInNestedNS FooEnum { get { int o = __offset(6); return o != 0 ? (NamespaceA.NamespaceB.EnumInNestedNS)bb.GetSbyte(o + bb_pos) : NamespaceA.NamespaceB.EnumInNestedNS.A; } }
+  public bool MutateFooEnum(NamespaceA.NamespaceB.EnumInNestedNS foo_enum) { int o = __offset(6); if (o != 0) { bb.PutSbyte(o + bb_pos, (sbyte)foo_enum); return true; } else { return false; } }
+  public NamespaceA.NamespaceB.StructInNestedNS FooStruct { get { return GetFooStruct(new NamespaceA.NamespaceB.StructInNestedNS()); } }
+  public NamespaceA.NamespaceB.StructInNestedNS GetFooStruct(NamespaceA.NamespaceB.StructInNestedNS obj) { int o = __offset(8); return o != 0 ? obj.__init(o + bb_pos, bb) : null; }
+
+  public static void StartTableInFirstNS(FlatBufferBuilder builder) { builder.StartObject(3); }
+  public static void AddFooTable(FlatBufferBuilder builder, Offset<NamespaceA.NamespaceB.TableInNestedNS> fooTableOffset) { builder.AddOffset(0, fooTableOffset.Value, 0); }
+  public static void AddFooEnum(FlatBufferBuilder builder, NamespaceA.NamespaceB.EnumInNestedNS fooEnum) { builder.AddSbyte(1, (sbyte)fooEnum, 0); }
+  public static void AddFooStruct(FlatBufferBuilder builder, Offset<NamespaceA.NamespaceB.StructInNestedNS> fooStructOffset) { builder.AddStruct(2, fooStructOffset.Value, 0); }
+  public static Offset<TableInFirstNS> EndTableInFirstNS(FlatBufferBuilder builder) {
+    int o = builder.EndObject();
+    return new Offset<TableInFirstNS>(o);
+  }
+};
+
+
+}
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.go b/tests/namespace_test/NamespaceA/TableInFirstNS.go
new file mode 100644
index 000000000..2f6f72676
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.go
@@ -0,0 +1,55 @@
+// automatically generated, do not modify
+
+package NamespaceA
+
+import (
+	flatbuffers "github.com/google/flatbuffers/go"
+)
+type TableInFirstNS struct {
+	_tab flatbuffers.Table
+}
+
+func (rcv *TableInFirstNS) Init(buf []byte, i flatbuffers.UOffsetT) {
+	rcv._tab.Bytes = buf
+	rcv._tab.Pos = i
+}
+
+func (rcv *TableInFirstNS) FooTable(obj *TableInNestedNS) *TableInNestedNS {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
+	if o != 0 {
+		x := rcv._tab.Indirect(o + rcv._tab.Pos)
+		if obj == nil {
+			obj = new(TableInNestedNS)
+		}
+		obj.Init(rcv._tab.Bytes, x)
+		return obj
+	}
+	return nil
+}
+
+func (rcv *TableInFirstNS) FooEnum() int8 {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
+	if o != 0 {
+		return rcv._tab.GetInt8(o + rcv._tab.Pos)
+	}
+	return 0
+}
+
+func (rcv *TableInFirstNS) FooStruct(obj *StructInNestedNS) *StructInNestedNS {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(8))
+	if o != 0 {
+		x := o + rcv._tab.Pos
+		if obj == nil {
+			obj = new(StructInNestedNS)
+		}
+		obj.Init(rcv._tab.Bytes, x)
+		return obj
+	}
+	return nil
+}
+
+func TableInFirstNSStart(builder *flatbuffers.Builder) { builder.StartObject(3) }
+func TableInFirstNSAddFooTable(builder *flatbuffers.Builder, fooTable flatbuffers.UOffsetT) { builder.PrependUOffsetTSlot(0, flatbuffers.UOffsetT(fooTable), 0) }
+func TableInFirstNSAddFooEnum(builder *flatbuffers.Builder, fooEnum int8) { builder.PrependInt8Slot(1, fooEnum, 0) }
+func TableInFirstNSAddFooStruct(builder *flatbuffers.Builder, fooStruct flatbuffers.UOffsetT) { builder.PrependStructSlot(2, flatbuffers.UOffsetT(fooStruct), 0) }
+func TableInFirstNSEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT { return builder.EndObject() }
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.java b/tests/namespace_test/NamespaceA/TableInFirstNS.java
new file mode 100644
index 000000000..c92c0f38e
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.java
@@ -0,0 +1,32 @@
+// automatically generated, do not modify
+
+package NamespaceA;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class TableInFirstNS extends Table {
+  public static TableInFirstNS getRootAsTableInFirstNS(ByteBuffer _bb) { return getRootAsTableInFirstNS(_bb, new TableInFirstNS()); }
+  public static TableInFirstNS getRootAsTableInFirstNS(ByteBuffer _bb, TableInFirstNS obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__init(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public TableInFirstNS __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+  public NamespaceA.NamespaceB.TableInNestedNS fooTable() { return fooTable(new NamespaceA.NamespaceB.TableInNestedNS()); }
+  public NamespaceA.NamespaceB.TableInNestedNS fooTable(NamespaceA.NamespaceB.TableInNestedNS obj) { int o = __offset(4); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
+  public byte fooEnum() { int o = __offset(6); return o != 0 ? bb.get(o + bb_pos) : 0; }
+  public boolean mutateFooEnum(byte foo_enum) { int o = __offset(6); if (o != 0) { bb.put(o + bb_pos, foo_enum); return true; } else { return false; } }
+  public NamespaceA.NamespaceB.StructInNestedNS fooStruct() { return fooStruct(new NamespaceA.NamespaceB.StructInNestedNS()); }
+  public NamespaceA.NamespaceB.StructInNestedNS fooStruct(NamespaceA.NamespaceB.StructInNestedNS obj) { int o = __offset(8); return o != 0 ? obj.__init(o + bb_pos, bb) : null; }
+
+  public static void startTableInFirstNS(FlatBufferBuilder builder) { builder.startObject(3); }
+  public static void addFooTable(FlatBufferBuilder builder, int fooTableOffset) { builder.addOffset(0, fooTableOffset, 0); }
+  public static void addFooEnum(FlatBufferBuilder builder, byte fooEnum) { builder.addByte(1, fooEnum, 0); }
+  public static void addFooStruct(FlatBufferBuilder builder, int fooStructOffset) { builder.addStruct(2, fooStructOffset, 0); }
+  public static int endTableInFirstNS(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+};
+
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.php b/tests/namespace_test/NamespaceA/TableInFirstNS.php
new file mode 100644
index 000000000..09a2c550b
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.php
@@ -0,0 +1,120 @@
+<?php
+// automatically generated, do not modify
+
+namespace NamespaceA;
+
+use \Google\FlatBuffers\Struct;
+use \Google\FlatBuffers\Table;
+use \Google\FlatBuffers\ByteBuffer;
+use \Google\FlatBuffers\FlatBufferBuilder;
+
+class TableInFirstNS extends Table
+{
+    /**
+     * @param ByteBuffer $bb
+     * @return TableInFirstNS
+     */
+    public static function getRootAsTableInFirstNS(ByteBuffer $bb)
+    {
+        $obj = new TableInFirstNS();
+        return ($obj->init($bb->getInt($bb->getPosition()) + $bb->getPosition(), $bb));
+    }
+
+    /**
+     * @param int $_i offset
+     * @param ByteBuffer $_bb
+     * @return TableInFirstNS
+     **/
+    public function init($_i, ByteBuffer $_bb)
+    {
+        $this->bb_pos = $_i;
+        $this->bb = $_bb;
+        return $this;
+    }
+
+    public function getFooTable()
+    {
+        $obj = new TableInNestedNS();
+        $o = $this->__offset(4);
+        return $o != 0 ? $obj->init($o + $this->bb_pos, $this->bb) : 0;
+    }
+
+    /**
+     * @return sbyte
+     */
+    public function getFooEnum()
+    {
+        $o = $this->__offset(6);
+        return $o != 0 ? $this->bb->getSbyte($o + $this->bb_pos) : \NamespaceA\NamespaceB\EnumInNestedNS::A;
+    }
+
+    public function getFooStruct()
+    {
+        $obj = new StructInNestedNS();
+        $o = $this->__offset(8);
+        return $o != 0 ? $obj->init($o + $this->bb_pos, $this->bb) : 0;
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return void
+     */
+    public static function startTableInFirstNS(FlatBufferBuilder $builder)
+    {
+        $builder->StartObject(3);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return TableInFirstNS
+     */
+    public static function createTableInFirstNS(FlatBufferBuilder $builder, $foo_table, $foo_enum, $foo_struct)
+    {
+        $builder->startObject(3);
+        self::addFooTable($builder, $foo_table);
+        self::addFooEnum($builder, $foo_enum);
+        self::addFooStruct($builder, $foo_struct);
+        $o = $builder->endObject();
+        return $o;
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param int
+     * @return void
+     */
+    public static function addFooTable(FlatBufferBuilder $builder, $fooTable)
+    {
+        $builder->addOffsetX(0, $fooTable, 0);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param sbyte
+     * @return void
+     */
+    public static function addFooEnum(FlatBufferBuilder $builder, $fooEnum)
+    {
+        $builder->addSbyteX(1, $fooEnum, 0);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param int
+     * @return void
+     */
+    public static function addFooStruct(FlatBufferBuilder $builder, $fooStruct)
+    {
+        $builder->addStructX(2, $fooStruct, 0);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return int table offset
+     */
+    public static function endTableInFirstNS(FlatBufferBuilder $builder)
+    {
+        $o = $builder->endObject();
+        return $o;
+    }
+}
diff --git a/tests/namespace_test/namespace_test1.fbs b/tests/namespace_test/namespace_test1.fbs
new file mode 100644
index 000000000..49449bfbc
--- /dev/null
+++ b/tests/namespace_test/namespace_test1.fbs
@@ -0,0 +1,17 @@
+namespace NamespaceA.NamespaceB;
+
+table TableInNestedNS
+{
+    foo:int;
+}
+
+enum EnumInNestedNS:byte
+{
+	A, B, C
+}
+
+struct StructInNestedNS
+{
+    a:int;
+	b:int;
+}
\ No newline at end of file
diff --git a/tests/namespace_test/namespace_test1_generated.h b/tests/namespace_test/namespace_test1_generated.h
new file mode 100644
index 000000000..3c5b9c4b8
--- /dev/null
+++ b/tests/namespace_test/namespace_test1_generated.h
@@ -0,0 +1,76 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+#ifndef FLATBUFFERS_GENERATED_NAMESPACETEST1_NAMESPACEA_NAMESPACEB_H_
+#define FLATBUFFERS_GENERATED_NAMESPACETEST1_NAMESPACEA_NAMESPACEB_H_
+
+#include "flatbuffers/flatbuffers.h"
+
+
+namespace NamespaceA {
+namespace NamespaceB {
+
+struct TableInNestedNS;
+struct StructInNestedNS;
+
+enum EnumInNestedNS {
+  EnumInNestedNS_A = 0,
+  EnumInNestedNS_B = 1,
+  EnumInNestedNS_C = 2
+};
+
+inline const char **EnumNamesEnumInNestedNS() {
+  static const char *names[] = { "A", "B", "C", nullptr };
+  return names;
+}
+
+inline const char *EnumNameEnumInNestedNS(EnumInNestedNS e) { return EnumNamesEnumInNestedNS()[static_cast<int>(e)]; }
+
+MANUALLY_ALIGNED_STRUCT(4) StructInNestedNS FLATBUFFERS_FINAL_CLASS {
+ private:
+  int32_t a_;
+  int32_t b_;
+
+ public:
+  StructInNestedNS(int32_t _a, int32_t _b)
+    : a_(flatbuffers::EndianScalar(_a)), b_(flatbuffers::EndianScalar(_b)) { }
+
+  int32_t a() const { return flatbuffers::EndianScalar(a_); }
+  void mutate_a(int32_t _a) { flatbuffers::WriteScalar(&a_, _a); }
+  int32_t b() const { return flatbuffers::EndianScalar(b_); }
+  void mutate_b(int32_t _b) { flatbuffers::WriteScalar(&b_, _b); }
+};
+STRUCT_END(StructInNestedNS, 8);
+
+struct TableInNestedNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  int32_t foo() const { return GetField<int32_t>(4, 0); }
+  bool mutate_foo(int32_t _foo) { return SetField(4, _foo); }
+  bool Verify(flatbuffers::Verifier &verifier) const {
+    return VerifyTableStart(verifier) &&
+           VerifyField<int32_t>(verifier, 4 /* foo */) &&
+           verifier.EndTable();
+  }
+};
+
+struct TableInNestedNSBuilder {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_foo(int32_t foo) { fbb_.AddElement<int32_t>(4, foo, 0); }
+  TableInNestedNSBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
+  TableInNestedNSBuilder &operator=(const TableInNestedNSBuilder &);
+  flatbuffers::Offset<TableInNestedNS> Finish() {
+    auto o = flatbuffers::Offset<TableInNestedNS>(fbb_.EndTable(start_, 1));
+    return o;
+  }
+};
+
+inline flatbuffers::Offset<TableInNestedNS> CreateTableInNestedNS(flatbuffers::FlatBufferBuilder &_fbb,
+   int32_t foo = 0) {
+  TableInNestedNSBuilder builder_(_fbb);
+  builder_.add_foo(foo);
+  return builder_.Finish();
+}
+
+}  // namespace NamespaceB
+}  // namespace NamespaceA
+
+#endif  // FLATBUFFERS_GENERATED_NAMESPACETEST1_NAMESPACEA_NAMESPACEB_H_
diff --git a/tests/namespace_test/namespace_test2.fbs b/tests/namespace_test/namespace_test2.fbs
new file mode 100644
index 000000000..59b9bb2a1
--- /dev/null
+++ b/tests/namespace_test/namespace_test2.fbs
@@ -0,0 +1,10 @@
+include "namespace_test1.fbs";
+
+namespace NamespaceA;
+
+table TableInFirstNS
+{
+    foo_table:NamespaceB.TableInNestedNS;
+	foo_enum:NamespaceB.EnumInNestedNS;
+	foo_struct:NamespaceB.StructInNestedNS;
+}
diff --git a/tests/namespace_test/namespace_test2_generated.h b/tests/namespace_test/namespace_test2_generated.h
new file mode 100644
index 000000000..0395824ac
--- /dev/null
+++ b/tests/namespace_test/namespace_test2_generated.h
@@ -0,0 +1,63 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+#ifndef FLATBUFFERS_GENERATED_NAMESPACETEST2_NAMESPACEA_H_
+#define FLATBUFFERS_GENERATED_NAMESPACETEST2_NAMESPACEA_H_
+
+#include "flatbuffers/flatbuffers.h"
+
+namespace NamespaceA {
+namespace NamespaceB {
+struct TableInNestedNS;
+struct StructInNestedNS;
+}  // namespace NamespaceB
+}  // namespace NamespaceA
+
+namespace NamespaceA {
+
+struct TableInFirstNS;
+
+struct TableInFirstNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  const NamespaceA::NamespaceB::TableInNestedNS *foo_table() const { return GetPointer<const NamespaceA::NamespaceB::TableInNestedNS *>(4); }
+  NamespaceA::NamespaceB::TableInNestedNS *mutable_foo_table() { return GetPointer<NamespaceA::NamespaceB::TableInNestedNS *>(4); }
+  NamespaceA::NamespaceB::EnumInNestedNS foo_enum() const { return static_cast<NamespaceA::NamespaceB::EnumInNestedNS>(GetField<int8_t>(6, 0)); }
+  bool mutate_foo_enum(NamespaceA::NamespaceB::EnumInNestedNS _foo_enum) { return SetField(6, static_cast<int8_t>(_foo_enum)); }
+  const NamespaceA::NamespaceB::StructInNestedNS *foo_struct() const { return GetStruct<const NamespaceA::NamespaceB::StructInNestedNS *>(8); }
+  NamespaceA::NamespaceB::StructInNestedNS *mutable_foo_struct() { return GetStruct<NamespaceA::NamespaceB::StructInNestedNS *>(8); }
+  bool Verify(flatbuffers::Verifier &verifier) const {
+    return VerifyTableStart(verifier) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, 4 /* foo_table */) &&
+           verifier.VerifyTable(foo_table()) &&
+           VerifyField<int8_t>(verifier, 6 /* foo_enum */) &&
+           VerifyField<NamespaceA::NamespaceB::StructInNestedNS>(verifier, 8 /* foo_struct */) &&
+           verifier.EndTable();
+  }
+};
+
+struct TableInFirstNSBuilder {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_foo_table(flatbuffers::Offset<NamespaceA::NamespaceB::TableInNestedNS> foo_table) { fbb_.AddOffset(4, foo_table); }
+  void add_foo_enum(NamespaceA::NamespaceB::EnumInNestedNS foo_enum) { fbb_.AddElement<int8_t>(6, static_cast<int8_t>(foo_enum), 0); }
+  void add_foo_struct(const NamespaceA::NamespaceB::StructInNestedNS *foo_struct) { fbb_.AddStruct(8, foo_struct); }
+  TableInFirstNSBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
+  TableInFirstNSBuilder &operator=(const TableInFirstNSBuilder &);
+  flatbuffers::Offset<TableInFirstNS> Finish() {
+    auto o = flatbuffers::Offset<TableInFirstNS>(fbb_.EndTable(start_, 3));
+    return o;
+  }
+};
+
+inline flatbuffers::Offset<TableInFirstNS> CreateTableInFirstNS(flatbuffers::FlatBufferBuilder &_fbb,
+   flatbuffers::Offset<NamespaceA::NamespaceB::TableInNestedNS> foo_table = 0,
+   NamespaceA::NamespaceB::EnumInNestedNS foo_enum = NamespaceA::NamespaceB::EnumInNestedNS_A,
+   const NamespaceA::NamespaceB::StructInNestedNS *foo_struct = 0) {
+  TableInFirstNSBuilder builder_(_fbb);
+  builder_.add_foo_struct(foo_struct);
+  builder_.add_foo_table(foo_table);
+  builder_.add_foo_enum(foo_enum);
+  return builder_.Finish();
+}
+
+}  // namespace NamespaceA
+
+#endif  // FLATBUFFERS_GENERATED_NAMESPACETEST2_NAMESPACEA_H_

From 77fbdd28e2dc0d86e17f1c0a245cae6cb3392f76 Mon Sep 17 00:00:00 2001
From: Armen Baghumian <abaghumian@noggin.com.au>
Date: Fri, 4 Dec 2015 03:05:42 +0000
Subject: [PATCH 017/185] Correct the max/min signed/unsigned 32-bit int

The test was trying to pack an unsigned int which couldn't fit as a
signed int and putInt() wasn't doing the validation in the correct range
---
 php/ByteBuffer.php | 7 +++++--
 tests/phpTest.php  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/php/ByteBuffer.php b/php/ByteBuffer.php
index 4a583b7a5..cd6af76aa 100644
--- a/php/ByteBuffer.php
+++ b/php/ByteBuffer.php
@@ -239,7 +239,9 @@ class ByteBuffer
      */
     public function putInt($offset, $value)
     {
-        self::validateValue(~PHP_INT_MAX,  PHP_INT_MAX, $value, "int");
+        // 2147483647 = (1 << 31) -1 = Maximum signed 32-bit int
+        // -2147483648 = -1 << 31 = Minimum signed 32-bit int
+        self::validateValue(-2147483648, 2147483647, $value, "int");
 
         $this->assertOffsetAndLength($offset, 4);
         $this->writeLittleEndian($offset, 4, $value);
@@ -252,7 +254,8 @@ class ByteBuffer
     public function putUint($offset, $value)
     {
         // NOTE: We can't put big integer value. this is PHP limitation.
-        self::validateValue(0,  PHP_INT_MAX, $value, "uint",  " php has big numbers limitation. check your PHP_INT_MAX");
+        // 4294967295 = (1 << 32) -1 = Maximum unsigned 32-bin int
+        self::validateValue(0, 4294967295, $value, "uint",  " php has big numbers limitation. check your PHP_INT_MAX");
 
         $this->assertOffsetAndLength($offset, 4);
         $this->writeLittleEndian($offset, 4, $value);
diff --git a/tests/phpTest.php b/tests/phpTest.php
index bace87dbb..c942ef121 100644
--- a/tests/phpTest.php
+++ b/tests/phpTest.php
@@ -192,7 +192,7 @@ function fuzzTest1(Assert $assert)
     $uchar_val = 0xFF;
     $short_val = -32222; // 0x8222;
     $ushort_val = 0xFEEE;
-    $int_val = 0x83333333 | 0;
+    $int_val = 0x7fffffff | 0;
     // for now
     $uint_val = 1;
     $long_val = 2;

From f622e5996c9e687c99bebc30d8f4ece278f487e4 Mon Sep 17 00:00:00 2001
From: Armen Baghumian <abaghumian@noggin.com.au>
Date: Fri, 4 Dec 2015 06:10:11 +0000
Subject: [PATCH 018/185] Optimize get* operation

It's slightly faster to convert the value to signed value in PHP as
opposed to use pack and unpack.

For 1M get operation the difference is:

    getShort in 3.3272678852081 seconds
    getInt in 3.8338589668274 seconds
    getLong in 5.6381590366364 seconds
    getLong (neg) in 5.6149101257324 seconds

vs

    getShort in 2.7564418315887 seconds
    getInt in 3.1612701416016 seconds
    getLong in 3.1369340419769 seconds
    getLong (neg) in 3.1478710174561 seconds

And since pack("P") and unpack("q") has been removed now ByteBuffer
works for PHP >= 5.4
---
 php/ByteBuffer.php | 32 +++++++++++---------------------
 tests/phpTest.php  | 13 +++++++++++++
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/php/ByteBuffer.php b/php/ByteBuffer.php
index cd6af76aa..9ab9717af 100644
--- a/php/ByteBuffer.php
+++ b/php/ByteBuffer.php
@@ -372,7 +372,11 @@ class ByteBuffer
     {
         $result = $this->readLittleEndian($index, 2);
 
-        return self::convertHelper(self::__SHORT, $result);
+        $sign = $index + (ByteBuffer::isLittleEndian() ? 1 : 0);
+        $issigned = isset($this->_buffer[$sign]) && ord($this->_buffer[$sign]) & 0x80;
+
+        // 65536 = 1 << 16 = Maximum unsigned 16-bit int
+        return $issigned ? $result - 65536 : $result;
     }
 
     /**
@@ -392,7 +396,11 @@ class ByteBuffer
     {
         $result = $this->readLittleEndian($index, 4);
 
-        return self::convertHelper(self::__INT, $result);
+        $sign = $index + (ByteBuffer::isLittleEndian() ? 3 : 0);
+        $issigned = isset($this->_buffer[$sign]) && ord($this->_buffer[$sign]) & 0x80;
+
+        // 4294967296 = 1 << 32 = Maximum unsigned 32-bit int
+        return $issigned ? $result - 4294967296 : $result;
     }
 
     /**
@@ -410,9 +418,7 @@ class ByteBuffer
      */
     public function getLong($index)
     {
-        $result =  $this->readLittleEndian($index, 8);
-
-        return self::convertHelper(self::__LONG, $result);
+        return $this->readLittleEndian($index, 8);
     }
 
     /**
@@ -459,22 +465,6 @@ class ByteBuffer
         // see also: http://php.net/manual/en/function.pack.php
 
         switch ($type) {
-            case self::__SHORT:
-                $helper = pack("v", $value);
-                $v = unpack("s", $helper);
-
-                return $v[1];
-                break;
-            case self::__INT:
-                $helper = pack("V", $value);
-                $v = unpack("l", $helper);
-                return $v[1];
-                break;
-            case self::__LONG:
-                $helper = pack("P", $value);
-                $v = unpack("q", $helper);
-                return $v[1];
-                break;
             case self::__FLOAT:
                 $inthelper = pack("V", $value);
                 $v = unpack("f", $inthelper);
diff --git a/tests/phpTest.php b/tests/phpTest.php
index c942ef121..e91e47a1d 100644
--- a/tests/phpTest.php
+++ b/tests/phpTest.php
@@ -539,6 +539,19 @@ function testByteBuffer(Assert $assert) {
         $buffer[7] = chr(0x01);
         $uut = Google\FlatBuffers\ByteBuffer::wrap($buffer);
         $assert->Equal(0x010203040A0B0C0D, $uut->getLong(0));
+
+        //Test: Signed Long
+        $buffer = str_repeat("\0", 8);
+        $buffer[0] = chr(0x00);
+        $buffer[1] = chr(0x00);
+        $buffer[2] = chr(0x00);
+        $buffer[3] = chr(0x00);
+        $buffer[4] = chr(0x00);
+        $buffer[5] = chr(0x00);
+        $buffer[6] = chr(0x00);
+        $buffer[7] = chr(0x80);
+        $uut = Google\FlatBuffers\ByteBuffer::wrap($buffer);
+        $assert->Equal(-1 << 63, $uut->getLong(0));
     }
 
     //Test: ByteBuffer_GetLongChecksOffset

From b0d5bb1c4bafda99ffe37c2c304453f6ed45707c Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 7 Dec 2015 09:53:04 -0800
Subject: [PATCH 019/185] Fixed language for generators not being set
 correctly.

Change-Id: I36c1f05efa836b32635e3274ac0ba976a8961bdd
Tested: on Linux.
---
 src/flatc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/flatc.cpp b/src/flatc.cpp
index a51e488d1..ead3a7c29 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -268,7 +268,7 @@ int main(int argc, const char *argv[]) {
                                flatbuffers::StripExtension(*file_it));
 
       for (size_t i = 0; i < num_generators; ++i) {
-        opts.lang = generators[i].lang;
+        parser->opts.lang = generators[i].lang;
         if (generator_enabled[i]) {
           if (!print_make_rules) {
             flatbuffers::EnsureDirExists(output_path);

From d5a113e5bf60c145364ec79344646513dc6aca26 Mon Sep 17 00:00:00 2001
From: belldon <dbell@ise.com>
Date: Fri, 4 Dec 2015 10:49:03 -0500
Subject: [PATCH 020/185] Update C# FlatBufferBuilder to reuse vtable array

This commit updates the FlatBufferBuilder class to reuse the vtable
array instead of creating a new array with every StartObject() call.
---
 net/FlatBuffers/FlatBufferBuilder.cs | 39 +++++++++++++++++++---------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/net/FlatBuffers/FlatBufferBuilder.cs b/net/FlatBuffers/FlatBufferBuilder.cs
index 39d386f40..3866d8340 100644
--- a/net/FlatBuffers/FlatBufferBuilder.cs
+++ b/net/FlatBuffers/FlatBufferBuilder.cs
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
+
 using System;
 using System.Text;
 
+
 namespace FlatBuffers
 {
     /// <summary>
@@ -29,8 +31,10 @@ namespace FlatBuffers
         private ByteBuffer _bb;
         private int _minAlign = 1;
 
-        // The vtable for the current table, null otherwise.
-        private int[] _vtable;
+        // The vtable for the current table (if _vtableSize >= 0)
+        private int[] _vtable = new int[16];
+        // The size of the vtable. -1 indicates no vtable
+        private int _vtableSize = -1;
         // Starting offset of the current struct/table.
         private int _objectStart;
         // List of offsets of all vtables.
@@ -54,9 +58,9 @@ namespace FlatBuffers
             _space = _bb.Length;
             _bb.Reset();
             _minAlign = 1;
-            _vtable = null;
+            while (_vtableSize > 0) _vtable[--_vtableSize] = 0;
+            _vtableSize = -1;
             _objectStart = 0;
-            _vtables = new int[16];
             _numVtables = 0;
             _vectorNumElems = 0;
         }
@@ -226,15 +230,22 @@ namespace FlatBuffers
         {
             // You should not be creating any other objects or strings/vectors
             // while an object is being constructed
-            if (_vtable != null)
+            if (_vtableSize >= 0)
                 throw new Exception(
                     "FlatBuffers: object serialization must not be nested.");
         }
 
         public void StartObject(int numfields)
         {
+            if (numfields < 0)
+                throw new ArgumentOutOfRangeException("Flatbuffers: invalid numfields");
+
             NotNested();
-            _vtable = new int[numfields];
+
+            if (_vtable.Length < numfields)
+                _vtable = new int[numfields];
+
+            _vtableSize = numfields;
             _objectStart = Offset;
         }
 
@@ -243,6 +254,9 @@ namespace FlatBuffers
         // buffer.
         public void Slot(int voffset)
         {
+            if (voffset >= _vtableSize)
+                throw new IndexOutOfRangeException("Flatbuffers: invalid voffset");
+
             _vtable[voffset] = Offset;
         }
 
@@ -284,30 +298,31 @@ namespace FlatBuffers
 
         public int EndObject()
         {
-
-            if (_vtable == null)
+            if (_vtableSize < 0)
                 throw new InvalidOperationException(
                   "Flatbuffers: calling endObject without a startObject");
 
             AddInt((int)0);
             var vtableloc = Offset;
             // Write out the current vtable.
-            for (int i = _vtable.Length - 1; i >= 0 ; i--) {
+            for (int i = _vtableSize - 1; i >= 0 ; i--) {
                 // Offset relative to the start of the table.
                 short off = (short)(_vtable[i] != 0
                                         ? vtableloc - _vtable[i]
                                         : 0);
                 AddShort(off);
+
+                // clear out written entry
+                _vtable[i] = 0;
             }
 
             const int standardFields = 2; // The fields below:
             AddShort((short)(vtableloc - _objectStart));
-            AddShort((short)((_vtable.Length + standardFields) *
+            AddShort((short)((_vtableSize + standardFields) *
                              sizeof(short)));
 
             // Search for an existing vtable that matches the current one.
             int existingVtable = 0;
-
             for (int i = 0; i < _numVtables; i++) {
                 int vt1 = _bb.Length - _vtables[i];
                 int vt2 = _space;
@@ -348,7 +363,7 @@ namespace FlatBuffers
                 _bb.PutInt(_bb.Length - vtableloc, Offset - vtableloc);
             }
 
-            _vtable = null;
+            _vtableSize = -1;
             return vtableloc;
         }
 

From 8db90f50739449e3e9bb6710c9594869bc25759a Mon Sep 17 00:00:00 2001
From: belldon <dbell@ise.com>
Date: Thu, 3 Dec 2015 16:11:27 -0500
Subject: [PATCH 021/185] Extend C# ByteBuffer Put method fix to unsafe methods

Fixes issue #243.  Extends the initial C# ByteBuffer fix
(e4c3bf3d2cec00522fd1a8edd8704413cdc1303b) to Put methods
used when UNSAFE_BYTEBUFFER is defined.
---
 net/FlatBuffers/ByteBuffer.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/net/FlatBuffers/ByteBuffer.cs b/net/FlatBuffers/ByteBuffer.cs
index 50c6fa960..e2a5f2d80 100755
--- a/net/FlatBuffers/ByteBuffer.cs
+++ b/net/FlatBuffers/ByteBuffer.cs
@@ -168,7 +168,6 @@ namespace FlatBuffers
                     ? value
                     : ReverseBytes(value);
             }
-            _pos = offset;
         }
 
         public void PutInt(int offset, int value)
@@ -185,7 +184,6 @@ namespace FlatBuffers
                     ? value
                     : ReverseBytes(value);
             }
-            _pos = offset;
         }
 
         public unsafe void PutLong(int offset, long value)
@@ -203,7 +201,6 @@ namespace FlatBuffers
                     ? value
                     : ReverseBytes(value);
             }
-            _pos = offset;
         }
 
         public unsafe void PutFloat(int offset, float value)
@@ -220,7 +217,6 @@ namespace FlatBuffers
                     *(uint*)(ptr + offset) = ReverseBytes(*(uint*)(&value));
                 }
             }
-            _pos = offset;
         }
 
         public unsafe void PutDouble(int offset, double value)
@@ -238,7 +234,6 @@ namespace FlatBuffers
                     *(ulong*)(ptr + offset) = ReverseBytes(*(ulong*)(ptr + offset));
                 }
             }
-            _pos = offset;
         }
 #else // !UNSAFE_BYTEBUFFER
         // Slower versions of Put* for when unsafe code is not allowed.

From 6fba6b6e714c5b948e6b0c64d5157710668f302b Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 9 Dec 2015 12:56:24 -0800
Subject: [PATCH 022/185] Fixed compiler warnings for cast to bool in generated
 code.

Change-Id: I7727aeb478feb23d8ef66fd1ba9499b142b3ea7d
Tested: on Linux.
---
 src/idl_gen_cpp.cpp            | 15 ++++++++++-----
 tests/monster_test_generated.h |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index facd7d286..fa2708000 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -234,11 +234,16 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
 // underlying type to the interface type.
 std::string GenUnderlyingCast(const Parser &parser, const FieldDef &field,
                               bool from, const std::string &val) {
-  return (field.value.type.enum_def && IsScalar(field.value.type.base_type)) ||
-         field.value.type.base_type == BASE_TYPE_BOOL
-      ? "static_cast<" + GenTypeBasic(parser, field.value.type, from) + ">(" +
-        val + ")"
-      : val;
+  if (from && field.value.type.base_type == BASE_TYPE_BOOL) {
+    return val + " != 0";
+  } else if ((field.value.type.enum_def &&
+              IsScalar(field.value.type.base_type)) ||
+             field.value.type.base_type == BASE_TYPE_BOOL) {
+    return "static_cast<" + GenTypeBasic(parser, field.value.type, from) +
+           ">(" + val + ")";
+  } else {
+    return val;
+  }
 }
 
 std::string GenFieldOffsetName(const FieldDef &field) {
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index 90814a94f..14780bf2d 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -236,7 +236,7 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   const MyGame::Example::Monster *testnestedflatbuffer_nested_root() const { return flatbuffers::GetRoot<MyGame::Example::Monster>(testnestedflatbuffer()->Data()); }
   const Stat *testempty() const { return GetPointer<const Stat *>(VT_TESTEMPTY); }
   Stat *mutable_testempty() { return GetPointer<Stat *>(VT_TESTEMPTY); }
-  bool testbool() const { return static_cast<bool>(GetField<uint8_t>(VT_TESTBOOL, 0)); }
+  bool testbool() const { return GetField<uint8_t>(VT_TESTBOOL, 0) != 0; }
   bool mutate_testbool(bool _testbool) { return SetField(VT_TESTBOOL, static_cast<uint8_t>(_testbool)); }
   int32_t testhashs32_fnv1() const { return GetField<int32_t>(VT_TESTHASHS32_FNV1, 0); }
   bool mutate_testhashs32_fnv1(int32_t _testhashs32_fnv1) { return SetField(VT_TESTHASHS32_FNV1, _testhashs32_fnv1); }

From 4dcaec7938e0a9fe9f0451fe296b6151e3554275 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 9 Dec 2015 16:41:12 -0800
Subject: [PATCH 023/185] Fixed root_type not accepting namespaced types.

Change-Id: I272f377742cc0a2c1bfccaa641b54eb9a8c762b6
Tested: on Linux.
---
 src/idl_parser.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 663ccd1d2..9b62075de 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -1066,8 +1066,10 @@ void Parser::ParseDecl() {
 }
 
 bool Parser::SetRootType(const char *name) {
-  root_struct_def_ = structs_.Lookup(
-                       namespaces_.back()->GetFullyQualifiedName(name));
+  root_struct_def_ = structs_.Lookup(name);
+  if (!root_struct_def_)
+    root_struct_def_ = structs_.Lookup(
+                         namespaces_.back()->GetFullyQualifiedName(name));
   return root_struct_def_ != nullptr;
 }
 
@@ -1440,6 +1442,7 @@ bool Parser::Parse(const char *source, const char **include_paths,
         Next();
         auto root_type = attribute_;
         Expect(kTokenIdentifier);
+        ParseNamespacing(&root_type, nullptr);
         if (!SetRootType(root_type.c_str()))
           Error("unknown root type: " + root_type);
         if (root_struct_def_->fixed)

From b8187e5b8231148ba532a3f5dae035adfb43346b Mon Sep 17 00:00:00 2001
From: Oli Wilkinson <oli@evolutional.co.uk>
Date: Fri, 11 Dec 2015 14:57:59 -0500
Subject: [PATCH 024/185] Performance tweak to FlatBufferBuilder.CreateString
 method to remove the unnecessary byte buffer allocation

(See https://github.com/google/flatbuffers/issues/55#issuecomment-164031718 for stats)
---
 net/FlatBuffers/FlatBufferBuilder.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/net/FlatBuffers/FlatBufferBuilder.cs b/net/FlatBuffers/FlatBufferBuilder.cs
index 3866d8340..5230b32fb 100644
--- a/net/FlatBuffers/FlatBufferBuilder.cs
+++ b/net/FlatBuffers/FlatBufferBuilder.cs
@@ -276,12 +276,11 @@ namespace FlatBuffers
 
         public StringOffset CreateString(string s)
         {
-            NotNested();
-            byte[] utf8 = Encoding.UTF8.GetBytes(s);
-            AddByte((byte)0);
-            StartVector(1, utf8.Length, 1);
-            Buffer.BlockCopy(utf8, 0, _bb.Data, _space -= utf8.Length,
-                             utf8.Length);
+            NotNested();            
+            AddByte(0);
+            var utf8StringLen = Encoding.UTF8.GetByteCount(s);
+            StartVector(1, utf8StringLen, 1);
+            Encoding.UTF8.GetBytes(s, 0, s.Length, _bb.Data, _space -= utf8StringLen);
             return new StringOffset(EndVector().Value);
         }
 

From be11d2b6ef71f367817000b853724982992d2e45 Mon Sep 17 00:00:00 2001
From: Oli Wilkinson <oli@evolutional.co.uk>
Date: Sat, 12 Dec 2015 11:39:57 -0500
Subject: [PATCH 025/185] C# performance optimization to Pad/Prep methods

---
 net/FlatBuffers/ByteBuffer.cs        | 7 +++++++
 net/FlatBuffers/FlatBufferBuilder.cs | 8 +++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/net/FlatBuffers/ByteBuffer.cs b/net/FlatBuffers/ByteBuffer.cs
index e2a5f2d80..37779b593 100755
--- a/net/FlatBuffers/ByteBuffer.cs
+++ b/net/FlatBuffers/ByteBuffer.cs
@@ -146,6 +146,13 @@ namespace FlatBuffers
             _buffer[offset] = value;
         }
 
+        public void PutByte(int offset, byte value, int count)
+        {
+            AssertOffsetAndLength(offset, sizeof(byte) * count);
+            for (var i = 0; i < count; ++i)
+                _buffer[offset + i] = value;
+        }
+
         // this method exists in order to conform with Java ByteBuffer standards
         public void Put(int offset, byte value)
         {
diff --git a/net/FlatBuffers/FlatBufferBuilder.cs b/net/FlatBuffers/FlatBufferBuilder.cs
index 5230b32fb..7d2115885 100644
--- a/net/FlatBuffers/FlatBufferBuilder.cs
+++ b/net/FlatBuffers/FlatBufferBuilder.cs
@@ -69,10 +69,7 @@ namespace FlatBuffers
 
         public void Pad(int size)
         {
-            for (var i = 0; i < size; i++)
-            {
-                _bb.PutByte(--_space, 0);
-            }
+             _bb.PutByte(_space -= size, 0, size);
         }
 
         // Doubles the size of the ByteBuffer, and copies the old data towards
@@ -116,7 +113,8 @@ namespace FlatBuffers
                 _space += (int)_bb.Length - oldBufSize;
 
             }
-            Pad(alignSize);
+            if (alignSize > 0)
+                Pad(alignSize);
         }
 
         public void PutBool(bool x)

From 853e34087ad8abac7dd6051f70af63a0fac43b75 Mon Sep 17 00:00:00 2001
From: Faizan Rashid <frashid@rubiconproject.com>
Date: Sun, 13 Dec 2015 02:55:16 -0500
Subject: [PATCH 026/185] [BUG] [MINOR] Use buffer for specific py versions

Fix for Issue 1741
Minor bug where python versions 2.7.x where x < 5 do not support
unpacking from memoryview objects. Versions 2.7.5 and above will
use memoryview while 2.7 versions below 2.7.5  will use buffer
objects.

Manual testing was performed on versions 2.7.5 and 2.7.2 to
confirm both worked correctly.
---
 python/flatbuffers/compat.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/python/flatbuffers/compat.py b/python/flatbuffers/compat.py
index 30c504d5e..345e38cbf 100644
--- a/python/flatbuffers/compat.py
+++ b/python/flatbuffers/compat.py
@@ -4,6 +4,8 @@ import sys
 
 PY2 = sys.version_info[0] == 2
 PY26 = sys.version_info[0:2] == (2, 6)
+PY27 = sys.version_info[0:2] == (2, 7)
+PY275 = sys.version_info[0:3] >= (2, 7, 5)
 PY3 = sys.version_info[0] == 3
 PY34 = sys.version_info[0:2] >= (3, 4)
 
@@ -17,7 +19,7 @@ else:
     string_types = (basestring,)
     binary_type = str
     range_func = xrange
-    if PY26:
+    if PY26 or (PY27 and not PY275):
         memoryview_type = buffer
         struct_bool_decl = "<b"
     else:

From a9909a0c189d22c337581cbc0ae3da58ce5a9964 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 9 Dec 2015 17:06:11 -0800
Subject: [PATCH 027/185] Made sure all namespace test files get generated.

Also included them in the C++ test.

Change-Id: Ib0c8470f0aacdf16616c27494abdda57a010195d
Tested: on Linux.
---
 tests/generate_code.bat                       |  19 ++-
 tests/generate_code.sh                        |  18 +++
 .../NamespaceA/NamespaceB/EnumInNestedNS.py   |   9 ++
 .../NamespaceA/NamespaceB/StructInNestedNS.cs |   1 +
 .../NamespaceA/NamespaceB/StructInNestedNS.py |  23 +++
 .../NamespaceA/NamespaceB/TableInNestedNS.cs  |   1 +
 .../NamespaceA/NamespaceB/TableInNestedNS.py  |  23 +++
 .../NamespaceA/NamespaceB/__init__.py         |   0
 .../NamespaceA/TableInFirstNS.cs              |   1 +
 .../NamespaceA/TableInFirstNS.py              |  47 ++++++
 tests/namespace_test/NamespaceA/__init__.py   |   0
 .../namespace_test1_generated.h               |  11 +-
 .../namespace_test1_generated.js              | 143 ++++++++++++++++++
 .../namespace_test2_generated.h               |  31 ++--
 .../namespace_test2_generated.js              | 115 ++++++++++++++
 tests/test.cpp                                |   2 +
 16 files changed, 426 insertions(+), 18 deletions(-)
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py
 create mode 100644 tests/namespace_test/NamespaceA/NamespaceB/__init__.py
 create mode 100644 tests/namespace_test/NamespaceA/TableInFirstNS.py
 create mode 100644 tests/namespace_test/NamespaceA/__init__.py
 create mode 100644 tests/namespace_test/namespace_test1_generated.js
 create mode 100644 tests/namespace_test/namespace_test2_generated.js

diff --git a/tests/generate_code.bat b/tests/generate_code.bat
index 75ac1433e..00b16d900 100644
--- a/tests/generate_code.bat
+++ b/tests/generate_code.bat
@@ -1,2 +1,17 @@
-..\flatc.exe -c -j -n -g -b -p --php -s --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
-..\flatc.exe -b --schema monster_test.fbs
+:: Copyright 2015 Google Inc. All rights reserved.
+::
+:: Licensed under the Apache License, Version 2.0 (the "License");
+:: you may not use this file except in compliance with the License.
+:: You may obtain a copy of the License at
+::
+::     http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+
+..\flatc.exe --cpp --java --csharp --go --binary --python --js --php --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
+..\flatc.exe --cpp --java --csharp --go --binary --python --js --php --gen-mutable -o namespace_test namespace_test\namespace_test1.fbs namespace_test\namespace_test2.fbs
+..\flatc.exe --binary --schema monster_test.fbs
diff --git a/tests/generate_code.sh b/tests/generate_code.sh
index 91661f30d..712da6c77 100644
--- a/tests/generate_code.sh
+++ b/tests/generate_code.sh
@@ -1,2 +1,20 @@
+#!/bin/bash
+
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ../flatc --cpp --java --csharp --go --binary --python --js --php --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
+../flatc --cpp --java --csharp --go --binary --python --js --php --gen-mutable -o namespace_test namespace_test/namespace_test1.fbs namespace_test/namespace_test2.fbs
 ../flatc --binary --schema monster_test.fbs
+
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py
new file mode 100644
index 000000000..5de5be804
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py
@@ -0,0 +1,9 @@
+# automatically generated, do not modify
+
+# namespace: NamespaceB
+
+class EnumInNestedNS(object):
+    A = 0
+    B = 1
+    C = 2
+
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
index 9eb853c74..7317f2410 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
@@ -3,6 +3,7 @@
 namespace NamespaceA.NamespaceB
 {
 
+using System;
 using FlatBuffers;
 
 public sealed class StructInNestedNS : Struct {
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py
new file mode 100644
index 000000000..ae3f94024
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py
@@ -0,0 +1,23 @@
+# automatically generated, do not modify
+
+# namespace: NamespaceB
+
+import flatbuffers
+
+class StructInNestedNS(object):
+    __slots__ = ['_tab']
+
+    # StructInNestedNS
+    def Init(self, buf, pos):
+        self._tab = flatbuffers.table.Table(buf, pos)
+
+    # StructInNestedNS
+    def A(self): return self._tab.Get(flatbuffers.number_types.Int32Flags, self._tab.Pos + flatbuffers.number_types.UOffsetTFlags.py_type(0))
+    # StructInNestedNS
+    def B(self): return self._tab.Get(flatbuffers.number_types.Int32Flags, self._tab.Pos + flatbuffers.number_types.UOffsetTFlags.py_type(4))
+
+def CreateStructInNestedNS(builder, a, b):
+    builder.Prep(4, 8)
+    builder.PrependInt32(b)
+    builder.PrependInt32(a)
+    return builder.Offset()
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
index e04bc7cb2..dec8da9ee 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
@@ -3,6 +3,7 @@
 namespace NamespaceA.NamespaceB
 {
 
+using System;
 using FlatBuffers;
 
 public sealed class TableInNestedNS : Table {
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py
new file mode 100644
index 000000000..834103bfe
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py
@@ -0,0 +1,23 @@
+# automatically generated, do not modify
+
+# namespace: NamespaceB
+
+import flatbuffers
+
+class TableInNestedNS(object):
+    __slots__ = ['_tab']
+
+    # TableInNestedNS
+    def Init(self, buf, pos):
+        self._tab = flatbuffers.table.Table(buf, pos)
+
+    # TableInNestedNS
+    def Foo(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
+        if o != 0:
+            return self._tab.Get(flatbuffers.number_types.Int32Flags, o + self._tab.Pos)
+        return 0
+
+def TableInNestedNSStart(builder): builder.StartObject(1)
+def TableInNestedNSAddFoo(builder, foo): builder.PrependInt32Slot(0, foo, 0)
+def TableInNestedNSEnd(builder): return builder.EndObject()
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/__init__.py b/tests/namespace_test/NamespaceA/NamespaceB/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.cs b/tests/namespace_test/NamespaceA/TableInFirstNS.cs
index a82b83cc1..21a12cf59 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.cs
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.cs
@@ -3,6 +3,7 @@
 namespace NamespaceA
 {
 
+using System;
 using FlatBuffers;
 
 public sealed class TableInFirstNS : Table {
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.py b/tests/namespace_test/NamespaceA/TableInFirstNS.py
new file mode 100644
index 000000000..eb09014ce
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.py
@@ -0,0 +1,47 @@
+# automatically generated, do not modify
+
+# namespace: NamespaceA
+
+import flatbuffers
+
+class TableInFirstNS(object):
+    __slots__ = ['_tab']
+
+    # TableInFirstNS
+    def Init(self, buf, pos):
+        self._tab = flatbuffers.table.Table(buf, pos)
+
+    # TableInFirstNS
+    def FooTable(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
+        if o != 0:
+            x = self._tab.Indirect(o + self._tab.Pos)
+            from .TableInNestedNS import TableInNestedNS
+            obj = TableInNestedNS()
+            obj.Init(self._tab.Bytes, x)
+            return obj
+        return None
+
+    # TableInFirstNS
+    def FooEnum(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
+        if o != 0:
+            return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
+        return 0
+
+    # TableInFirstNS
+    def FooStruct(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
+        if o != 0:
+            x = o + self._tab.Pos
+            from .StructInNestedNS import StructInNestedNS
+            obj = StructInNestedNS()
+            obj.Init(self._tab.Bytes, x)
+            return obj
+        return None
+
+def TableInFirstNSStart(builder): builder.StartObject(3)
+def TableInFirstNSAddFooTable(builder, fooTable): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(fooTable), 0)
+def TableInFirstNSAddFooEnum(builder, fooEnum): builder.PrependInt8Slot(1, fooEnum, 0)
+def TableInFirstNSAddFooStruct(builder, fooStruct): builder.PrependStructSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(fooStruct), 0)
+def TableInFirstNSEnd(builder): return builder.EndObject()
diff --git a/tests/namespace_test/NamespaceA/__init__.py b/tests/namespace_test/NamespaceA/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/namespace_test/namespace_test1_generated.h b/tests/namespace_test/namespace_test1_generated.h
index 3c5b9c4b8..29f8e1229 100644
--- a/tests/namespace_test/namespace_test1_generated.h
+++ b/tests/namespace_test/namespace_test1_generated.h
@@ -42,11 +42,14 @@ MANUALLY_ALIGNED_STRUCT(4) StructInNestedNS FLATBUFFERS_FINAL_CLASS {
 STRUCT_END(StructInNestedNS, 8);
 
 struct TableInNestedNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  int32_t foo() const { return GetField<int32_t>(4, 0); }
-  bool mutate_foo(int32_t _foo) { return SetField(4, _foo); }
+  enum {
+    VT_FOO = 4,
+  };
+  int32_t foo() const { return GetField<int32_t>(VT_FOO, 0); }
+  bool mutate_foo(int32_t _foo) { return SetField(VT_FOO, _foo); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<int32_t>(verifier, 4 /* foo */) &&
+           VerifyField<int32_t>(verifier, VT_FOO) &&
            verifier.EndTable();
   }
 };
@@ -54,7 +57,7 @@ struct TableInNestedNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
 struct TableInNestedNSBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
-  void add_foo(int32_t foo) { fbb_.AddElement<int32_t>(4, foo, 0); }
+  void add_foo(int32_t foo) { fbb_.AddElement<int32_t>(TableInNestedNS::VT_FOO, foo, 0); }
   TableInNestedNSBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   TableInNestedNSBuilder &operator=(const TableInNestedNSBuilder &);
   flatbuffers::Offset<TableInNestedNS> Finish() {
diff --git a/tests/namespace_test/namespace_test1_generated.js b/tests/namespace_test/namespace_test1_generated.js
new file mode 100644
index 000000000..769b523e3
--- /dev/null
+++ b/tests/namespace_test/namespace_test1_generated.js
@@ -0,0 +1,143 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+/**
+ * @const
+*/
+var NamespaceA = NamespaceA || {};
+
+/**
+ * @const
+*/
+NamespaceA.NamespaceB = NamespaceA.NamespaceB || {};
+
+/**
+ * @enum
+ */
+NamespaceA.NamespaceB.EnumInNestedNS = {
+  A: 0,
+  B: 1,
+  C: 2
+};
+
+/**
+ * @constructor
+ */
+NamespaceA.NamespaceB.TableInNestedNS = function() {
+  /**
+   * @type {flatbuffers.ByteBuffer}
+   */
+  this.bb = null;
+
+  /**
+   * @type {number}
+   */
+  this.bb_pos = 0;
+};
+
+/**
+ * @param {number} i
+ * @param {flatbuffers.ByteBuffer} bb
+ * @returns {NamespaceA.NamespaceB.TableInNestedNS}
+ */
+NamespaceA.NamespaceB.TableInNestedNS.prototype.__init = function(i, bb) {
+  this.bb_pos = i;
+  this.bb = bb;
+  return this;
+};
+
+/**
+ * @param {flatbuffers.ByteBuffer} bb
+ * @param {NamespaceA.NamespaceB.TableInNestedNS=} obj
+ * @returns {NamespaceA.NamespaceB.TableInNestedNS}
+ */
+NamespaceA.NamespaceB.TableInNestedNS.getRootAsTableInNestedNS = function(bb, obj) {
+  return (obj || new NamespaceA.NamespaceB.TableInNestedNS).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+};
+
+/**
+ * @returns {number}
+ */
+NamespaceA.NamespaceB.TableInNestedNS.prototype.foo = function() {
+  var offset = this.bb.__offset(this.bb_pos, 4);
+  return offset ? this.bb.readInt32(this.bb_pos + offset) : 0;
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ */
+NamespaceA.NamespaceB.TableInNestedNS.startTableInNestedNS = function(builder) {
+  builder.startObject(1);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {number} foo
+ */
+NamespaceA.NamespaceB.TableInNestedNS.addFoo = function(builder, foo) {
+  builder.addFieldInt32(0, foo, 0);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @returns {flatbuffers.Offset}
+ */
+NamespaceA.NamespaceB.TableInNestedNS.endTableInNestedNS = function(builder) {
+  var offset = builder.endObject();
+  return offset;
+};
+
+/**
+ * @constructor
+ */
+NamespaceA.NamespaceB.StructInNestedNS = function() {
+  /**
+   * @type {flatbuffers.ByteBuffer}
+   */
+  this.bb = null;
+
+  /**
+   * @type {number}
+   */
+  this.bb_pos = 0;
+};
+
+/**
+ * @param {number} i
+ * @param {flatbuffers.ByteBuffer} bb
+ * @returns {NamespaceA.NamespaceB.StructInNestedNS}
+ */
+NamespaceA.NamespaceB.StructInNestedNS.prototype.__init = function(i, bb) {
+  this.bb_pos = i;
+  this.bb = bb;
+  return this;
+};
+
+/**
+ * @returns {number}
+ */
+NamespaceA.NamespaceB.StructInNestedNS.prototype.a = function() {
+  return this.bb.readInt32(this.bb_pos);
+};
+
+/**
+ * @returns {number}
+ */
+NamespaceA.NamespaceB.StructInNestedNS.prototype.b = function() {
+  return this.bb.readInt32(this.bb_pos + 4);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {number} a
+ * @param {number} b
+ * @returns {flatbuffers.Offset}
+ */
+NamespaceA.NamespaceB.StructInNestedNS.createStructInNestedNS = function(builder, a, b) {
+  builder.prep(4, 8);
+  builder.writeInt32(b);
+  builder.writeInt32(a);
+  return builder.offset();
+};
+
+// Exports for Node.js and RequireJS
+this.NamespaceA = NamespaceA;
diff --git a/tests/namespace_test/namespace_test2_generated.h b/tests/namespace_test/namespace_test2_generated.h
index 0395824ac..f60986a61 100644
--- a/tests/namespace_test/namespace_test2_generated.h
+++ b/tests/namespace_test/namespace_test2_generated.h
@@ -5,6 +5,8 @@
 
 #include "flatbuffers/flatbuffers.h"
 
+#include "namespace_test1_generated.h"
+
 namespace NamespaceA {
 namespace NamespaceB {
 struct TableInNestedNS;
@@ -17,18 +19,23 @@ namespace NamespaceA {
 struct TableInFirstNS;
 
 struct TableInFirstNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  const NamespaceA::NamespaceB::TableInNestedNS *foo_table() const { return GetPointer<const NamespaceA::NamespaceB::TableInNestedNS *>(4); }
-  NamespaceA::NamespaceB::TableInNestedNS *mutable_foo_table() { return GetPointer<NamespaceA::NamespaceB::TableInNestedNS *>(4); }
-  NamespaceA::NamespaceB::EnumInNestedNS foo_enum() const { return static_cast<NamespaceA::NamespaceB::EnumInNestedNS>(GetField<int8_t>(6, 0)); }
-  bool mutate_foo_enum(NamespaceA::NamespaceB::EnumInNestedNS _foo_enum) { return SetField(6, static_cast<int8_t>(_foo_enum)); }
-  const NamespaceA::NamespaceB::StructInNestedNS *foo_struct() const { return GetStruct<const NamespaceA::NamespaceB::StructInNestedNS *>(8); }
-  NamespaceA::NamespaceB::StructInNestedNS *mutable_foo_struct() { return GetStruct<NamespaceA::NamespaceB::StructInNestedNS *>(8); }
+  enum {
+    VT_FOO_TABLE = 4,
+    VT_FOO_ENUM = 6,
+    VT_FOO_STRUCT = 8,
+  };
+  const NamespaceA::NamespaceB::TableInNestedNS *foo_table() const { return GetPointer<const NamespaceA::NamespaceB::TableInNestedNS *>(VT_FOO_TABLE); }
+  NamespaceA::NamespaceB::TableInNestedNS *mutable_foo_table() { return GetPointer<NamespaceA::NamespaceB::TableInNestedNS *>(VT_FOO_TABLE); }
+  NamespaceA::NamespaceB::EnumInNestedNS foo_enum() const { return static_cast<NamespaceA::NamespaceB::EnumInNestedNS>(GetField<int8_t>(VT_FOO_ENUM, 0)); }
+  bool mutate_foo_enum(NamespaceA::NamespaceB::EnumInNestedNS _foo_enum) { return SetField(VT_FOO_ENUM, static_cast<int8_t>(_foo_enum)); }
+  const NamespaceA::NamespaceB::StructInNestedNS *foo_struct() const { return GetStruct<const NamespaceA::NamespaceB::StructInNestedNS *>(VT_FOO_STRUCT); }
+  NamespaceA::NamespaceB::StructInNestedNS *mutable_foo_struct() { return GetStruct<NamespaceA::NamespaceB::StructInNestedNS *>(VT_FOO_STRUCT); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 4 /* foo_table */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_FOO_TABLE) &&
            verifier.VerifyTable(foo_table()) &&
-           VerifyField<int8_t>(verifier, 6 /* foo_enum */) &&
-           VerifyField<NamespaceA::NamespaceB::StructInNestedNS>(verifier, 8 /* foo_struct */) &&
+           VerifyField<int8_t>(verifier, VT_FOO_ENUM) &&
+           VerifyField<NamespaceA::NamespaceB::StructInNestedNS>(verifier, VT_FOO_STRUCT) &&
            verifier.EndTable();
   }
 };
@@ -36,9 +43,9 @@ struct TableInFirstNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
 struct TableInFirstNSBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
-  void add_foo_table(flatbuffers::Offset<NamespaceA::NamespaceB::TableInNestedNS> foo_table) { fbb_.AddOffset(4, foo_table); }
-  void add_foo_enum(NamespaceA::NamespaceB::EnumInNestedNS foo_enum) { fbb_.AddElement<int8_t>(6, static_cast<int8_t>(foo_enum), 0); }
-  void add_foo_struct(const NamespaceA::NamespaceB::StructInNestedNS *foo_struct) { fbb_.AddStruct(8, foo_struct); }
+  void add_foo_table(flatbuffers::Offset<NamespaceA::NamespaceB::TableInNestedNS> foo_table) { fbb_.AddOffset(TableInFirstNS::VT_FOO_TABLE, foo_table); }
+  void add_foo_enum(NamespaceA::NamespaceB::EnumInNestedNS foo_enum) { fbb_.AddElement<int8_t>(TableInFirstNS::VT_FOO_ENUM, static_cast<int8_t>(foo_enum), 0); }
+  void add_foo_struct(const NamespaceA::NamespaceB::StructInNestedNS *foo_struct) { fbb_.AddStruct(TableInFirstNS::VT_FOO_STRUCT, foo_struct); }
   TableInFirstNSBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   TableInFirstNSBuilder &operator=(const TableInFirstNSBuilder &);
   flatbuffers::Offset<TableInFirstNS> Finish() {
diff --git a/tests/namespace_test/namespace_test2_generated.js b/tests/namespace_test/namespace_test2_generated.js
new file mode 100644
index 000000000..e99d77573
--- /dev/null
+++ b/tests/namespace_test/namespace_test2_generated.js
@@ -0,0 +1,115 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+/**
+ * @const
+*/
+var NamespaceA = NamespaceA || {};
+
+/**
+ * @const
+*/
+NamespaceA.NamespaceB = NamespaceA.NamespaceB || {};
+
+/**
+ * @constructor
+ */
+NamespaceA.TableInFirstNS = function() {
+  /**
+   * @type {flatbuffers.ByteBuffer}
+   */
+  this.bb = null;
+
+  /**
+   * @type {number}
+   */
+  this.bb_pos = 0;
+};
+
+/**
+ * @param {number} i
+ * @param {flatbuffers.ByteBuffer} bb
+ * @returns {NamespaceA.TableInFirstNS}
+ */
+NamespaceA.TableInFirstNS.prototype.__init = function(i, bb) {
+  this.bb_pos = i;
+  this.bb = bb;
+  return this;
+};
+
+/**
+ * @param {flatbuffers.ByteBuffer} bb
+ * @param {NamespaceA.TableInFirstNS=} obj
+ * @returns {NamespaceA.TableInFirstNS}
+ */
+NamespaceA.TableInFirstNS.getRootAsTableInFirstNS = function(bb, obj) {
+  return (obj || new NamespaceA.TableInFirstNS).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+};
+
+/**
+ * @param {NamespaceA.NamespaceB.TableInNestedNS=} obj
+ * @returns {NamespaceA.NamespaceB.TableInNestedNS}
+ */
+NamespaceA.TableInFirstNS.prototype.fooTable = function(obj) {
+  var offset = this.bb.__offset(this.bb_pos, 4);
+  return offset ? (obj || new NamespaceA.NamespaceB.TableInNestedNS).__init(this.bb.__indirect(this.bb_pos + offset), this.bb) : null;
+};
+
+/**
+ * @returns {NamespaceA.NamespaceB.EnumInNestedNS}
+ */
+NamespaceA.TableInFirstNS.prototype.fooEnum = function() {
+  var offset = this.bb.__offset(this.bb_pos, 6);
+  return offset ? /** @type {NamespaceA.NamespaceB.EnumInNestedNS} */ (this.bb.readInt8(this.bb_pos + offset)) : NamespaceA.NamespaceB.EnumInNestedNS.A;
+};
+
+/**
+ * @param {NamespaceA.NamespaceB.StructInNestedNS=} obj
+ * @returns {NamespaceA.NamespaceB.StructInNestedNS}
+ */
+NamespaceA.TableInFirstNS.prototype.fooStruct = function(obj) {
+  var offset = this.bb.__offset(this.bb_pos, 8);
+  return offset ? (obj || new NamespaceA.NamespaceB.StructInNestedNS).__init(this.bb_pos + offset, this.bb) : null;
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ */
+NamespaceA.TableInFirstNS.startTableInFirstNS = function(builder) {
+  builder.startObject(3);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {flatbuffers.Offset} fooTableOffset
+ */
+NamespaceA.TableInFirstNS.addFooTable = function(builder, fooTableOffset) {
+  builder.addFieldOffset(0, fooTableOffset, 0);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {NamespaceA.NamespaceB.EnumInNestedNS} fooEnum
+ */
+NamespaceA.TableInFirstNS.addFooEnum = function(builder, fooEnum) {
+  builder.addFieldInt8(1, fooEnum, NamespaceA.NamespaceB.EnumInNestedNS.A);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {flatbuffers.Offset} fooStructOffset
+ */
+NamespaceA.TableInFirstNS.addFooStruct = function(builder, fooStructOffset) {
+  builder.addFieldStruct(2, fooStructOffset, 0);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @returns {flatbuffers.Offset}
+ */
+NamespaceA.TableInFirstNS.endTableInFirstNS = function(builder) {
+  var offset = builder.endObject();
+  return offset;
+};
+
+// Exports for Node.js and RequireJS
+this.NamespaceA = NamespaceA;
diff --git a/tests/test.cpp b/tests/test.cpp
index be364d407..f27b9bdfc 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -21,6 +21,8 @@
 #include "flatbuffers/util.h"
 
 #include "monster_test_generated.h"
+#include "namespace_test/namespace_test1_generated.h"
+#include "namespace_test/namespace_test2_generated.h"
 
 #include <random>
 

From 99249ada014fcef009e1de98d23af13921e4630e Mon Sep 17 00:00:00 2001
From: Aaron Critchley <aaron.critchley@gmail.com>
Date: Tue, 15 Dec 2015 21:06:01 +0000
Subject: [PATCH 028/185] Linking to SO tag and improving readability

---
 readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 40430e20c..9a4bd5598 100755
--- a/readme.md
+++ b/readme.md
@@ -18,8 +18,7 @@ Windows, OS X, Linux), see `docs/html/index.html`
 
 Discuss FlatBuffers with other developers and users on the
 [FlatBuffers Google Group][]. File issues on the [FlatBuffers Issues Tracker][]
-or post your questions to [stackoverflow.com][] with a mention of
-**flatbuffers**.
+or post your questions to [stackoverflow.com][] using the [`flatbuffers` tag][].
 
 For applications on Google Play that integrate this tool, usage is tracked.
 This tracking is done automatically using the embedded version string
@@ -34,3 +33,4 @@ you would leave it in.
   [FlatBuffers Issues Tracker]: http://github.com/google/flatbuffers/issues
   [stackoverflow.com]: http://www.stackoverflow.com
   [landing page]: http://google.github.io/flatbuffers
+  [`flatbuffers` tag]: https://stackoverflow.com/questions/tagged/flatbuffers

From c9198dbbb8422306cb2d3b05b232ee114317e3f6 Mon Sep 17 00:00:00 2001
From: Shuhei Tanuma <chobieee@gmail.com>
Date: Thu, 17 Dec 2015 11:35:31 +0900
Subject: [PATCH 029/185] (PHP) fixes getting indirect table, also fixes getInt
 method on 32bit machine.

---
 php/ByteBuffer.php               |   9 +++++++--
 src/idl_gen_php.cpp              |   8 +++++++-
 tests/MyGame/Example/Monster.php |   4 ++--
 tests/generate_code.bat          |   1 +
 tests/generate_code.sh           |   1 +
 tests/monsterdata_indirect.json  |   6 ++++++
 tests/monsterdata_indirect.mon   | Bin 0 -> 156 bytes
 tests/phpTest.php                |  13 ++++++++++++-
 8 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 tests/monsterdata_indirect.json
 create mode 100644 tests/monsterdata_indirect.mon

diff --git a/php/ByteBuffer.php b/php/ByteBuffer.php
index 9ab9717af..9929a7df1 100644
--- a/php/ByteBuffer.php
+++ b/php/ByteBuffer.php
@@ -399,8 +399,13 @@ class ByteBuffer
         $sign = $index + (ByteBuffer::isLittleEndian() ? 3 : 0);
         $issigned = isset($this->_buffer[$sign]) && ord($this->_buffer[$sign]) & 0x80;
 
-        // 4294967296 = 1 << 32 = Maximum unsigned 32-bit int
-        return $issigned ? $result - 4294967296 : $result;
+        if (PHP_INT_SIZE > 4) {
+            // 4294967296 = 1 << 32 = Maximum unsigned 32-bit int
+            return $issigned ? $result - 4294967296 : $result;
+        } else {
+            // 32bit / Windows treated number as signed integer.
+            return $result;
+        }
     }
 
     /**
diff --git a/src/idl_gen_php.cpp b/src/idl_gen_php.cpp
index 2aa7e222e..2488b1d18 100644
--- a/src/idl_gen_php.cpp
+++ b/src/idl_gen_php.cpp
@@ -249,7 +249,13 @@ namespace php {
         NumToString(field.value.offset) +
         ");\n";
       code += Indent + Indent;
-      code += "return $o != 0 ? $obj->init($o + $this->bb_pos, $this->bb) : ";
+      code += "return $o != 0 ? $obj->init(";
+	  if (field.value.type.struct_def->fixed)
+      {
+        code += "$o + $this->bb_pos, $this->bb) : ";
+      } else {
+        code += "$this->__indirect($o + $this->bb_pos), $this->bb) : ";
+      }
       code += GenDefaultValue(field.value) + ";\n";
       code += Indent + "}\n\n";
     }
diff --git a/tests/MyGame/Example/Monster.php b/tests/MyGame/Example/Monster.php
index 94a0df7d9..6c1d34a0b 100644
--- a/tests/MyGame/Example/Monster.php
+++ b/tests/MyGame/Example/Monster.php
@@ -188,7 +188,7 @@ class Monster extends Table
     {
         $obj = new Monster();
         $o = $this->__offset(28);
-        return $o != 0 ? $obj->init($o + $this->bb_pos, $this->bb) : 0;
+        return $o != 0 ? $obj->init($this->__indirect($o + $this->bb_pos), $this->bb) : 0;
     }
 
     /**
@@ -214,7 +214,7 @@ class Monster extends Table
     {
         $obj = new Stat();
         $o = $this->__offset(32);
-        return $o != 0 ? $obj->init($o + $this->bb_pos, $this->bb) : 0;
+        return $o != 0 ? $obj->init($this->__indirect($o + $this->bb_pos), $this->bb) : 0;
     }
 
     /**
diff --git a/tests/generate_code.bat b/tests/generate_code.bat
index 75ac1433e..c46d10af6 100644
--- a/tests/generate_code.bat
+++ b/tests/generate_code.bat
@@ -1,2 +1,3 @@
 ..\flatc.exe -c -j -n -g -b -p --php -s --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
 ..\flatc.exe -b --schema monster_test.fbs
+..\flatc.exe -b .\monster_test.fbs .\monsterdata_indirect.json
\ No newline at end of file
diff --git a/tests/generate_code.sh b/tests/generate_code.sh
index 91661f30d..de736da5c 100644
--- a/tests/generate_code.sh
+++ b/tests/generate_code.sh
@@ -1,2 +1,3 @@
 ../flatc --cpp --java --csharp --go --binary --python --js --php --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
 ../flatc --binary --schema monster_test.fbs
+../flatc --binary monster_test.fbs monsterdata_indirect.json
\ No newline at end of file
diff --git a/tests/monsterdata_indirect.json b/tests/monsterdata_indirect.json
new file mode 100644
index 000000000..297c1721f
--- /dev/null
+++ b/tests/monsterdata_indirect.json
@@ -0,0 +1,6 @@
+{
+  "name": "Gob",
+  "enemy": {
+    "name": "Awk"
+  }
+}
\ No newline at end of file
diff --git a/tests/monsterdata_indirect.mon b/tests/monsterdata_indirect.mon
new file mode 100644
index 0000000000000000000000000000000000000000..f6262f32d7ef8ca17f248065de056846ffb8b24f
GIT binary patch
literal 156
zcmZ=@U|{g|_X}oVFk|2YvO$0aLLreHNNiN58IT(Q#5Q1IGX|JSOfyjRA@e|HfYdVs
Ov155Qn0C)kVgLYoBLz(W

literal 0
HcmV?d00001

diff --git a/tests/phpTest.php b/tests/phpTest.php
index e91e47a1d..027780cc1 100644
--- a/tests/phpTest.php
+++ b/tests/phpTest.php
@@ -74,6 +74,9 @@ function main()
     fuzzTest1($assert);
 //    testUnicode($assert);
 
+
+    testIndirectBuffer($assert);
+
     echo 'FlatBuffers php test: completed successfully' . PHP_EOL;
 }
 
@@ -587,7 +590,15 @@ function testByteBuffer(Assert $assert) {
     $assert->Equal(0x0D0C0B0A, $uut->readLittleEndian(0, 4, true));
 
 }
-
+function testIndirectBuffer(Assert $assert)
+{
+    $js = json_decode(file_get_contents('monsterdata_indirect.json'), true);
+    $data = file_get_contents('monsterdata_indirect.mon');
+    $bb = Google\FlatBuffers\ByteBuffer::wrap($data);
+    $mons = \MyGame\Example\Monster::getRootAsMonster($bb);
+    $assert->Equal($js["name"], $mons->getName());
+    $assert->Equal($js["enemy"]["name"], $mons->getEnemy()->getName());
+}
 class Assert {
     public function ok($result, $message = "") {
         if (!$result){

From 40a33b1d0683d3d732620b7f8adb6c34678a5910 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 9 Dec 2015 18:06:56 -0800
Subject: [PATCH 030/185] Replaced exception handling in the parser with error
 checking.

This to allow the code to run on a greater range of build
configurations (that don't allow exceptions/RTTI).

If anyone ever doubts the usefulness of exception handling,
please show them this commit.

Change-Id: If7190babdde93c3f9cd97b8e1ab447bf0c81696d
Tested: on Linux.
---
 CMakeLists.txt            |    2 +-
 include/flatbuffers/idl.h |  111 ++--
 src/idl_parser.cpp        | 1133 ++++++++++++++++++++-----------------
 3 files changed, 708 insertions(+), 538 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dc73e7a8..e58ead5f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ if(APPLE)
     "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
 elseif(CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra -Werror=shadow")
+    "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra -Werror=shadow -Wunused-result -Werror=unused-result")
 elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   set(CMAKE_CXX_FLAGS
       "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index 1ed360be1..118a74dd8 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -340,6 +340,46 @@ struct IDLOptions {
       lang(IDLOptions::kJava) {}
 };
 
+// A way to make error propagation less error prone by requiring values to be
+// checked.
+// Once you create a value of this type you must either:
+// - Call Check() on it.
+// - Copy or assign it to another value.
+// Failure to do so leads to an assert.
+// This guarantees that this as return value cannot be ignored.
+class CheckedError {
+ public:
+  explicit CheckedError(bool error)
+    : is_error_(error), has_been_checked_(false) {}
+
+  CheckedError &operator=(const CheckedError &other) {
+    is_error_ = other.is_error_;
+    has_been_checked_ = false;
+    other.has_been_checked_ = true;
+    return *this;
+  }
+
+  CheckedError(const CheckedError &other) {
+    *this = other;  // Use assignment operator.
+  }
+
+  ~CheckedError() { assert(has_been_checked_); }
+
+  bool Check() { has_been_checked_ = true; return is_error_; }
+
+ private:
+  bool is_error_;
+  mutable bool has_been_checked_;
+};
+
+// Additionally, in GCC we can get these errors statically, for additional
+// assurance:
+#ifdef __GNUC__
+#define CHECKED_ERROR CheckedError __attribute__((warn_unused_result))
+#else
+#define CHECKED_ERROR CheckedError
+#endif
+
 class Parser {
  public:
   explicit Parser(const IDLOptions &options = IDLOptions())
@@ -395,44 +435,51 @@ class Parser {
   // See reflection/reflection.fbs
   void Serialize();
 
- private:
-  int64_t ParseHexNum(int nibbles);
-  void Next();
-  bool IsNext(int t);
-  void Expect(int t);
+  CHECKED_ERROR CheckBitsFit(int64_t val, size_t bits);
+
+private:
+  CHECKED_ERROR Error(const std::string &msg);
+  CHECKED_ERROR ParseHexNum(int nibbles, int64_t *val);
+  CHECKED_ERROR Next();
+  bool Is(int t);
+  CHECKED_ERROR Expect(int t);
   std::string TokenToStringId(int t);
   EnumDef *LookupEnum(const std::string &id);
-  void ParseNamespacing(std::string *id, std::string *last);
-  void ParseTypeIdent(Type &type);
-  void ParseType(Type &type);
-  FieldDef &AddField(StructDef &struct_def,
-                     const std::string &name,
-                     const Type &type);
-  void ParseField(StructDef &struct_def);
-  void ParseAnyValue(Value &val, FieldDef *field, size_t parent_fieldn);
-  uoffset_t ParseTable(const StructDef &struct_def, std::string *value);
+  CHECKED_ERROR ParseNamespacing(std::string *id, std::string *last);
+  CHECKED_ERROR ParseTypeIdent(Type &type);
+  CHECKED_ERROR ParseType(Type &type);
+  CHECKED_ERROR AddField(StructDef &struct_def, const std::string &name,
+                         const Type &type, FieldDef **dest);
+  CHECKED_ERROR ParseField(StructDef &struct_def);
+  CHECKED_ERROR ParseAnyValue(Value &val, FieldDef *field, size_t parent_fieldn);
+  CHECKED_ERROR ParseTable(const StructDef &struct_def, std::string *value,
+                           uoffset_t *ovalue);
   void SerializeStruct(const StructDef &struct_def, const Value &val);
   void AddVector(bool sortbysize, int count);
-  uoffset_t ParseVector(const Type &type);
-  void ParseMetaData(Definition &def);
-  bool TryTypedValue(int dtoken, bool check, Value &e, BaseType req);
-  void ParseHash(Value &e, FieldDef* field);
-  void ParseSingleValue(Value &e);
-  int64_t ParseIntegerFromString(Type &type);
+  CHECKED_ERROR ParseVector(const Type &type, uoffset_t *ovalue);
+  CHECKED_ERROR ParseMetaData(Definition &def);
+  CHECKED_ERROR TryTypedValue(int dtoken, bool check, Value &e, BaseType req,
+                              bool *destmatch);
+  CHECKED_ERROR ParseHash(Value &e, FieldDef* field);
+  CHECKED_ERROR ParseSingleValue(Value &e);
+  CHECKED_ERROR ParseIntegerFromString(Type &type, int64_t *result);
   StructDef *LookupCreateStruct(const std::string &name,
                                 bool create_if_new = true,
                                 bool definition = false);
-  EnumDef &ParseEnum(bool is_union);
-  void ParseNamespace();
-  StructDef &StartStruct(const std::string &name);
-  void ParseDecl();
-  void ParseProtoFields(StructDef *struct_def, bool isextend,
-                        bool inside_oneof);
-  void ParseProtoOption();
-  void ParseProtoKey();
-  void ParseProtoDecl();
-  void ParseProtoCurliesOrIdent();
-  Type ParseTypeFromProtoType();
+  CHECKED_ERROR ParseEnum(bool is_union, EnumDef **dest);
+  CHECKED_ERROR ParseNamespace();
+  CHECKED_ERROR StartStruct(const std::string &name, StructDef **dest);
+  CHECKED_ERROR ParseDecl();
+  CHECKED_ERROR ParseProtoFields(StructDef *struct_def, bool isextend,
+                                 bool inside_oneof);
+  CHECKED_ERROR ParseProtoOption();
+  CHECKED_ERROR ParseProtoKey();
+  CHECKED_ERROR ParseProtoDecl();
+  CHECKED_ERROR ParseProtoCurliesOrIdent();
+  CHECKED_ERROR ParseTypeFromProtoType(Type *type);
+
+  CHECKED_ERROR DoParse(const char *_source, const char **include_paths,
+                        const char *source_filename);
 
  public:
   SymbolTable<StructDef> structs_;
@@ -454,7 +501,7 @@ class Parser {
   const char *source_, *cursor_;
   int line_;  // the current line being parsed
   int token_;
-  std::string files_being_parsed_;
+  std::string file_being_parsed_;
 
   std::string attribute_;
   std::vector<std::string> doc_comment_;
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 9b62075de..6a013c90f 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -43,38 +43,68 @@ static_assert(BASE_TYPE_UNION ==
               static_cast<BaseType>(reflection::Union),
               "enums don't match");
 
-static void Error(const std::string &msg) {
-  throw msg;
+#define ECHECK(call) { auto ce = (call); if (ce.Check()) return ce; }
+#define NEXT() ECHECK(Next())
+#define EXPECT(tok) ECHECK(Expect(tok))
+
+CheckedError Parser::Error(const std::string &msg) {
+  error_ = file_being_parsed_.length() ? AbsolutePath(file_being_parsed_) : "";
+  #ifdef _WIN32
+    error_ += "(" + NumToString(line_) + ")";  // MSVC alike
+  #else
+    if (file_being_parsed_.length()) error_ += ":";
+    error_ += NumToString(line_) + ":0";  // gcc alike
+  #endif
+  error_ += ": error: " + msg;
+  return CheckedError(true);
 }
 
+inline CheckedError NoError() { return CheckedError(false); }
+
 // Ensure that integer values we parse fit inside the declared integer type.
-static void CheckBitsFit(int64_t val, size_t bits) {
+CheckedError Parser::CheckBitsFit(int64_t val, size_t bits) {
   // Bits we allow to be used.
   auto mask = static_cast<int64_t>((1ull << bits) - 1);
   if (bits < 64 &&
       (val & ~mask) != 0 &&  // Positive or unsigned.
       (val |  mask) != -1)   // Negative.
-    Error("constant does not fit in a " + NumToString(bits) + "-bit field");
+    return Error("constant does not fit in a " + NumToString(bits) +
+                 "-bit field");
+  return NoError();
 }
 
 // atot: templated version of atoi/atof: convert a string to an instance of T.
-template<typename T> inline T atot(const char *s) {
-  auto val = StringToInt(s);
-  CheckBitsFit(val, sizeof(T) * 8);
-  return (T)val;
+template<typename T> inline CheckedError atot(const char *s, Parser &parser,
+                                              T *val) {
+  int64_t i = StringToInt(s);
+  ECHECK(parser.CheckBitsFit(i, sizeof(T) * 8));
+  *val = (T)i;
+  return NoError();
 }
-template<> inline bool atot<bool>(const char *s) {
-  return 0 != atoi(s);
+template<> inline CheckedError atot<bool>(const char *s, Parser &parser,
+                                          bool *val) {
+  (void)parser;
+  *val = 0 != atoi(s);
+  return NoError();
 }
-template<> inline float atot<float>(const char *s) {
-  return static_cast<float>(strtod(s, nullptr));
+template<> inline CheckedError atot<float>(const char *s, Parser &parser,
+                                           float *val) {
+  (void)parser;
+  *val = static_cast<float>(strtod(s, nullptr));
+  return NoError();
 }
-template<> inline double atot<double>(const char *s) {
-  return strtod(s, nullptr);
+template<> inline CheckedError atot<double>(const char *s, Parser &parser,
+                                            double *val) {
+  (void)parser;
+  *val = strtod(s, nullptr);
+  return NoError();
 }
 
-template<> inline Offset<void> atot<Offset<void>>(const char *s) {
-  return Offset<void>(atoi(s));
+template<> inline CheckedError atot<Offset<void>>(const char *s, Parser &parser,
+                                                  Offset<void> *val) {
+  (void)parser;
+  *val = Offset<void>(atoi(s));
+  return NoError();
 }
 
 std::string Namespace::GetFullyQualifiedName(const std::string &name,
@@ -153,18 +183,18 @@ std::string Parser::TokenToStringId(int t) {
 }
 
 // Parses exactly nibbles worth of hex digits into a number, or error.
-int64_t Parser::ParseHexNum(int nibbles) {
+CheckedError Parser::ParseHexNum(int nibbles, int64_t *val) {
   for (int i = 0; i < nibbles; i++)
     if (!isxdigit(cursor_[i]))
-      Error("escape code must be followed by " + NumToString(nibbles) +
-            " hex digits");
+      return Error("escape code must be followed by " + NumToString(nibbles) +
+                   " hex digits");
   std::string target(cursor_, cursor_ + nibbles);
-  auto val = StringToUInt(target.c_str(), 16);
+  *val = StringToUInt(target.c_str(), 16);
   cursor_ += nibbles;
-  return val;
+  return NoError();
 }
 
-void Parser::Next() {
+CheckedError Parser::Next() {
   doc_comment_.clear();
   bool seen_newline = false;
   attribute_.clear();
@@ -172,20 +202,19 @@ void Parser::Next() {
     char c = *cursor_++;
     token_ = c;
     switch (c) {
-      case '\0': cursor_--; token_ = kTokenEof; return;
+      case '\0': cursor_--; token_ = kTokenEof; return NoError();
       case ' ': case '\r': case '\t': break;
       case '\n': line_++; seen_newline = true; break;
-      case '{': case '}': case '(': case ')': case '[': case ']': return;
-      case ',': case ':': case ';': case '=': return;
+      case '{': case '}': case '(': case ')': case '[': case ']':
+      case ',': case ':': case ';': case '=': return NoError();
       case '.':
-        if(!isdigit(*cursor_)) return;
-        Error("floating point constant can\'t start with \".\"");
-        break;
+        if(!isdigit(*cursor_)) return NoError();
+        return Error("floating point constant can\'t start with \".\"");
       case '\"':
       case '\'':
         while (*cursor_ != c) {
           if (*cursor_ < ' ' && *cursor_ >= 0)
-            Error("illegal character in string constant");
+            return Error("illegal character in string constant");
           if (*cursor_ == '\\') {
             cursor_++;
             switch (*cursor_) {
@@ -200,15 +229,19 @@ void Parser::Next() {
               case '/':  attribute_ += '/';  cursor_++; break;
               case 'x': {  // Not in the JSON standard
                 cursor_++;
-                attribute_ += static_cast<char>(ParseHexNum(2));
+                int64_t val;
+                ECHECK(ParseHexNum(2, &val));
+                attribute_ += static_cast<char>(val);
                 break;
               }
               case 'u': {
                 cursor_++;
-                ToUTF8(static_cast<int>(ParseHexNum(4)), &attribute_);
+                int64_t val;
+                ECHECK(ParseHexNum(4, &val));
+                ToUTF8(static_cast<int>(val), &attribute_);
                 break;
               }
-              default: Error("unknown escape code in string constant"); break;
+              default: return Error("unknown escape code in string constant");
             }
           } else { // printable chars + UTF-8 bytes
             attribute_ += *cursor_++;
@@ -216,14 +249,15 @@ void Parser::Next() {
         }
         cursor_++;
         token_ = kTokenStringConstant;
-        return;
+        return NoError();
       case '/':
         if (*cursor_ == '/') {
           const char *start = ++cursor_;
           while (*cursor_ && *cursor_ != '\n' && *cursor_ != '\r') cursor_++;
           if (*start == '/') {  // documentation comment
             if (cursor_ != source_ && !seen_newline)
-              Error("a documentation comment should be on a line on its own");
+              return Error(
+                    "a documentation comment should be on a line on its own");
             doc_comment_.push_back(std::string(start + 1, cursor_));
           }
           break;
@@ -231,7 +265,7 @@ void Parser::Next() {
           cursor_++;
           // TODO: make nested.
           while (*cursor_ != '*' || cursor_[1] != '/') {
-            if (!*cursor_) Error("end of file in comment");
+            if (!*cursor_) return Error("end of file in comment");
             cursor_++;
           }
           cursor_ += 2;
@@ -251,7 +285,7 @@ void Parser::Next() {
             PTYPE) \
             if (attribute_ == IDLTYPE) { \
               token_ = kToken ## ENUM; \
-              return; \
+              return NoError(); \
             }
             FLATBUFFERS_GEN_TYPES(FLATBUFFERS_TD)
           #undef FLATBUFFERS_TD
@@ -260,28 +294,52 @@ void Parser::Next() {
           if (attribute_ == "true" || attribute_ == "false") {
             attribute_ = NumToString(attribute_ == "true");
             token_ = kTokenIntegerConstant;
-            return;
+            return NoError();
           }
           // Check for declaration keywords:
-          if (attribute_ == "table")     { token_ = kTokenTable;     return; }
-          if (attribute_ == "struct")    { token_ = kTokenStruct;    return; }
-          if (attribute_ == "enum")      { token_ = kTokenEnum;      return; }
-          if (attribute_ == "union")     { token_ = kTokenUnion;     return; }
-          if (attribute_ == "namespace") { token_ = kTokenNameSpace; return; }
-          if (attribute_ == "root_type") { token_ = kTokenRootType;  return; }
-          if (attribute_ == "include")   { token_ = kTokenInclude;   return; }
-          if (attribute_ == "attribute") { token_ = kTokenAttribute; return; }
+          if (attribute_ == "table") {
+            token_ = kTokenTable;
+            return NoError();
+          }
+          if (attribute_ == "struct") {
+            token_ = kTokenStruct;
+            return NoError();
+          }
+          if (attribute_ == "enum") {
+            token_ = kTokenEnum;
+            return NoError();
+          }
+          if (attribute_ == "union") {
+            token_ = kTokenUnion;
+            return NoError();
+          }
+          if (attribute_ == "namespace") {
+            token_ = kTokenNameSpace;
+            return NoError();
+          }
+          if (attribute_ == "root_type") {
+            token_ = kTokenRootType;
+            return NoError();
+          }
+          if (attribute_ == "include") {
+            token_ = kTokenInclude;
+            return NoError();
+          }
+          if (attribute_ == "attribute") {
+            token_ = kTokenAttribute;
+            return NoError();
+          }
           if (attribute_ == "file_identifier") {
             token_ = kTokenFileIdentifier;
-            return;
+            return NoError();
           }
           if (attribute_ == "file_extension") {
             token_ = kTokenFileExtension;
-            return;
+            return NoError();
           }
           // If not, it is a user-defined identifier:
           token_ = kTokenIdentifier;
-          return;
+          return NoError();
         } else if (isdigit(static_cast<unsigned char>(c)) || c == '-') {
           const char *start = cursor_ - 1;
           if (c == '0' && (*cursor_ == 'x' || *cursor_ == 'X')) {
@@ -290,7 +348,7 @@ void Parser::Next() {
               attribute_.append(start + 2, cursor_);
               attribute_ = NumToString(StringToUInt(attribute_.c_str(), 16));
               token_ = kTokenIntegerConstant;
-              return;
+              return NoError();
           }
           while (isdigit(static_cast<unsigned char>(*cursor_))) cursor_++;
           if (*cursor_ == '.' || *cursor_ == 'e' || *cursor_ == 'E') {
@@ -310,56 +368,57 @@ void Parser::Next() {
             token_ = kTokenIntegerConstant;
           }
           attribute_.append(start, cursor_);
-          return;
+          return NoError();
         }
         std::string ch;
         ch = c;
         if (c < ' ' || c > '~') ch = "code: " + NumToString(c);
-        Error("illegal character: " + ch);
-        break;
+        return Error("illegal character: " + ch);
     }
   }
 }
 
-// Check if a given token is next, if so, consume it as well.
-bool Parser::IsNext(int t) {
-  bool isnext = t == token_;
-  if (isnext) Next();
-  return isnext;
+// Check if a given token is next.
+bool Parser::Is(int t) {
+  return t == token_;
 }
 
 // Expect a given token to be next, consume it, or error if not present.
-void Parser::Expect(int t) {
+CheckedError Parser::Expect(int t) {
   if (t != token_) {
-    Error("expecting: " + TokenToString(t) + " instead got: " +
-          TokenToStringId(token_));
+    return Error("expecting: " + TokenToString(t) + " instead got: " +
+                 TokenToStringId(token_));
   }
-  Next();
+  NEXT();
+  return NoError();
 }
 
-void Parser::ParseNamespacing(std::string *id, std::string *last) {
-  while (IsNext('.')) {
+CheckedError Parser::ParseNamespacing(std::string *id, std::string *last) {
+  while (Is('.')) {
+    NEXT();
     *id += ".";
     *id += attribute_;
     if (last) *last = attribute_;
-    Expect(kTokenIdentifier);
+    EXPECT(kTokenIdentifier);
   }
+  return NoError();
 }
 
 EnumDef *Parser::LookupEnum(const std::string &id) {
   // Search thru parent namespaces.
   for (int components = static_cast<int>(namespaces_.back()->components.size());
        components >= 0; components--) {
-    auto ed = enums_.Lookup(namespaces_.back()->GetFullyQualifiedName(id, components));
+    auto ed = enums_.Lookup(
+                namespaces_.back()->GetFullyQualifiedName(id, components));
     if (ed) return ed;
   }
   return nullptr;
 }
 
-void Parser::ParseTypeIdent(Type &type) {
+CheckedError Parser::ParseTypeIdent(Type &type) {
   std::string id = attribute_;
-  Expect(kTokenIdentifier);
-  ParseNamespacing(&id, nullptr);
+  EXPECT(kTokenIdentifier);
+  ECHECK(ParseNamespacing(&id, nullptr));
   auto enum_def = LookupEnum(id);
   if (enum_def) {
     type = enum_def->underlying_type;
@@ -368,41 +427,45 @@ void Parser::ParseTypeIdent(Type &type) {
     type.base_type = BASE_TYPE_STRUCT;
     type.struct_def = LookupCreateStruct(id);
   }
+  return NoError();
 }
 
 // Parse any IDL type.
-void Parser::ParseType(Type &type) {
+CheckedError Parser::ParseType(Type &type) {
   if (token_ >= kTokenBOOL && token_ <= kTokenSTRING) {
     type.base_type = static_cast<BaseType>(token_ - kTokenNONE);
-    Next();
+    NEXT();
   } else {
     if (token_ == kTokenIdentifier) {
-      ParseTypeIdent(type);
+      ECHECK(ParseTypeIdent(type));
     } else if (token_ == '[') {
-      Next();
+      NEXT();
       Type subtype;
-      ParseType(subtype);
+      ECHECK(ParseType(subtype));
       if (subtype.base_type == BASE_TYPE_VECTOR) {
         // We could support this, but it will complicate things, and it's
         // easier to work around with a struct around the inner vector.
-        Error("nested vector types not supported (wrap in table first).");
+        return Error(
+              "nested vector types not supported (wrap in table first).");
       }
       if (subtype.base_type == BASE_TYPE_UNION) {
         // We could support this if we stored a struct of 2 elements per
         // union element.
-        Error("vector of union types not supported (wrap in table first).");
+        return Error(
+              "vector of union types not supported (wrap in table first).");
       }
       type = Type(BASE_TYPE_VECTOR, subtype.struct_def, subtype.enum_def);
       type.element = subtype.base_type;
-      Expect(']');
+      EXPECT(']');
     } else {
-      Error("illegal type syntax");
+      return Error("illegal type syntax");
     }
   }
+  return NoError();
 }
 
-FieldDef &Parser::AddField(StructDef &struct_def, const std::string &name,
-                           const Type &type) {
+CheckedError Parser::AddField(StructDef &struct_def, const std::string &name,
+                              const Type &type, FieldDef **dest) {
   auto &field = *new FieldDef();
   field.value.offset =
     FieldIndexToOffset(static_cast<voffset_t>(struct_def.fields.vec.size()));
@@ -420,36 +483,38 @@ FieldDef &Parser::AddField(StructDef &struct_def, const std::string &name,
     struct_def.bytesize += size;
   }
   if (struct_def.fields.Add(name, &field))
-    Error("field already exists: " + name);
-  return field;
+    return Error("field already exists: " + name);
+  *dest = &field;
+  return NoError();
 }
 
-void Parser::ParseField(StructDef &struct_def) {
+CheckedError Parser::ParseField(StructDef &struct_def) {
   std::string name = attribute_;
   std::vector<std::string> dc = doc_comment_;
-  Expect(kTokenIdentifier);
-  Expect(':');
+  EXPECT(kTokenIdentifier);
+  EXPECT(':');
   Type type;
-  ParseType(type);
+  ECHECK(ParseType(type));
 
   if (struct_def.fixed && !IsScalar(type.base_type) && !IsStruct(type))
-    Error("structs_ may contain only scalar or struct fields");
+    return Error("structs_ may contain only scalar or struct fields");
 
   FieldDef *typefield = nullptr;
   if (type.base_type == BASE_TYPE_UNION) {
     // For union fields, add a second auto-generated field to hold the type,
     // with _type appended as the name.
-    typefield = &AddField(struct_def, name + "_type",
-                          type.enum_def->underlying_type);
+    ECHECK(AddField(struct_def, name + "_type", type.enum_def->underlying_type,
+                    &typefield));
   }
 
-  auto &field = AddField(struct_def, name, type);
+  FieldDef *field;
+  ECHECK(AddField(struct_def, name, type, &field));
 
   if (token_ == '=') {
-    Next();
+    NEXT();
     if (!IsScalar(type.base_type))
-      Error("default values currently only supported for scalars");
-    ParseSingleValue(field.value);
+      return Error("default values currently only supported for scalars");
+    ECHECK(ParseSingleValue(field->value));
   }
 
   if (type.enum_def &&
@@ -457,59 +522,62 @@ void Parser::ParseField(StructDef &struct_def) {
       !struct_def.fixed &&
       !type.enum_def->attributes.Lookup("bit_flags") &&
       !type.enum_def->ReverseLookup(static_cast<int>(
-                         StringToInt(field.value.constant.c_str()))))
-    Error("enum " + type.enum_def->name +
+                         StringToInt(field->value.constant.c_str()))))
+    return Error("enum " + type.enum_def->name +
           " does not have a declaration for this field\'s default of " +
-          field.value.constant);
+          field->value.constant);
 
-  field.doc_comment = dc;
-  ParseMetaData(field);
-  field.deprecated = field.attributes.Lookup("deprecated") != nullptr;
-  auto hash_name = field.attributes.Lookup("hash");
+  field->doc_comment = dc;
+  ECHECK(ParseMetaData(*field));
+  field->deprecated = field->attributes.Lookup("deprecated") != nullptr;
+  auto hash_name = field->attributes.Lookup("hash");
   if (hash_name) {
     switch (type.base_type) {
       case BASE_TYPE_INT:
       case BASE_TYPE_UINT: {
         if (FindHashFunction32(hash_name->constant.c_str()) == nullptr)
-          Error("Unknown hashing algorithm for 32 bit types: " +
+          return Error("Unknown hashing algorithm for 32 bit types: " +
                 hash_name->constant);
         break;
       }
       case BASE_TYPE_LONG:
       case BASE_TYPE_ULONG: {
         if (FindHashFunction64(hash_name->constant.c_str()) == nullptr)
-          Error("Unknown hashing algorithm for 64 bit types: " +
+          return Error("Unknown hashing algorithm for 64 bit types: " +
                 hash_name->constant);
         break;
       }
       default:
-        Error("only int, uint, long and ulong data types support hashing.");
+        return Error(
+              "only int, uint, long and ulong data types support hashing.");
     }
   }
-  if (field.deprecated && struct_def.fixed)
-    Error("can't deprecate fields in a struct");
-  field.required = field.attributes.Lookup("required") != nullptr;
-  if (field.required && (struct_def.fixed ||
-                         IsScalar(field.value.type.base_type)))
-    Error("only non-scalar fields in tables may be 'required'");
-  field.key = field.attributes.Lookup("key") != nullptr;
-  if (field.key) {
+  if (field->deprecated && struct_def.fixed)
+    return Error("can't deprecate fields in a struct");
+  field->required = field->attributes.Lookup("required") != nullptr;
+  if (field->required && (struct_def.fixed ||
+                         IsScalar(field->value.type.base_type)))
+    return Error("only non-scalar fields in tables may be 'required'");
+  field->key = field->attributes.Lookup("key") != nullptr;
+  if (field->key) {
     if (struct_def.has_key)
-      Error("only one field may be set as 'key'");
+      return Error("only one field may be set as 'key'");
     struct_def.has_key = true;
-    if (!IsScalar(field.value.type.base_type)) {
-      field.required = true;
-      if (field.value.type.base_type != BASE_TYPE_STRING)
-        Error("'key' field must be string or scalar type");
+    if (!IsScalar(field->value.type.base_type)) {
+      field->required = true;
+      if (field->value.type.base_type != BASE_TYPE_STRING)
+        return Error("'key' field must be string or scalar type");
     }
   }
-  auto nested = field.attributes.Lookup("nested_flatbuffer");
+  auto nested = field->attributes.Lookup("nested_flatbuffer");
   if (nested) {
     if (nested->type.base_type != BASE_TYPE_STRING)
-      Error("nested_flatbuffer attribute must be a string (the root type)");
-    if (field.value.type.base_type != BASE_TYPE_VECTOR ||
-        field.value.type.element != BASE_TYPE_UCHAR)
-      Error("nested_flatbuffer attribute may only apply to a vector of ubyte");
+      return Error(
+            "nested_flatbuffer attribute must be a string (the root type)");
+    if (field->value.type.base_type != BASE_TYPE_VECTOR ||
+        field->value.type.element != BASE_TYPE_UCHAR)
+      return Error(
+            "nested_flatbuffer attribute may only apply to a vector of ubyte");
     // This will cause an error if the root type of the nested flatbuffer
     // wasn't defined elsewhere.
     LookupCreateStruct(nested->constant);
@@ -518,7 +586,7 @@ void Parser::ParseField(StructDef &struct_def) {
   if (typefield) {
     // If this field is a union, and it has a manually assigned id,
     // the automatically added type field should have an id as well (of N - 1).
-    auto attr = field.attributes.Lookup("id");
+    auto attr = field->attributes.Lookup("id");
     if (attr) {
       auto id = atoi(attr->constant.c_str());
       auto val = new Value();
@@ -528,35 +596,41 @@ void Parser::ParseField(StructDef &struct_def) {
     }
   }
 
-  Expect(';');
+  EXPECT(';');
+  return NoError();
 }
 
-void Parser::ParseAnyValue(Value &val, FieldDef *field, size_t parent_fieldn) {
+CheckedError Parser::ParseAnyValue(Value &val, FieldDef *field,
+                                   size_t parent_fieldn) {
   switch (val.type.base_type) {
     case BASE_TYPE_UNION: {
       assert(field);
       if (!parent_fieldn ||
           field_stack_.back().second->value.type.base_type != BASE_TYPE_UTYPE)
-        Error("missing type field before this union value: " + field->name);
-      auto enum_idx = atot<unsigned char>(
-                                    field_stack_.back().first.constant.c_str());
+        return Error("missing type field before this union value: " +
+                     field->name);
+      uint8_t enum_idx;
+      ECHECK(atot(field_stack_.back().first.constant.c_str(), *this,
+                  &enum_idx));
       auto enum_val = val.type.enum_def->ReverseLookup(enum_idx);
-      if (!enum_val) Error("illegal type id for: " + field->name);
-      ParseTable(*enum_val->struct_def, &val.constant);
+      if (!enum_val) return Error("illegal type id for: " + field->name);
+      ECHECK(ParseTable(*enum_val->struct_def, &val.constant, nullptr));
       break;
     }
     case BASE_TYPE_STRUCT:
-      ParseTable(*val.type.struct_def, &val.constant);
+      ECHECK(ParseTable(*val.type.struct_def, &val.constant, nullptr));
       break;
     case BASE_TYPE_STRING: {
       auto s = attribute_;
-      Expect(kTokenStringConstant);
+      EXPECT(kTokenStringConstant);
       val.constant = NumToString(builder_.CreateString(s).o);
       break;
     }
     case BASE_TYPE_VECTOR: {
-      Expect('[');
-      val.constant = NumToString(ParseVector(val.type.VectorType()));
+      EXPECT('[');
+      uoffset_t off;
+      ECHECK(ParseVector(val.type.VectorType(), &off));
+      val.constant = NumToString(off);
       break;
     }
     case BASE_TYPE_INT:
@@ -565,16 +639,17 @@ void Parser::ParseAnyValue(Value &val, FieldDef *field, size_t parent_fieldn) {
     case BASE_TYPE_ULONG: {
       if (field && field->attributes.Lookup("hash") &&
           (token_ == kTokenIdentifier || token_ == kTokenStringConstant)) {
-        ParseHash(val, field);
+        ECHECK(ParseHash(val, field));
       } else {
-        ParseSingleValue(val);
+        ECHECK(ParseSingleValue(val));
       }
       break;
     }
     default:
-      ParseSingleValue(val);
+      ECHECK(ParseSingleValue(val));
       break;
   }
+  return NoError();
 }
 
 void Parser::SerializeStruct(const StructDef &struct_def, const Value &val) {
@@ -585,35 +660,39 @@ void Parser::SerializeStruct(const StructDef &struct_def, const Value &val) {
   builder_.AddStructOffset(val.offset, builder_.GetSize());
 }
 
-uoffset_t Parser::ParseTable(const StructDef &struct_def, std::string *value) {
-  Expect('{');
+CheckedError Parser::ParseTable(const StructDef &struct_def, std::string *value,
+                                uoffset_t *ovalue) {
+  EXPECT('{');
   size_t fieldn = 0;
   for (;;) {
-    if ((!opts.strict_json || !fieldn) && IsNext('}')) break;
+    if ((!opts.strict_json || !fieldn) && Is('}')) { NEXT(); break; }
     std::string name = attribute_;
-    if (!IsNext(kTokenStringConstant))
-      Expect(opts.strict_json ? kTokenStringConstant : kTokenIdentifier);
+    if (Is(kTokenStringConstant)) {
+      NEXT();
+    } else {
+      EXPECT(opts.strict_json ? kTokenStringConstant : kTokenIdentifier);
+    }
     auto field = struct_def.fields.Lookup(name);
-    if (!field) Error("unknown field: " + name);
-    Expect(':');
+    if (!field) return Error("unknown field: " + name);
+    EXPECT(':');
     Value val = field->value;
-    ParseAnyValue(val, field, fieldn);
+    ECHECK(ParseAnyValue(val, field, fieldn));
     size_t i = field_stack_.size();
     // Hardcoded insertion-sort with error-check.
     // If fields are specified in order, then this loop exits immediately.
     for (; i > field_stack_.size() - fieldn; i--) {
       auto existing_field = field_stack_[i - 1].second;
       if (existing_field == field)
-        Error("field set more than once: " + field->name);
+        return Error("field set more than once: " + field->name);
       if (existing_field->value.offset < field->value.offset) break;
     }
     field_stack_.insert(field_stack_.begin() + i, std::make_pair(val, field));
     fieldn++;
-    if (IsNext('}')) break;
-    Expect(',');
+    if (Is('}')) { NEXT(); break; }
+    EXPECT(',');
   }
   if (struct_def.fixed && fieldn != struct_def.fields.vec.size())
-    Error("struct: wrong number of initializers: " + struct_def.name);
+    return Error("struct: wrong number of initializers: " + struct_def.name);
 
   auto start = struct_def.fixed
                  ? builder_.StartStruct(struct_def.minalign)
@@ -627,18 +706,22 @@ uoffset_t Parser::ParseTable(const StructDef &struct_def, std::string *value) {
              it != field_stack_.rbegin() + fieldn; ++it) {
       auto &field_value = it->first;
       auto field = it->second;
-      if (!struct_def.sortbysize || size == SizeOf(field_value.type.base_type)) {
+      if (!struct_def.sortbysize ||
+          size == SizeOf(field_value.type.base_type)) {
         switch (field_value.type.base_type) {
           #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, \
             PTYPE) \
             case BASE_TYPE_ ## ENUM: \
               builder_.Pad(field->padding); \
               if (struct_def.fixed) { \
-                builder_.PushElement(atot<CTYPE>(field_value.constant.c_str())); \
+                CTYPE val; \
+                ECHECK(atot(field_value.constant.c_str(), *this, &val)); \
+                builder_.PushElement(val); \
               } else { \
-                builder_.AddElement(field_value.offset, \
-                             atot<CTYPE>(       field_value.constant.c_str()), \
-                             atot<CTYPE>(field->value.constant.c_str())); \
+                CTYPE val, valdef; \
+                ECHECK(atot(field_value.constant.c_str(), *this, &val)); \
+                ECHECK(atot(field->value.constant.c_str(), *this, &valdef)); \
+                builder_.AddElement(field_value.offset, val, valdef); \
               } \
               break;
             FLATBUFFERS_GEN_TYPES_SCALAR(FLATBUFFERS_TD);
@@ -650,8 +733,9 @@ uoffset_t Parser::ParseTable(const StructDef &struct_def, std::string *value) {
               if (IsStruct(field->value.type)) { \
                 SerializeStruct(*field->value.type.struct_def, field_value); \
               } else { \
-                builder_.AddOffset(field_value.offset, \
-                  atot<CTYPE>(field_value.constant.c_str())); \
+                CTYPE val; \
+                ECHECK(atot(field_value.constant.c_str(), *this, &val)); \
+                builder_.AddOffset(field_value.offset, val); \
               } \
               break;
             FLATBUFFERS_GEN_TYPES_POINTER(FLATBUFFERS_TD);
@@ -672,27 +756,27 @@ uoffset_t Parser::ParseTable(const StructDef &struct_def, std::string *value) {
           reinterpret_cast<const char *>(builder_.GetCurrentBufferPointer()),
           struct_def.bytesize);
     builder_.PopBytes(struct_def.bytesize);
-    return 0xFFFFFFFF;  // Value not used by the caller.
+    assert(!ovalue);
   } else {
-    auto off = builder_.EndTable(
-      start,
-      static_cast<voffset_t>(struct_def.fields.vec.size()));
-    if (value) *value = NumToString(off);
-    return off;
+    auto val = builder_.EndTable(start,
+                          static_cast<voffset_t>(struct_def.fields.vec.size()));
+    if (ovalue) *ovalue = val;
+    if (value) *value = NumToString(val);
   }
+  return NoError();
 }
 
-uoffset_t Parser::ParseVector(const Type &type) {
+CheckedError Parser::ParseVector(const Type &type, uoffset_t *ovalue) {
   int count = 0;
   for (;;) {
-    if ((!opts.strict_json || !count) && IsNext(']')) break;
+    if ((!opts.strict_json || !count) && Is(']')) { NEXT(); break; }
     Value val;
     val.type = type;
-    ParseAnyValue(val, nullptr, 0);
+    ECHECK(ParseAnyValue(val, nullptr, 0));
     field_stack_.push_back(std::make_pair(val, nullptr));
     count++;
-    if (IsNext(']')) break;
-    Expect(',');
+    if (Is(']')) { NEXT(); break; }
+    EXPECT(',');
   }
 
   builder_.StartVector(count * InlineSize(type) / InlineAlignment(type),
@@ -704,7 +788,11 @@ uoffset_t Parser::ParseVector(const Type &type) {
       #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
         case BASE_TYPE_ ## ENUM: \
           if (IsStruct(val.type)) SerializeStruct(*val.type.struct_def, val); \
-          else builder_.PushElement(atot<CTYPE>(val.constant.c_str())); \
+          else { \
+             CTYPE elem; \
+             ECHECK(atot(val.constant.c_str(), *this, &elem)); \
+             builder_.PushElement(elem); \
+          } \
           break;
         FLATBUFFERS_GEN_TYPES(FLATBUFFERS_TD)
       #undef FLATBUFFERS_TD
@@ -713,51 +801,55 @@ uoffset_t Parser::ParseVector(const Type &type) {
   }
 
   builder_.ClearOffsets();
-  return builder_.EndVector(count);
+  *ovalue = builder_.EndVector(count);
+  return NoError();
 }
 
-void Parser::ParseMetaData(Definition &def) {
-  if (IsNext('(')) {
+CheckedError Parser::ParseMetaData(Definition &def) {
+  if (Is('(')) {
+    NEXT();
     for (;;) {
       auto name = attribute_;
-      Expect(kTokenIdentifier);
+      EXPECT(kTokenIdentifier);
       if (known_attributes_.find(name) == known_attributes_.end())
-        Error("user define attributes must be declared before use: " + name);
+        return Error("user define attributes must be declared before use: " +
+                     name);
       auto e = new Value();
       def.attributes.Add(name, e);
-      if (IsNext(':')) {
-        ParseSingleValue(*e);
+      if (Is(':')) {
+        NEXT();
+        ECHECK(ParseSingleValue(*e));
       }
-      if (IsNext(')')) break;
-      Expect(',');
+      if (Is(')')) { NEXT(); break; }
+      EXPECT(',');
     }
   }
+  return NoError();
 }
 
-bool Parser::TryTypedValue(int dtoken,
-                           bool check,
-                           Value &e,
-                           BaseType req) {
+CheckedError Parser::TryTypedValue(int dtoken, bool check, Value &e,
+                                   BaseType req, bool *destmatch) {
   bool match = dtoken == token_;
   if (match) {
+    *destmatch = true;
     e.constant = attribute_;
     if (!check) {
       if (e.type.base_type == BASE_TYPE_NONE) {
         e.type.base_type = req;
       } else {
-        Error(std::string("type mismatch: expecting: ") +
-              kTypeNames[e.type.base_type] +
-              ", found: " +
-              kTypeNames[req]);
+        return Error(std::string("type mismatch: expecting: ") +
+                     kTypeNames[e.type.base_type] +
+                     ", found: " +
+                     kTypeNames[req]);
       }
     }
-    Next();
+    NEXT();
   }
-  return match;
+  return NoError();
 }
 
-int64_t Parser::ParseIntegerFromString(Type &type) {
-  int64_t result = 0;
+CheckedError Parser::ParseIntegerFromString(Type &type, int64_t *result) {
+  *result = 0;
   // Parse one or more enum identifiers, separated by spaces.
   const char *next = attribute_.c_str();
   do {
@@ -773,29 +865,30 @@ int64_t Parser::ParseIntegerFromString(Type &type) {
     if (type.enum_def) {  // The field has an enum type
       auto enum_val = type.enum_def->vals.Lookup(word);
       if (!enum_val)
-        Error("unknown enum value: " + word +
+        return Error("unknown enum value: " + word +
               ", for enum: " + type.enum_def->name);
-      result |= enum_val->value;
+      *result |= enum_val->value;
     } else {  // No enum type, probably integral field.
       if (!IsInteger(type.base_type))
-        Error("not a valid value for this field: " + word);
+        return Error("not a valid value for this field: " + word);
       // TODO: could check if its a valid number constant here.
       const char *dot = strrchr(word.c_str(), '.');
-      if (!dot) Error("enum values need to be qualified by an enum type");
+      if (!dot)
+        return Error("enum values need to be qualified by an enum type");
       std::string enum_def_str(word.c_str(), dot);
       std::string enum_val_str(dot + 1, word.c_str() + word.length());
       auto enum_def = LookupEnum(enum_def_str);
-      if (!enum_def) Error("unknown enum: " + enum_def_str);
+      if (!enum_def) return Error("unknown enum: " + enum_def_str);
       auto enum_val = enum_def->vals.Lookup(enum_val_str);
-      if (!enum_val) Error("unknown enum value: " + enum_val_str);
-      result |= enum_val->value;
+      if (!enum_val) return Error("unknown enum value: " + enum_val_str);
+      *result |= enum_val->value;
     }
   } while(*next);
-  return result;
+  return NoError();
 }
 
 
-void Parser::ParseHash(Value &e, FieldDef* field) {
+CheckedError Parser::ParseHash(Value &e, FieldDef* field) {
   assert(field);
   Value *hash_name = field->attributes.Lookup("hash");
   switch (e.type.base_type) {
@@ -816,31 +909,41 @@ void Parser::ParseHash(Value &e, FieldDef* field) {
     default:
       assert(0);
   }
-  Next();
+  NEXT();
+  return NoError();
 }
 
-void Parser::ParseSingleValue(Value &e) {
+CheckedError Parser::ParseSingleValue(Value &e) {
   // First check if this could be a string/identifier enum value:
   if (e.type.base_type != BASE_TYPE_STRING &&
       e.type.base_type != BASE_TYPE_NONE &&
       (token_ == kTokenIdentifier || token_ == kTokenStringConstant)) {
-      e.constant = NumToString(ParseIntegerFromString(e.type));
-      Next();
-  } else if (TryTypedValue(kTokenIntegerConstant,
-                    IsScalar(e.type.base_type),
-                    e,
-                    BASE_TYPE_INT) ||
-      TryTypedValue(kTokenFloatConstant,
-                    IsFloat(e.type.base_type),
-                    e,
-                    BASE_TYPE_FLOAT) ||
-      TryTypedValue(kTokenStringConstant,
-                    e.type.base_type == BASE_TYPE_STRING,
-                    e,
-                    BASE_TYPE_STRING)) {
+    int64_t val;
+    ECHECK(ParseIntegerFromString(e.type, &val));
+    e.constant = NumToString(val);
+    NEXT();
   } else {
-    Error("cannot parse value starting with: " + TokenToStringId(token_));
+    bool match = false;
+    ECHECK(TryTypedValue(kTokenIntegerConstant,
+                         IsScalar(e.type.base_type),
+                         e,
+                         BASE_TYPE_INT,
+                         &match));
+    ECHECK(TryTypedValue(kTokenFloatConstant,
+                         IsFloat(e.type.base_type),
+                         e,
+                         BASE_TYPE_FLOAT,
+                         &match));
+    ECHECK(TryTypedValue(kTokenStringConstant,
+                         e.type.base_type == BASE_TYPE_STRING,
+                         e,
+                         BASE_TYPE_STRING,
+                         &match));
+    if (!match)
+      return Error("cannot parse value starting with: " +
+                   TokenToStringId(token_));
   }
+  return NoError();
 }
 
 StructDef *Parser::LookupCreateStruct(const std::string &name,
@@ -885,20 +988,20 @@ StructDef *Parser::LookupCreateStruct(const std::string &name,
   return struct_def;
 }
 
-EnumDef &Parser::ParseEnum(bool is_union) {
+CheckedError Parser::ParseEnum(bool is_union, EnumDef **dest) {
   std::vector<std::string> enum_comment = doc_comment_;
-  Next();
+  NEXT();
   std::string enum_name = attribute_;
-  Expect(kTokenIdentifier);
+  EXPECT(kTokenIdentifier);
   auto &enum_def = *new EnumDef();
   enum_def.name = enum_name;
-  enum_def.file = files_being_parsed_;
+  enum_def.file = file_being_parsed_;
   enum_def.doc_comment = enum_comment;
   enum_def.is_union = is_union;
   enum_def.defined_namespace = namespaces_.back();
   if (enums_.Add(namespaces_.back()->GetFullyQualifiedName(enum_name),
                  &enum_def))
-    Error("enum already exists: " + enum_name);
+    return Error("enum already exists: " + enum_name);
   if (is_union) {
     enum_def.underlying_type.base_type = BASE_TYPE_UTYPE;
     enum_def.underlying_type.enum_def = &enum_def;
@@ -908,107 +1011,119 @@ EnumDef &Parser::ParseEnum(bool is_union) {
     } else {
       // Give specialized error message, since this type spec used to
       // be optional in the first FlatBuffers release.
-      if (!IsNext(':')) Error("must specify the underlying integer type for this"
-                              " enum (e.g. \': short\', which was the default).");
+      if (!Is(':')) {
+        return Error("must specify the underlying integer type for this"
+              " enum (e.g. \': short\', which was the default).");
+      } else {
+        NEXT();
+      }
       // Specify the integer type underlying this enum.
-      ParseType(enum_def.underlying_type);
+      ECHECK(ParseType(enum_def.underlying_type));
       if (!IsInteger(enum_def.underlying_type.base_type))
-        Error("underlying enum type must be integral");
+        return Error("underlying enum type must be integral");
     }
     // Make this type refer back to the enum it was derived from.
     enum_def.underlying_type.enum_def = &enum_def;
   }
-  ParseMetaData(enum_def);
-  Expect('{');
+  ECHECK(ParseMetaData(enum_def));
+  EXPECT('{');
   if (is_union) enum_def.vals.Add("NONE", new EnumVal("NONE", 0));
-  do {
+  for (;;) {
     if (opts.proto_mode && attribute_ == "option") {
-      ParseProtoOption();
+      ECHECK(ParseProtoOption());
     } else {
       auto value_name = attribute_;
       auto full_name = value_name;
       std::vector<std::string> value_comment = doc_comment_;
-      Expect(kTokenIdentifier);
-      if (is_union) ParseNamespacing(&full_name, &value_name);
+      EXPECT(kTokenIdentifier);
+      if (is_union) ECHECK(ParseNamespacing(&full_name, &value_name));
       auto prevsize = enum_def.vals.vec.size();
       auto value = enum_def.vals.vec.size()
         ? enum_def.vals.vec.back()->value + 1
         : 0;
       auto &ev = *new EnumVal(value_name, value);
       if (enum_def.vals.Add(value_name, &ev))
-        Error("enum value already exists: " + value_name);
+        return Error("enum value already exists: " + value_name);
       ev.doc_comment = value_comment;
       if (is_union) {
         ev.struct_def = LookupCreateStruct(full_name);
       }
-      if (IsNext('=')) {
+      if (Is('=')) {
+        NEXT();
         ev.value = atoi(attribute_.c_str());
-        Expect(kTokenIntegerConstant);
+        EXPECT(kTokenIntegerConstant);
         if (!opts.proto_mode && prevsize &&
             enum_def.vals.vec[prevsize - 1]->value >= ev.value)
-          Error("enum values must be specified in ascending order");
+          return Error("enum values must be specified in ascending order");
       }
-      if (opts.proto_mode && IsNext('[')) {
+      if (opts.proto_mode && Is('[')) {
+        NEXT();
         // ignore attributes on enums.
-        while (token_ != ']') Next();
-        Next();
+        while (token_ != ']') NEXT();
+        NEXT();
       }
     }
-  } while (IsNext(opts.proto_mode ? ';' : ',') && token_ != '}');
-  Expect('}');
+    if (!Is(opts.proto_mode ? ';' : ',')) break;
+    NEXT();
+    if (Is('}')) break;
+  }
+  EXPECT('}');
   if (enum_def.attributes.Lookup("bit_flags")) {
     for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
          ++it) {
       if (static_cast<size_t>((*it)->value) >=
            SizeOf(enum_def.underlying_type.base_type) * 8)
-        Error("bit flag out of range of underlying integral type");
+        return Error("bit flag out of range of underlying integral type");
       (*it)->value = 1LL << (*it)->value;
     }
   }
-  return enum_def;
+  if (dest) *dest = &enum_def;
+  return NoError();
 }
 
-StructDef &Parser::StartStruct(const std::string &name) {
+CheckedError Parser::StartStruct(const std::string &name, StructDef **dest) {
   auto &struct_def = *LookupCreateStruct(name, true, true);
-  if (!struct_def.predecl) Error("datatype already exists: " + name);
+  if (!struct_def.predecl) return Error("datatype already exists: " + name);
   struct_def.predecl = false;
   struct_def.name = name;
-  struct_def.file = files_being_parsed_;
+  struct_def.file = file_being_parsed_;
   // Move this struct to the back of the vector just in case it was predeclared,
   // to preserve declaration order.
   *remove(structs_.vec.begin(), structs_.vec.end(), &struct_def) = &struct_def;
-  return struct_def;
+  *dest = &struct_def;
+  return NoError();
 }
 
-void Parser::ParseDecl() {
+CheckedError Parser::ParseDecl() {
   std::vector<std::string> dc = doc_comment_;
-  bool fixed = IsNext(kTokenStruct);
-  if (!fixed) Expect(kTokenTable);
+  bool fixed = Is(kTokenStruct);
+  if (fixed) NEXT() else EXPECT(kTokenTable);
   std::string name = attribute_;
-  Expect(kTokenIdentifier);
-  auto &struct_def = StartStruct(name);
-  struct_def.doc_comment = dc;
-  struct_def.fixed = fixed;
-  ParseMetaData(struct_def);
-  struct_def.sortbysize =
-    struct_def.attributes.Lookup("original_order") == nullptr && !fixed;
-  Expect('{');
-  while (token_ != '}') ParseField(struct_def);
-  auto force_align = struct_def.attributes.Lookup("force_align");
+  EXPECT(kTokenIdentifier);
+  StructDef *struct_def;
+  ECHECK(StartStruct(name, &struct_def));
+  struct_def->doc_comment = dc;
+  struct_def->fixed = fixed;
+  ECHECK(ParseMetaData(*struct_def));
+  struct_def->sortbysize =
+    struct_def->attributes.Lookup("original_order") == nullptr && !fixed;
+  EXPECT('{');
+  while (token_ != '}') ECHECK(ParseField(*struct_def));
+  auto force_align = struct_def->attributes.Lookup("force_align");
   if (fixed && force_align) {
     auto align = static_cast<size_t>(atoi(force_align->constant.c_str()));
     if (force_align->type.base_type != BASE_TYPE_INT ||
-        align < struct_def.minalign ||
+        align < struct_def->minalign ||
         align > 16 ||
         align & (align - 1))
-      Error("force_align must be a power of two integer ranging from the"
+      return Error("force_align must be a power of two integer ranging from the"
             "struct\'s natural alignment to 16");
-    struct_def.minalign = align;
+    struct_def->minalign = align;
   }
-  struct_def.PadLastField(struct_def.minalign);
+  struct_def->PadLastField(struct_def->minalign);
   // Check if this is a table that has manual id assignments
-  auto &fields = struct_def.fields.vec;
-  if (!struct_def.fixed && fields.size()) {
+  auto &fields = struct_def->fields.vec;
+  if (!struct_def->fixed && fields.size()) {
     size_t num_id_fields = 0;
     for (auto it = fields.begin(); it != fields.end(); ++it) {
       if ((*it)->attributes.Lookup("id")) num_id_fields++;
@@ -1017,7 +1132,8 @@ void Parser::ParseDecl() {
     if (num_id_fields) {
       // Then all fields must have them.
       if (num_id_fields != fields.size())
-        Error("either all fields or no fields must have an 'id' attribute");
+        return Error(
+              "either all fields or no fields must have an 'id' attribute");
       // Simply sort by id, then the fields are the same as if no ids had
       // been specified.
       std::sort(fields.begin(), fields.end(),
@@ -1029,7 +1145,7 @@ void Parser::ParseDecl() {
       // Verify we have a contiguous set, and reassign vtable offsets.
       for (int i = 0; i < static_cast<int>(fields.size()); i++) {
         if (i != atoi(fields[i]->attributes.Lookup("id")->constant.c_str()))
-          Error("field id\'s must be consecutive from 0, id " +
+          return Error("field id\'s must be consecutive from 0, id " +
                 NumToString(i) + " missing or set twice");
         fields[i]->value.offset = FieldIndexToOffset(static_cast<voffset_t>(i));
       }
@@ -1039,30 +1155,32 @@ void Parser::ParseDecl() {
   // This is not an ideal situation, but should occur very infrequently,
   // and allows us to keep using very readable names for type & length fields
   // without inducing compile errors.
-  auto CheckClash = [&fields, &struct_def](const char *suffix,
-                                           BaseType basetype) {
+  auto CheckClash = [&fields, &struct_def, this](const char *suffix,
+                                            BaseType basetype) -> CheckedError {
     auto len = strlen(suffix);
     for (auto it = fields.begin(); it != fields.end(); ++it) {
       auto &fname = (*it)->name;
       if (fname.length() > len &&
           fname.compare(fname.length() - len, len, suffix) == 0 &&
           (*it)->value.type.base_type != BASE_TYPE_UTYPE) {
-        auto field = struct_def.fields.Lookup(
+        auto field = struct_def->fields.Lookup(
                        fname.substr(0, fname.length() - len));
         if (field && field->value.type.base_type == basetype)
-          Error("Field " + fname +
+          return Error("Field " + fname +
                 " would clash with generated functions for field " +
                 field->name);
       }
     }
+    return NoError();
   };
-  CheckClash("_type", BASE_TYPE_UNION);
-  CheckClash("Type", BASE_TYPE_UNION);
-  CheckClash("_length", BASE_TYPE_VECTOR);
-  CheckClash("Length", BASE_TYPE_VECTOR);
-  CheckClash("_byte_vector", BASE_TYPE_STRING);
-  CheckClash("ByteVector", BASE_TYPE_STRING);
-  Expect('}');
+  ECHECK(CheckClash("_type", BASE_TYPE_UNION));
+  ECHECK(CheckClash("Type", BASE_TYPE_UNION));
+  ECHECK(CheckClash("_length", BASE_TYPE_VECTOR));
+  ECHECK(CheckClash("Length", BASE_TYPE_VECTOR));
+  ECHECK(CheckClash("_byte_vector", BASE_TYPE_STRING));
+  ECHECK(CheckClash("ByteVector", BASE_TYPE_STRING));
+  EXPECT('}');
+  return NoError();
 }
 
 bool Parser::SetRootType(const char *name) {
@@ -1087,44 +1205,46 @@ void Parser::MarkGenerated() {
   }
 }
 
-void Parser::ParseNamespace() {
-  Next();
+CheckedError Parser::ParseNamespace() {
+  NEXT();
   auto ns = new Namespace();
   namespaces_.push_back(ns);
   if (token_ != ';') {
     for (;;) {
       ns->components.push_back(attribute_);
-      Expect(kTokenIdentifier);
-      if (!IsNext('.')) break;
+      EXPECT(kTokenIdentifier);
+      if (Is('.')) NEXT() else break;
     }
   }
-  Expect(';');
+  EXPECT(';');
+  return NoError();
 }
 
 // Best effort parsing of .proto declarations, with the aim to turn them
 // in the closest corresponding FlatBuffer equivalent.
 // We parse everything as identifiers instead of keywords, since we don't
 // want protobuf keywords to become invalid identifiers in FlatBuffers.
-void Parser::ParseProtoDecl() {
+CheckedError Parser::ParseProtoDecl() {
   bool isextend = attribute_ == "extend";
   if (attribute_ == "package") {
     // These are identical in syntax to FlatBuffer's namespace decl.
-    ParseNamespace();
+    ECHECK(ParseNamespace());
   } else if (attribute_ == "message" || isextend) {
     std::vector<std::string> struct_comment = doc_comment_;
-    Next();
+    NEXT();
     StructDef *struct_def = nullptr;
     if (isextend) {
-      IsNext('.');  // qualified names may start with a . ?
+      if (Is('.')) NEXT();  // qualified names may start with a . ?
       auto id = attribute_;
-      Expect(kTokenIdentifier);
-      ParseNamespacing(&id, nullptr);
+      EXPECT(kTokenIdentifier);
+      ECHECK(ParseNamespacing(&id, nullptr));
       struct_def = LookupCreateStruct(id, false);
-      if (!struct_def) Error("cannot extend unknown message type: " + id);
+      if (!struct_def)
+        return Error("cannot extend unknown message type: " + id);
     } else {
       std::string name = attribute_;
-      Expect(kTokenIdentifier);
-      struct_def = &StartStruct(name);
+      EXPECT(kTokenIdentifier);
+      ECHECK(StartStruct(name, &struct_def));
       // Since message definitions can be nested, we create a new namespace.
       auto ns = new Namespace();
       // Copy of current namespace.
@@ -1134,7 +1254,7 @@ void Parser::ParseProtoDecl() {
       namespaces_.push_back(ns);
     }
     struct_def->doc_comment = struct_comment;
-    ParseProtoFields(struct_def, isextend, false);
+    ECHECK(ParseProtoFields(struct_def, isextend, false));
     if (!isextend) {
       // We have to remove the nested namespace, but we can't just throw it
       // away, so put it at the beginning of the vector.
@@ -1142,13 +1262,14 @@ void Parser::ParseProtoDecl() {
       namespaces_.pop_back();
       namespaces_.insert(namespaces_.begin(), ns);
     }
-    IsNext(';');
+    if (Is(';')) NEXT();
   } else if (attribute_ == "enum") {
     // These are almost the same, just with different terminator:
-    auto &enum_def = ParseEnum(false);
-    IsNext(';');
+    EnumDef *enum_def;
+    ECHECK(ParseEnum(false, &enum_def));
+    if (Is(';')) NEXT();
     // Protobuf allows them to be specified in any order, so sort afterwards.
-    auto &v = enum_def.vals.vec;
+    auto &v = enum_def->vals.vec;
     std::sort(v.begin(), v.end(), [](const EnumVal *a, const EnumVal *b) {
       return a->value < b->value;
     });
@@ -1158,46 +1279,48 @@ void Parser::ParseProtoDecl() {
       else ++it;
     }
   } else if (attribute_ == "syntax") {  // Skip these.
-    Next();
-    Expect('=');
-    Expect(kTokenStringConstant);
-    Expect(';');
+    NEXT();
+    EXPECT('=');
+    EXPECT(kTokenStringConstant);
+    EXPECT(';');
   } else if (attribute_ == "option") {  // Skip these.
-    ParseProtoOption();
-    Expect(';');
+    ECHECK(ParseProtoOption());
+    EXPECT(';');
   } else if (attribute_ == "service") {  // Skip these.
-    Next();
-    Expect(kTokenIdentifier);
-    ParseProtoCurliesOrIdent();
+    NEXT();
+    EXPECT(kTokenIdentifier);
+    ECHECK(ParseProtoCurliesOrIdent());
   } else {
-    Error("don\'t know how to parse .proto declaration starting with " +
+    return Error("don\'t know how to parse .proto declaration starting with " +
           TokenToStringId(token_));
   }
+  return NoError();
 }
 
-void Parser::ParseProtoFields(StructDef *struct_def, bool isextend,
-                              bool inside_oneof) {
-  Expect('{');
+CheckedError Parser::ParseProtoFields(StructDef *struct_def, bool isextend,
+                                      bool inside_oneof) {
+  EXPECT('{');
   while (token_ != '}') {
     if (attribute_ == "message" || attribute_ == "extend" ||
         attribute_ == "enum") {
       // Nested declarations.
-      ParseProtoDecl();
+      ECHECK(ParseProtoDecl());
     } else if (attribute_ == "extensions") {  // Skip these.
-      Next();
-      Expect(kTokenIntegerConstant);
-      if (IsNext(kTokenIdentifier)) {  // to
-        Next();  // num
+      NEXT();
+      EXPECT(kTokenIntegerConstant);
+      if (Is(kTokenIdentifier)) {
+        NEXT();  // to
+        NEXT();  // num
       }
-      Expect(';');
+      EXPECT(';');
     } else if (attribute_ == "option") {  // Skip these.
-      ParseProtoOption();
-      Expect(';');
+      ECHECK(ParseProtoOption());
+      EXPECT(';');
     } else if (attribute_ == "reserved") {  // Skip these.
-      Next();
-      Expect(kTokenIntegerConstant);
-      while (IsNext(',')) Expect(kTokenIntegerConstant);
-      Expect(';');
+      NEXT();
+      EXPECT(kTokenIntegerConstant);
+      while (Is(',')) { NEXT(); EXPECT(kTokenIntegerConstant); }
+      EXPECT(';');
     } else {
       std::vector<std::string> field_comment = doc_comment_;
       // Parse the qualifier.
@@ -1207,16 +1330,16 @@ void Parser::ParseProtoFields(StructDef *struct_def, bool isextend,
       if (!inside_oneof) {
         if (attribute_ == "optional") {
           // This is the default.
-          Expect(kTokenIdentifier);
+          EXPECT(kTokenIdentifier);
         } else if (attribute_ == "required") {
           required = true;
-          Expect(kTokenIdentifier);
+          EXPECT(kTokenIdentifier);
         } else if (attribute_ == "repeated") {
           repeated = true;
-          Expect(kTokenIdentifier);
+          EXPECT(kTokenIdentifier);
         } else if (attribute_ == "oneof") {
           oneof = true;
-          Expect(kTokenIdentifier);
+          EXPECT(kTokenIdentifier);
         } else {
           // can't error, proto3 allows decls without any of the above.
         }
@@ -1224,12 +1347,12 @@ void Parser::ParseProtoFields(StructDef *struct_def, bool isextend,
       StructDef *anonymous_struct = nullptr;
       Type type;
       if (attribute_ == "group" || oneof) {
-        if (!oneof) Expect(kTokenIdentifier);
+        if (!oneof) EXPECT(kTokenIdentifier);
         auto name = "Anonymous" + NumToString(anonymous_counter++);
-        anonymous_struct = &StartStruct(name);
+        ECHECK(StartStruct(name, &anonymous_struct));
         type = Type(BASE_TYPE_STRUCT, anonymous_struct);
       } else {
-        type = ParseTypeFromProtoType();
+        ECHECK(ParseTypeFromProtoType(&type));
       }
       // Repeated elements get mapped to a vector.
       if (repeated) {
@@ -1238,93 +1361,100 @@ void Parser::ParseProtoFields(StructDef *struct_def, bool isextend,
       }
       std::string name = attribute_;
       // Protos may use our keywords "attribute" & "namespace" as an identifier.
-      if (IsNext(kTokenAttribute) || IsNext(kTokenNameSpace)) {
+      if (Is(kTokenAttribute) || Is(kTokenNameSpace)) {
+        NEXT();
         // TODO: simpler to just not make these keywords?
         name += "_";  // Have to make it not a keyword.
       } else {
-        Expect(kTokenIdentifier);
+        EXPECT(kTokenIdentifier);
       }
       if (!oneof) {
         // Parse the field id. Since we're just translating schemas, not
         // any kind of binary compatibility, we can safely ignore these, and
         // assign our own.
-        Expect('=');
-        Expect(kTokenIntegerConstant);
+        EXPECT('=');
+        EXPECT(kTokenIntegerConstant);
       }
-      FieldDef *existing_field = nullptr;
+      FieldDef *field = nullptr;
       if (isextend) {
         // We allow a field to be re-defined when extending.
         // TODO: are there situations where that is problematic?
-        existing_field = struct_def->fields.Lookup(name);
+        field = struct_def->fields.Lookup(name);
       }
-      auto &field = existing_field
-                    ? *existing_field
-                    : AddField(*struct_def, name, type);
-      field.doc_comment = field_comment;
-      if (!IsScalar(type.base_type)) field.required = required;
+      if (!field) ECHECK(AddField(*struct_def, name, type, &field));
+      field->doc_comment = field_comment;
+      if (!IsScalar(type.base_type)) field->required = required;
       // See if there's a default specified.
-      if (IsNext('[')) {
-        do {
+      if (Is('[')) {
+        NEXT();
+        for (;;) {
           auto key = attribute_;
-          ParseProtoKey();
-          Expect('=');
+          ECHECK(ParseProtoKey());
+          EXPECT('=');
           auto val = attribute_;
-          ParseProtoCurliesOrIdent();
+          ECHECK(ParseProtoCurliesOrIdent());
           if (key == "default") {
             // Temp: skip non-numeric defaults (enums).
             auto numeric = strpbrk(val.c_str(), "0123456789-+.");
             if (IsScalar(type.base_type) && numeric == val.c_str())
-              field.value.constant = val;
+              field->value.constant = val;
           } else if (key == "deprecated") {
-            field.deprecated = val == "true";
+            field->deprecated = val == "true";
           }
-        } while (IsNext(','));
-        Expect(']');
+          if (!Is(',')) break;
+          NEXT();
+        }
+        EXPECT(']');
       }
       if (anonymous_struct) {
-        ParseProtoFields(anonymous_struct, false, oneof);
-        IsNext(';');
+        ECHECK(ParseProtoFields(anonymous_struct, false, oneof));
+        if (Is(';')) NEXT();
       } else {
-        Expect(';');
+        EXPECT(';');
       }
     }
   }
-  Next();
+  NEXT();
+  return NoError();
 }
 
-void Parser::ParseProtoKey() {
+CheckedError Parser::ParseProtoKey() {
   if (token_ == '(') {
-    Next();
+    NEXT();
     // Skip "(a.b)" style custom attributes.
-    while (token_ == '.' || token_ == kTokenIdentifier) Next();
-    Expect(')');
-    while (IsNext('.')) Expect(kTokenIdentifier);
+    while (token_ == '.' || token_ == kTokenIdentifier) NEXT();
+    EXPECT(')');
+    while (Is('.')) { NEXT(); EXPECT(kTokenIdentifier); }
   } else {
-    Expect(kTokenIdentifier);
+    EXPECT(kTokenIdentifier);
   }
+  return NoError();
 }
 
-void Parser::ParseProtoCurliesOrIdent() {
-  if (IsNext('{')) {
+CheckedError Parser::ParseProtoCurliesOrIdent() {
+  if (Is('{')) {
+    NEXT();
     for (int nesting = 1; nesting; ) {
       if (token_ == '{') nesting++;
       else if (token_ == '}') nesting--;
-      Next();
+      NEXT();
     }
   } else {
-    Next();  // Any single token.
+    NEXT();  // Any single token.
   }
+  return NoError();
 }
 
-void Parser::ParseProtoOption() {
-  Next();
-  ParseProtoKey();
-  Expect('=');
-  ParseProtoCurliesOrIdent();
+CheckedError Parser::ParseProtoOption() {
+  NEXT();
+  ECHECK(ParseProtoKey());
+  EXPECT('=');
+  ECHECK(ParseProtoCurliesOrIdent());
+  return NoError();
 }
 
 // Parse a protobuf type, and map it to the corresponding FlatBuffer one.
-Type Parser::ParseTypeFromProtoType() {
+CheckedError Parser::ParseTypeFromProtoType(Type *type) {
   struct type_lookup { const char *proto_type; BaseType fb_type; };
   static type_lookup lookup[] = {
     { "float", BASE_TYPE_FLOAT },  { "double", BASE_TYPE_DOUBLE },
@@ -1338,22 +1468,26 @@ Type Parser::ParseTypeFromProtoType() {
     { "bytes", BASE_TYPE_STRING },
     { nullptr, BASE_TYPE_NONE }
   };
-  Type type;
   for (auto tl = lookup; tl->proto_type; tl++) {
     if (attribute_ == tl->proto_type) {
-      type.base_type = tl->fb_type;
-      Next();
-      return type;
+      type->base_type = tl->fb_type;
+      NEXT();
+      return NoError();
     }
   }
-  IsNext('.');  // qualified names may start with a . ?
-  ParseTypeIdent(type);
-  return type;
+  if (Is('.')) NEXT();  // qualified names may start with a . ?
+  ECHECK(ParseTypeIdent(*type));
+  return NoError();
 }
 
 bool Parser::Parse(const char *source, const char **include_paths,
                    const char *source_filename) {
-  files_being_parsed_ = source_filename ? source_filename : "";
+  return !DoParse(source, include_paths, source_filename).Check();
+}
+
+CheckedError Parser::DoParse(const char *source, const char **include_paths,
+                             const char *source_filename) {
+  file_being_parsed_ = source_filename ? source_filename : "";
   if (source_filename &&
       included_files_.find(source_filename) == included_files_.end()) {
     included_files_[source_filename] = true;
@@ -1369,141 +1503,130 @@ bool Parser::Parse(const char *source, const char **include_paths,
   builder_.Clear();
   // Start with a blank namespace just in case this file doesn't have one.
   namespaces_.push_back(new Namespace());
-  try {
-    Next();
-    // Includes must come before type declarations:
-    for (;;) {
-      // Parse pre-include proto statements if any:
-      if (opts.proto_mode  &&
-          (attribute_ == "option" || attribute_ == "syntax" ||
-           attribute_ == "package")) {
-          ParseProtoDecl();
-      } else if (IsNext(kTokenInclude) ||
-                 (opts.proto_mode &&
-                  attribute_ == "import" &&
-                  IsNext(kTokenIdentifier))) {
-        if (opts.proto_mode && attribute_ == "public") Next();
-        auto name = attribute_;
-        Expect(kTokenStringConstant);
-        // Look for the file in include_paths.
-        std::string filepath;
-        for (auto paths = include_paths; paths && *paths; paths++) {
-          filepath = flatbuffers::ConCatPathFileName(*paths, name);
-          if(FileExists(filepath.c_str())) break;
-        }
-        if (filepath.empty())
-          Error("unable to locate include file: " + name);
-        if (source_filename)
-          files_included_per_file_[source_filename].insert(filepath);
-        if (included_files_.find(filepath) == included_files_.end()) {
-          // We found an include file that we have not parsed yet.
-          // Load it and parse it.
-          std::string contents;
-          if (!LoadFile(filepath.c_str(), true, &contents))
-            Error("unable to load include file: " + name);
-          if (!Parse(contents.c_str(), include_paths, filepath.c_str())) {
-            // Any errors, we're done.
-            return false;
-          }
-          // We generally do not want to output code for any included files:
-          if (!opts.generate_all) MarkGenerated();
-          // This is the easiest way to continue this file after an include:
-          // instead of saving and restoring all the state, we simply start the
-          // file anew. This will cause it to encounter the same include statement
-          // again, but this time it will skip it, because it was entered into
-          // included_files_.
-          // This is recursive, but only go as deep as the number of include
-          // statements.
-          return Parse(source, include_paths, source_filename);
-        }
-        Expect(';');
-      } else {
-        break;
+  NEXT();
+  // Includes must come before type declarations:
+  for (;;) {
+    // Parse pre-include proto statements if any:
+    if (opts.proto_mode &&
+        (attribute_ == "option" || attribute_ == "syntax" ||
+         attribute_ == "package")) {
+        ECHECK(ParseProtoDecl());
+    } else if (Is(kTokenInclude) ||
+               (opts.proto_mode &&
+                attribute_ == "import" &&
+                Is(kTokenIdentifier))) {
+      NEXT();
+      if (opts.proto_mode && attribute_ == "public") NEXT();
+      auto name = attribute_;
+      EXPECT(kTokenStringConstant);
+      // Look for the file in include_paths.
+      std::string filepath;
+      for (auto paths = include_paths; paths && *paths; paths++) {
+        filepath = flatbuffers::ConCatPathFileName(*paths, name);
+        if(FileExists(filepath.c_str())) break;
       }
-    }
-    // Now parse all other kinds of declarations:
-    while (token_ != kTokenEof) {
-      if (opts.proto_mode) {
-        ParseProtoDecl();
-      } else if (token_ == kTokenNameSpace) {
-        ParseNamespace();
-      } else if (token_ == '{') {
-        if (!root_struct_def_) Error("no root type set to parse json with");
-        if (builder_.GetSize()) {
-          Error("cannot have more than one json object in a file");
-        }
-        builder_.Finish(Offset<Table>(ParseTable(*root_struct_def_, nullptr)),
-          file_identifier_.length() ? file_identifier_.c_str() : nullptr);
-      } else if (token_ == kTokenEnum) {
-        ParseEnum(false);
-      } else if (token_ == kTokenUnion) {
-        ParseEnum(true);
-      } else if (token_ == kTokenRootType) {
-        Next();
-        auto root_type = attribute_;
-        Expect(kTokenIdentifier);
-        ParseNamespacing(&root_type, nullptr);
-        if (!SetRootType(root_type.c_str()))
-          Error("unknown root type: " + root_type);
-        if (root_struct_def_->fixed)
-          Error("root type must be a table");
-        Expect(';');
-      } else if (token_ == kTokenFileIdentifier) {
-        Next();
-        file_identifier_ = attribute_;
-        Expect(kTokenStringConstant);
-        if (file_identifier_.length() !=
-            FlatBufferBuilder::kFileIdentifierLength)
-          Error("file_identifier must be exactly " +
-                NumToString(FlatBufferBuilder::kFileIdentifierLength) +
-                " characters");
-        Expect(';');
-      } else if (token_ == kTokenFileExtension) {
-        Next();
-        file_extension_ = attribute_;
-        Expect(kTokenStringConstant);
-        Expect(';');
-      } else if(token_ == kTokenInclude) {
-        Error("includes must come before declarations");
-      } else if(token_ == kTokenAttribute) {
-        Next();
-        auto name = attribute_;
-        Expect(kTokenStringConstant);
-        Expect(';');
-        known_attributes_.insert(name);
-      } else {
-        ParseDecl();
+      if (filepath.empty())
+        return Error("unable to locate include file: " + name);
+      if (source_filename)
+        files_included_per_file_[source_filename].insert(filepath);
+      if (included_files_.find(filepath) == included_files_.end()) {
+        // We found an include file that we have not parsed yet.
+        // Load it and parse it.
+        std::string contents;
+        if (!LoadFile(filepath.c_str(), true, &contents))
+          return Error("unable to load include file: " + name);
+        ECHECK(DoParse(contents.c_str(), include_paths, filepath.c_str()));
+        // We generally do not want to output code for any included files:
+        if (!opts.generate_all) MarkGenerated();
+        // This is the easiest way to continue this file after an include:
+        // instead of saving and restoring all the state, we simply start the
+        // file anew. This will cause it to encounter the same include
+        // statement again, but this time it will skip it, because it was
+        // entered into included_files_.
+        // This is recursive, but only go as deep as the number of include
+        // statements.
+        return DoParse(source, include_paths, source_filename);
       }
+      EXPECT(';');
+    } else {
+      break;
     }
-    for (auto it = structs_.vec.begin(); it != structs_.vec.end(); ++it) {
-      if ((*it)->predecl) {
-        Error("type referenced but not defined: " + (*it)->name);
-      }
-    }
-    for (auto it = enums_.vec.begin(); it != enums_.vec.end(); ++it) {
-      auto &enum_def = **it;
-      if (enum_def.is_union) {
-        for (auto val_it = enum_def.vals.vec.begin();
-             val_it != enum_def.vals.vec.end();
-             ++val_it) {
-          auto &val = **val_it;
-          if (val.struct_def && val.struct_def->fixed)
-            Error("only tables can be union elements: " + val.name);
-        }
-      }
-    }
-  } catch (const std::string &msg) {
-    error_ = source_filename ? AbsolutePath(source_filename) : "";
-    #ifdef _WIN32
-      error_ += "(" + NumToString(line_) + ")";  // MSVC alike
-    #else
-      if (source_filename) error_ += ":";
-      error_ += NumToString(line_) + ":0";  // gcc alike
-    #endif
-    error_ += ": error: " + msg;
-    return false;
   }
-  return true;
+  // Now parse all other kinds of declarations:
+  while (token_ != kTokenEof) {
+    if (opts.proto_mode) {
+      ECHECK(ParseProtoDecl());
+    } else if (token_ == kTokenNameSpace) {
+      ECHECK(ParseNamespace());
+    } else if (token_ == '{') {
+      if (!root_struct_def_)
+        return Error("no root type set to parse json with");
+      if (builder_.GetSize()) {
+        return Error("cannot have more than one json object in a file");
+      }
+      uoffset_t toff;
+      ECHECK(ParseTable(*root_struct_def_, nullptr, &toff));
+      builder_.Finish(Offset<Table>(toff),
+                file_identifier_.length() ? file_identifier_.c_str() : nullptr);
+    } else if (token_ == kTokenEnum) {
+      ECHECK(ParseEnum(false, nullptr));
+    } else if (token_ == kTokenUnion) {
+      ECHECK(ParseEnum(true, nullptr));
+    } else if (token_ == kTokenRootType) {
+      NEXT();
+      auto root_type = attribute_;
+      EXPECT(kTokenIdentifier);
+      ECHECK(ParseNamespacing(&root_type, nullptr));
+      if (!SetRootType(root_type.c_str()))
+        return Error("unknown root type: " + root_type);
+      if (root_struct_def_->fixed)
+        return Error("root type must be a table");
+      EXPECT(';');
+    } else if (token_ == kTokenFileIdentifier) {
+      NEXT();
+      file_identifier_ = attribute_;
+      EXPECT(kTokenStringConstant);
+      if (file_identifier_.length() !=
+          FlatBufferBuilder::kFileIdentifierLength)
+        return Error("file_identifier must be exactly " +
+              NumToString(FlatBufferBuilder::kFileIdentifierLength) +
+              " characters");
+      EXPECT(';');
+    } else if (token_ == kTokenFileExtension) {
+      NEXT();
+      file_extension_ = attribute_;
+      EXPECT(kTokenStringConstant);
+      EXPECT(';');
+    } else if(token_ == kTokenInclude) {
+      return Error("includes must come before declarations");
+    } else if(token_ == kTokenAttribute) {
+      NEXT();
+      auto name = attribute_;
+      EXPECT(kTokenStringConstant);
+      EXPECT(';');
+      known_attributes_.insert(name);
+    } else {
+      ECHECK(ParseDecl());
+    }
+  }
+  for (auto it = structs_.vec.begin(); it != structs_.vec.end(); ++it) {
+    if ((*it)->predecl) {
+      return Error("type referenced but not defined: " + (*it)->name);
+    }
+  }
+  for (auto it = enums_.vec.begin(); it != enums_.vec.end(); ++it) {
+    auto &enum_def = **it;
+    if (enum_def.is_union) {
+      for (auto val_it = enum_def.vals.vec.begin();
+           val_it != enum_def.vals.vec.end();
+           ++val_it) {
+        auto &val = **val_it;
+        if (val.struct_def && val.struct_def->fixed)
+          return Error("only tables can be union elements: " + val.name);
+      }
+    }
+  }
+  return NoError();
 }
 
 std::set<std::string> Parser::GetIncludedFilesRecursive(

From 995ee86a6ed1840190d5142089b5014b66d2a13d Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Fri, 18 Dec 2015 17:01:34 -0800
Subject: [PATCH 031/185] Added an IsFieldPresent helper function.

This is implemented as a template function, since Table::CheckField
is not reachable by subclasses of Table (private base class).

Change-Id: I1ed4d47ce7cb672460ccab61cf7442eb9136b0f1
Tested: on Linux.
Bug: 26273432
---
 include/flatbuffers/flatbuffers.h | 12 ++++++++++++
 tests/test.cpp                    |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 569c72b31..b6b84030f 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -1187,6 +1187,18 @@ class Table {
   uint8_t data_[1];
 };
 
+// Helper function to test if a field is present, using any of the field
+// enums in the generated code.
+// `table` must be a generated table type. Since this is a template parameter,
+// this is not typechecked to be a subclass of Table, so beware!
+// Note: this function will return false for fields equal to the default
+// value, since they're not stored in the buffer (unless force_defaults was
+// used).
+template<typename T> bool IsFieldPresent(const T *table, voffset_t field) {
+  // Cast, since Table is a private baseclass of any table types.
+  return reinterpret_cast<const Table *>(table)->CheckField(field);
+}
+
 // Utility function for reverse lookups on the EnumNames*() functions
 // (in the generated C++ code)
 // names must be NULL terminated.
diff --git a/tests/test.cpp b/tests/test.cpp
index f27b9bdfc..10435e3eb 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -221,6 +221,10 @@ void AccessFlatBufferTest(const uint8_t *flatbuf, size_t length) {
   for (auto it = tests->begin(); it != tests->end(); ++it) {
     TEST_EQ(it->a() == 10 || it->a() == 30, true);  // Just testing iterators.
   }
+
+  // Checking for presence of fields:
+  TEST_EQ(flatbuffers::IsFieldPresent(monster, Monster::VT_HP), true);
+  TEST_EQ(flatbuffers::IsFieldPresent(monster, Monster::VT_MANA), false);
 }
 
 // Change a FlatBuffer in-place, after it has been constructed.

From 189153723649d3b6ad56f7b83662e30c480e124f Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 21 Dec 2015 16:17:50 -0800
Subject: [PATCH 032/185] Fixed reflection setting string not changing size
 field.

Change-Id: I3c3e88a79667d1733b6c47e43b55d8b2604ca8e2
Tested: on Linux.
---
 src/reflection.cpp | 9 ++++++---
 tests/test.cpp     | 5 +++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/reflection.cpp b/src/reflection.cpp
index 35ae16feb..ab39e1e20 100644
--- a/src/reflection.cpp
+++ b/src/reflection.cpp
@@ -287,14 +287,17 @@ void SetString(const reflection::Schema &schema, const std::string &val,
                       const String *str, std::vector<uint8_t> *flatbuf,
                       const reflection::Object *root_table) {
   auto delta = static_cast<int>(val.size()) - static_cast<int>(str->Length());
-  auto start = static_cast<uoffset_t>(reinterpret_cast<const uint8_t *>(str) -
-                                      flatbuf->data() +
-                                      sizeof(uoffset_t));
+  auto str_start = static_cast<uoffset_t>(
+                     reinterpret_cast<const uint8_t *>(str) - flatbuf->data());
+  auto start = str_start + sizeof(uoffset_t);
   if (delta) {
     // Clear the old string, since we don't want parts of it remaining.
     memset(flatbuf->data() + start, 0, str->Length());
     // Different size, we must expand (or contract).
     ResizeContext(schema, start, delta, flatbuf, root_table);
+    // Set the new length.
+    WriteScalar(flatbuf->data() + str_start,
+                static_cast<uoffset_t>(val.size()));
   }
   // Copy new data. Safe because we created the right amount of space.
   memcpy(flatbuf->data() + start, val.c_str(), val.size() + 1);
diff --git a/tests/test.cpp b/tests/test.cpp
index 10435e3eb..d009438ea 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -404,6 +404,11 @@ void ReflectionTest(uint8_t *flatbuf, size_t length) {
   rtestarrayofstring->MutateOffset(2, string_ptr);
   TEST_EQ_STR(rtestarrayofstring->Get(0)->c_str(), "bob");
   TEST_EQ_STR(rtestarrayofstring->Get(2)->c_str(), "hank");
+  // Test integrity of all resize operations above.
+  flatbuffers::Verifier resize_verifier(
+        reinterpret_cast<const uint8_t *>(resizingbuf.data()),
+        resizingbuf.size());
+  TEST_EQ(VerifyMonsterBuffer(resize_verifier), true);
   // As an additional test, also set it on the name field.
   // Note: unlike the name change above, this just overwrites the offset,
   // rather than changing the string in-place.

From 13d0594b4c8cd6677ddb43ecdbd2d7d3300b6208 Mon Sep 17 00:00:00 2001
From: Nalinichandra Penke <chandrapenke@gmail.com>
Date: Tue, 22 Dec 2015 00:02:19 -0800
Subject: [PATCH 033/185] Fix #2775: Add parser option to skip unknown JSON
 fields

---
 include/flatbuffers/idl.h |   7 ++-
 src/idl_parser.cpp        | 103 ++++++++++++++++++++++++++++++++------
 tests/test.cpp            |  21 ++++++++
 3 files changed, 116 insertions(+), 15 deletions(-)

diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index 118a74dd8..134c46f5a 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -320,6 +320,7 @@ struct IDLOptions {
   bool one_file;
   bool proto_mode;
   bool generate_all;
+  bool skip_unexpected_fields_in_json;
 
   // Possible options for the more general generator below.
   enum Language { kJava, kCSharp, kGo, kMAX };
@@ -337,6 +338,7 @@ struct IDLOptions {
       one_file(false),
       proto_mode(false),
       generate_all(false),
+      skip_unexpected_fields_in_json(false),
       lang(IDLOptions::kJava) {}
 };
 
@@ -477,7 +479,10 @@ private:
   CHECKED_ERROR ParseProtoDecl();
   CHECKED_ERROR ParseProtoCurliesOrIdent();
   CHECKED_ERROR ParseTypeFromProtoType(Type *type);
-
+  CHECKED_ERROR SkipAnyJsonValue();
+  CHECKED_ERROR SkipJsonObject();
+  CHECKED_ERROR SkipJsonArray();
+  CHECKED_ERROR SkipJsonString();
   CHECKED_ERROR DoParse(const char *_source, const char **include_paths,
                         const char *source_filename);
 
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 6a013c90f..d84ffddd6 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -673,24 +673,33 @@ CheckedError Parser::ParseTable(const StructDef &struct_def, std::string *value,
       EXPECT(opts.strict_json ? kTokenStringConstant : kTokenIdentifier);
     }
     auto field = struct_def.fields.Lookup(name);
-    if (!field) return Error("unknown field: " + name);
-    EXPECT(':');
-    Value val = field->value;
-    ECHECK(ParseAnyValue(val, field, fieldn));
-    size_t i = field_stack_.size();
-    // Hardcoded insertion-sort with error-check.
-    // If fields are specified in order, then this loop exits immediately.
-    for (; i > field_stack_.size() - fieldn; i--) {
-      auto existing_field = field_stack_[i - 1].second;
-      if (existing_field == field)
-        return Error("field set more than once: " + field->name);
-      if (existing_field->value.offset < field->value.offset) break;
+    if (!field) {
+      if (!opts.skip_unexpected_fields_in_json) {
+        return Error("unknown field: " + name);
+      } else {
+        EXPECT(':');
+        ECHECK(SkipAnyJsonValue());
+      }
+    } else {
+      EXPECT(':');
+      Value val = field->value;
+      ECHECK(ParseAnyValue(val, field, fieldn));
+      size_t i = field_stack_.size();
+      // Hardcoded insertion-sort with error-check.
+      // If fields are specified in order, then this loop exits immediately.
+      for (; i > field_stack_.size() - fieldn; i--) {
+        auto existing_field = field_stack_[i - 1].second;
+        if (existing_field == field)
+          return Error("field set more than once: " + field->name);
+        if (existing_field->value.offset < field->value.offset) break;
+      }
+      field_stack_.insert(field_stack_.begin() + i, std::make_pair(val, field));
+      fieldn++;
     }
-    field_stack_.insert(field_stack_.begin() + i, std::make_pair(val, field));
-    fieldn++;
     if (Is('}')) { NEXT(); break; }
     EXPECT(',');
   }
+
   if (struct_def.fixed && fieldn != struct_def.fields.vec.size())
     return Error("struct: wrong number of initializers: " + struct_def.name);
 
@@ -1480,6 +1489,72 @@ CheckedError Parser::ParseTypeFromProtoType(Type *type) {
   return NoError();
 }
 
+CheckedError Parser::SkipAnyJsonValue() {
+  switch (token_) {
+    case '{':
+      ECHECK(SkipJsonObject());
+      break;
+    case kTokenStringConstant:
+      ECHECK(SkipJsonString());
+      break;
+    case '[':
+      ECHECK(SkipJsonArray());
+      break;
+    case kTokenIntegerConstant:
+      EXPECT(kTokenIntegerConstant);
+      break;
+    case kTokenFloatConstant:
+      EXPECT(kTokenFloatConstant);
+      break;
+    default:
+      return Error(std::string("Unexpected token:") + std::string(1, token_));
+  }
+  return NoError();
+}
+
+CheckedError Parser::SkipJsonObject() {
+  EXPECT('{');
+  size_t fieldn = 0;
+
+  while (true) {
+    if ((!opts.strict_json || !fieldn) && Is('}')) break;
+
+    if (!Is(kTokenStringConstant))
+      EXPECT(opts.strict_json ? kTokenStringConstant : kTokenIdentifier);
+
+    EXPECT(':');
+    ECHECK(SkipAnyJsonValue());
+    fieldn++;
+
+    if (Is('}')) break;
+    EXPECT(',');
+  }
+
+  NEXT();
+  return NoError();
+}
+
+CheckedError Parser::SkipJsonArray() {
+  EXPECT('[');
+  
+  while (true) {
+    if (Is(']')) break;
+        
+    ECHECK(SkipAnyJsonValue());
+
+    if (Is(']')) break;
+    EXPECT(',');
+  }
+
+  NEXT();
+  return NoError();
+}
+
+CheckedError Parser::SkipJsonString() {
+  EXPECT(kTokenStringConstant);
+  return NoError();
+}
+
 bool Parser::Parse(const char *source, const char **include_paths,
                    const char *source_filename) {
   return !DoParse(source, include_paths, source_filename).Check();
diff --git a/tests/test.cpp b/tests/test.cpp
index d009438ea..83cdaef94 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -813,6 +813,26 @@ void UnicodeTest() {
                      "\\u5225\\u30B5\\u30A4\\u30C8\\x01\\x80\"}", true);
 }
 
+void UnknownFieldsTest() {
+  flatbuffers::IDLOptions opts;
+  opts.skip_unexpected_fields_in_json = true;
+  flatbuffers::Parser parser(opts);
+
+  TEST_EQ(parser.Parse("table T { str:string; i:int;}"
+                       "root_type T;"
+                       "{ str:\"test\","
+                       "unknown_int:10,"
+                       "unknown_float:1.0,"
+                       "unknown_array: [ 1, 2, 3, 4],"
+                       "unknown_object: { i: 10 },"
+                       "i:10}"), true);
+
+  std::string jsongen;
+  parser.opts.indent_step = -1;
+  GenerateText(parser, parser.builder_.GetBufferPointer(), &jsongen);
+  TEST_EQ(jsongen == "{str: \"test\",i: 10}", true);
+}
+
 int main(int /*argc*/, const char * /*argv*/[]) {
   // Run our various test suites:
 
@@ -837,6 +857,7 @@ int main(int /*argc*/, const char * /*argv*/[]) {
   ScientificTest();
   EnumStringsTest();
   UnicodeTest();
+  UnknownFieldsTest();
 
   if (!testing_fails) {
     TEST_OUTPUT_LINE("ALL TESTS PASSED");

From f243109524eb7a62cd2556e2ffc7e70920427973 Mon Sep 17 00:00:00 2001
From: Nalinichandra Penke <chandrapenke@gmail.com>
Date: Tue, 22 Dec 2015 00:13:22 -0800
Subject: [PATCH 034/185] Fix #2775: Add option to flatc to skip unknown fields
 in JSON

---
 src/flatc.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/flatc.cpp b/src/flatc.cpp
index ead3a7c29..48d98ce41 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -100,12 +100,15 @@ static void Error(const std::string &err, bool usage, bool show_exe_name) {
       "                  no trailing commas in tables/vectors.\n"
       "  --defaults-json Output fields whose value is the default when\n"
       "                  writing JSON\n"
+      "  --unknown-json  Allow fields in JSON that are not defined in the\n"
+      "                  schema. These fields will be discared when generating\n"
+      "                  binaries.\n"
       "  --no-prefix     Don\'t prefix enum values with the enum type in C++.\n"
       "  --scoped-enums  Use C++11 style scoped and strongly typed enums.\n"
       "                  also implies --no-prefix.\n"
       "  --gen-includes  (deprecated), this is the default behavior.\n"
       "                  If the original behavior is required (no include\n"
-    "                  statements) use --no-includes.\n"
+      "                  statements) use --no-includes.\n"
       "  --no-includes   Don\'t generate include statements for included\n"
       "                  schemas the generated file depends on (C++).\n"
       "  --gen-mutable   Generate accessors that can mutate buffers in-place.\n"
@@ -155,6 +158,8 @@ int main(int argc, const char *argv[]) {
         opts.skip_js_exports = true;
       } 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") {
         opts.prefixed_enums = false;
       } else if(arg == "--scoped-enums") {

From 7fbd9b8de4d59ba63ae4c7651a1f3d0e308532ed Mon Sep 17 00:00:00 2001
From: Shuhei Tanuma <chobieee@gmail.com>
Date: Thu, 24 Dec 2015 15:35:28 +0900
Subject: [PATCH 035/185] (PHP) improve indirect buffer test

---
 tests/generate_code.bat         |   1 -
 tests/generate_code.sh          |   1 -
 tests/monsterdata_indirect.json |   6 ------
 tests/monsterdata_indirect.mon  | Bin 156 -> 0 bytes
 tests/monsterdata_test.json     |   3 +++
 tests/monsterdata_test.mon      | Bin 352 -> 384 bytes
 tests/phpTest.php               |  26 ++++++++++++++++++++------
 7 files changed, 23 insertions(+), 14 deletions(-)
 delete mode 100644 tests/monsterdata_indirect.json
 delete mode 100644 tests/monsterdata_indirect.mon

diff --git a/tests/generate_code.bat b/tests/generate_code.bat
index c46d10af6..75ac1433e 100644
--- a/tests/generate_code.bat
+++ b/tests/generate_code.bat
@@ -1,3 +1,2 @@
 ..\flatc.exe -c -j -n -g -b -p --php -s --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
 ..\flatc.exe -b --schema monster_test.fbs
-..\flatc.exe -b .\monster_test.fbs .\monsterdata_indirect.json
\ No newline at end of file
diff --git a/tests/generate_code.sh b/tests/generate_code.sh
index de736da5c..91661f30d 100644
--- a/tests/generate_code.sh
+++ b/tests/generate_code.sh
@@ -1,3 +1,2 @@
 ../flatc --cpp --java --csharp --go --binary --python --js --php --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
 ../flatc --binary --schema monster_test.fbs
-../flatc --binary monster_test.fbs monsterdata_indirect.json
\ No newline at end of file
diff --git a/tests/monsterdata_indirect.json b/tests/monsterdata_indirect.json
deleted file mode 100644
index 297c1721f..000000000
--- a/tests/monsterdata_indirect.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "Gob",
-  "enemy": {
-    "name": "Awk"
-  }
-}
\ No newline at end of file
diff --git a/tests/monsterdata_indirect.mon b/tests/monsterdata_indirect.mon
deleted file mode 100644
index f6262f32d7ef8ca17f248065de056846ffb8b24f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmZ=@U|{g|_X}oVFk|2YvO$0aLLreHNNiN58IT(Q#5Q1IGX|JSOfyjRA@e|HfYdVs
Ov155Qn0C)kVgLYoBLz(W

diff --git a/tests/monsterdata_test.json b/tests/monsterdata_test.json
index 7ed39a8de..89278755e 100755
--- a/tests/monsterdata_test.json
+++ b/tests/monsterdata_test.json
@@ -37,6 +37,9 @@
     "test1",
     "test2"
   ],
+  enemy: {
+    name: "Fred"
+  },
   testarrayofbools:[
     true, false, true
   ],
diff --git a/tests/monsterdata_test.mon b/tests/monsterdata_test.mon
index eff1e66ca2a5b60af52b6deeffcf0eaba91dd00d..69d1d7538e406a7d46bc5d85bbb565ea95e960ca 100644
GIT binary patch
delta 145
zcmaFB)WAGJ#JGilgMop8jll#+S^zOCgAIcNgA0)50mLBS!w|rbz>vWZ!Vtkwz)-;u
zGtu2p7bNioh@SxQ86a)};us(XX>>eUc^8BWmo)Z)u*Sr>%JM*Q24)~;1j1ea|NmzJ
QvO(CbC^ZF0O*}pm06JwJZ~y=R

delta 98
zcmZo*e!w(A#JGZigMop8jllp&ngB5?g9U>Pg9DHS11=063=s?o3_c723>gds3?UQU
l4FzuiWlsR{1|ZG=Vuy(ng&9>QE>&h{2J#pg7$-iT2>_pL56%Dp

diff --git a/tests/phpTest.php b/tests/phpTest.php
index 027780cc1..ab41121ce 100644
--- a/tests/phpTest.php
+++ b/tests/phpTest.php
@@ -30,6 +30,10 @@ function main()
 
     // We set up the same values as monsterdata.json:
     $str = $fbb->createString("MyMonster");
+    $name = $fbb->createString('Fred');
+    \MyGame\Example\Monster::startMonster($fbb);
+    \MyGame\Example\Monster::addName($fbb, $name);
+    $enemy = \MyGame\Example\Monster::endMonster($fbb);
 
     $inv = \MyGame\Example\Monster::CreateInventoryVector($fbb, array(0, 1, 2, 3, 4));
 
@@ -62,6 +66,7 @@ function main()
     \MyGame\Example\Monster::AddTest($fbb, $mon2);
     \MyGame\Example\Monster::AddTest4($fbb, $test4);
     \MyGame\Example\Monster::AddTestarrayofstring($fbb, $testArrayOfString);
+    \MyGame\Example\Monster::AddEnemy($fbb, $enemy);
     \MyGame\Example\Monster::AddTestbool($fbb, false);
     $mon = \MyGame\Example\Monster::EndMonster($fbb);
 
@@ -75,7 +80,7 @@ function main()
 //    testUnicode($assert);
 
 
-    testIndirectBuffer($assert);
+    testAnyBuffer($assert);
 
     echo 'FlatBuffers php test: completed successfully' . PHP_EOL;
 }
@@ -135,6 +140,10 @@ function test_buffer(Assert $assert, Google\FlatBuffers\ByteBuffer $bb) {
     $assert->strictEqual($monster->GetTestarrayofstringLength(), 2);
     $assert->strictEqual($monster->GetTestarrayofstring(0), 'test1');
     $assert->strictEqual($monster->GetTestarrayofstring(1), 'test2');
+
+    $fred = $monster->getEnemy();
+    $assert->Equal('Fred', $fred->getName());
+
     $assert->strictEqual($monster->GetTestbool(), false);
 }
 
@@ -590,15 +599,20 @@ function testByteBuffer(Assert $assert) {
     $assert->Equal(0x0D0C0B0A, $uut->readLittleEndian(0, 4, true));
 
 }
-function testIndirectBuffer(Assert $assert)
+
+function testAnyBuffer(Assert $assert)
 {
-    $js = json_decode(file_get_contents('monsterdata_indirect.json'), true);
-    $data = file_get_contents('monsterdata_indirect.mon');
+//    PHP needs double quote. for now, use Fred directly
+//    $js = json_decode(file_get_contents('monsterdata_test.json'), true);
+    $data = file_get_contents('monsterdata_test.mon');
     $bb = Google\FlatBuffers\ByteBuffer::wrap($data);
     $mons = \MyGame\Example\Monster::getRootAsMonster($bb);
-    $assert->Equal($js["name"], $mons->getName());
-    $assert->Equal($js["enemy"]["name"], $mons->getEnemy()->getName());
+    $indirect_monster = new \MyGame\Example\Monster();
+    $assert->Equal($mons->getTestType(), \MyGame\Example\Any::Monster);
+    $mons->getTest($indirect_monster);
+    $assert->Equal("Fred", $indirect_monster->getName());
 }
+
 class Assert {
     public function ok($result, $message = "") {
         if (!$result){

From 4691558ee3b9c245899deca4d5d243b4a3c9855f Mon Sep 17 00:00:00 2001
From: Shuhei Tanuma <chobieee@gmail.com>
Date: Thu, 24 Dec 2015 15:50:03 +0900
Subject: [PATCH 036/185] (PHP) remove duplicate test

---
 tests/phpTest.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/tests/phpTest.php b/tests/phpTest.php
index ab41121ce..0afc0af7f 100644
--- a/tests/phpTest.php
+++ b/tests/phpTest.php
@@ -79,9 +79,6 @@ function main()
     fuzzTest1($assert);
 //    testUnicode($assert);
 
-
-    testAnyBuffer($assert);
-
     echo 'FlatBuffers php test: completed successfully' . PHP_EOL;
 }
 
@@ -600,19 +597,6 @@ function testByteBuffer(Assert $assert) {
 
 }
 
-function testAnyBuffer(Assert $assert)
-{
-//    PHP needs double quote. for now, use Fred directly
-//    $js = json_decode(file_get_contents('monsterdata_test.json'), true);
-    $data = file_get_contents('monsterdata_test.mon');
-    $bb = Google\FlatBuffers\ByteBuffer::wrap($data);
-    $mons = \MyGame\Example\Monster::getRootAsMonster($bb);
-    $indirect_monster = new \MyGame\Example\Monster();
-    $assert->Equal($mons->getTestType(), \MyGame\Example\Any::Monster);
-    $mons->getTest($indirect_monster);
-    $assert->Equal("Fred", $indirect_monster->getName());
-}
-
 class Assert {
     public function ok($result, $message = "") {
         if (!$result){

From 451272b61840a3c2b12edeb23b18c9bd0b2aa508 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Tue, 29 Dec 2015 16:33:00 -0800
Subject: [PATCH 037/185] Made error checking macros less prone to clashes.

Change-Id: Ieb252ce01446551699d935507bc95ee286fe1ddd
Tested: on Linux.
---
 include/flatbuffers/idl.h | 78 +++++++++++++++++++++------------------
 src/idl_parser.cpp        |  6 +++
 2 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index 118a74dd8..d4fcccb1a 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -375,9 +375,10 @@ class CheckedError {
 // Additionally, in GCC we can get these errors statically, for additional
 // assurance:
 #ifdef __GNUC__
-#define CHECKED_ERROR CheckedError __attribute__((warn_unused_result))
+#define FLATBUFFERS_CHECKED_ERROR CheckedError \
+          __attribute__((warn_unused_result))
 #else
-#define CHECKED_ERROR CheckedError
+#define FLATBUFFERS_CHECKED_ERROR CheckedError
 #endif
 
 class Parser {
@@ -435,51 +436,56 @@ class Parser {
   // See reflection/reflection.fbs
   void Serialize();
 
-  CHECKED_ERROR CheckBitsFit(int64_t val, size_t bits);
+  FLATBUFFERS_CHECKED_ERROR CheckBitsFit(int64_t val, size_t bits);
 
 private:
-  CHECKED_ERROR Error(const std::string &msg);
-  CHECKED_ERROR ParseHexNum(int nibbles, int64_t *val);
-  CHECKED_ERROR Next();
+  FLATBUFFERS_CHECKED_ERROR Error(const std::string &msg);
+  FLATBUFFERS_CHECKED_ERROR ParseHexNum(int nibbles, int64_t *val);
+  FLATBUFFERS_CHECKED_ERROR Next();
   bool Is(int t);
-  CHECKED_ERROR Expect(int t);
+  FLATBUFFERS_CHECKED_ERROR Expect(int t);
   std::string TokenToStringId(int t);
   EnumDef *LookupEnum(const std::string &id);
-  CHECKED_ERROR ParseNamespacing(std::string *id, std::string *last);
-  CHECKED_ERROR ParseTypeIdent(Type &type);
-  CHECKED_ERROR ParseType(Type &type);
-  CHECKED_ERROR AddField(StructDef &struct_def, const std::string &name,
-                         const Type &type, FieldDef **dest);
-  CHECKED_ERROR ParseField(StructDef &struct_def);
-  CHECKED_ERROR ParseAnyValue(Value &val, FieldDef *field, size_t parent_fieldn);
-  CHECKED_ERROR ParseTable(const StructDef &struct_def, std::string *value,
-                           uoffset_t *ovalue);
+  FLATBUFFERS_CHECKED_ERROR ParseNamespacing(std::string *id,
+                                             std::string *last);
+  FLATBUFFERS_CHECKED_ERROR ParseTypeIdent(Type &type);
+  FLATBUFFERS_CHECKED_ERROR ParseType(Type &type);
+  FLATBUFFERS_CHECKED_ERROR AddField(StructDef &struct_def,
+                                     const std::string &name, const Type &type,
+                                     FieldDef **dest);
+  FLATBUFFERS_CHECKED_ERROR ParseField(StructDef &struct_def);
+  FLATBUFFERS_CHECKED_ERROR ParseAnyValue(Value &val, FieldDef *field,
+                                          size_t parent_fieldn);
+  FLATBUFFERS_CHECKED_ERROR ParseTable(const StructDef &struct_def,
+                                       std::string *value, uoffset_t *ovalue);
   void SerializeStruct(const StructDef &struct_def, const Value &val);
   void AddVector(bool sortbysize, int count);
-  CHECKED_ERROR ParseVector(const Type &type, uoffset_t *ovalue);
-  CHECKED_ERROR ParseMetaData(Definition &def);
-  CHECKED_ERROR TryTypedValue(int dtoken, bool check, Value &e, BaseType req,
-                              bool *destmatch);
-  CHECKED_ERROR ParseHash(Value &e, FieldDef* field);
-  CHECKED_ERROR ParseSingleValue(Value &e);
-  CHECKED_ERROR ParseIntegerFromString(Type &type, int64_t *result);
+  FLATBUFFERS_CHECKED_ERROR ParseVector(const Type &type, uoffset_t *ovalue);
+  FLATBUFFERS_CHECKED_ERROR ParseMetaData(Definition &def);
+  FLATBUFFERS_CHECKED_ERROR TryTypedValue(int dtoken, bool check, Value &e,
+                                          BaseType req, bool *destmatch);
+  FLATBUFFERS_CHECKED_ERROR ParseHash(Value &e, FieldDef* field);
+  FLATBUFFERS_CHECKED_ERROR ParseSingleValue(Value &e);
+  FLATBUFFERS_CHECKED_ERROR ParseIntegerFromString(Type &type, int64_t *result);
   StructDef *LookupCreateStruct(const std::string &name,
                                 bool create_if_new = true,
                                 bool definition = false);
-  CHECKED_ERROR ParseEnum(bool is_union, EnumDef **dest);
-  CHECKED_ERROR ParseNamespace();
-  CHECKED_ERROR StartStruct(const std::string &name, StructDef **dest);
-  CHECKED_ERROR ParseDecl();
-  CHECKED_ERROR ParseProtoFields(StructDef *struct_def, bool isextend,
-                                 bool inside_oneof);
-  CHECKED_ERROR ParseProtoOption();
-  CHECKED_ERROR ParseProtoKey();
-  CHECKED_ERROR ParseProtoDecl();
-  CHECKED_ERROR ParseProtoCurliesOrIdent();
-  CHECKED_ERROR ParseTypeFromProtoType(Type *type);
+  FLATBUFFERS_CHECKED_ERROR ParseEnum(bool is_union, EnumDef **dest);
+  FLATBUFFERS_CHECKED_ERROR ParseNamespace();
+  FLATBUFFERS_CHECKED_ERROR StartStruct(const std::string &name,
+                                        StructDef **dest);
+  FLATBUFFERS_CHECKED_ERROR ParseDecl();
+  FLATBUFFERS_CHECKED_ERROR ParseProtoFields(StructDef *struct_def,
+                                             bool isextend, bool inside_oneof);
+  FLATBUFFERS_CHECKED_ERROR ParseProtoOption();
+  FLATBUFFERS_CHECKED_ERROR ParseProtoKey();
+  FLATBUFFERS_CHECKED_ERROR ParseProtoDecl();
+  FLATBUFFERS_CHECKED_ERROR ParseProtoCurliesOrIdent();
+  FLATBUFFERS_CHECKED_ERROR ParseTypeFromProtoType(Type *type);
 
-  CHECKED_ERROR DoParse(const char *_source, const char **include_paths,
-                        const char *source_filename);
+  FLATBUFFERS_CHECKED_ERROR DoParse(const char *_source,
+                                    const char **include_paths,
+                                    const char *source_filename);
 
  public:
   SymbolTable<StructDef> structs_;
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 6a013c90f..5d675ac05 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -43,7 +43,13 @@ static_assert(BASE_TYPE_UNION ==
               static_cast<BaseType>(reflection::Union),
               "enums don't match");
 
+// Any parsing calls have to be wrapped in this macro, which automates
+// handling of recursive error checking a bit. It will check the received
+// CheckedError object, and return straight away on error.
 #define ECHECK(call) { auto ce = (call); if (ce.Check()) return ce; }
+
+// These two functions are called hundreds of times below, so define a short
+// form:
 #define NEXT() ECHECK(Next())
 #define EXPECT(tok) ECHECK(Expect(tok))
 

From af236833119ce6ec5ab82930be6f5b2badd9e89e Mon Sep 17 00:00:00 2001
From: Faizan Rashid <faizanrashid@Faizans-MacBook-Pro.local>
Date: Thu, 31 Dec 2015 09:41:00 +0500
Subject: [PATCH 038/185] [BUG FIX] [MINOR] Fix encoding with unicode
 characters.

When passing a unicode string to builder.CreateString, the
default encoding assumed all characters can be encoded
using ascii. Added a fix so a user can specify the
encoding and how to handle errors when creating strings.
---
 python/flatbuffers/builder.py |  4 ++--
 tests/py_test.py              | 26 ++++++++++++++++++++------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/python/flatbuffers/builder.py b/python/flatbuffers/builder.py
index 6e3465913..8ca0e9321 100644
--- a/python/flatbuffers/builder.py
+++ b/python/flatbuffers/builder.py
@@ -361,14 +361,14 @@ class Builder(object):
         self.PlaceUOffsetT(vectorNumElems)
         return self.Offset()
 
-    def CreateString(self, s):
+    def CreateString(self, s, encoding='utf-8', errors='strict'):
         """CreateString writes a null-terminated byte string as a vector."""
 
         self.assertNotNested()
         self.nested = True
 
         if isinstance(s, compat.string_types):
-            x = s.encode()
+            x = s.encode(encoding, errors)
         elif isinstance(s, compat.binary_type):
             x = s
         else:
diff --git a/tests/py_test.py b/tests/py_test.py
index cce317989..0ad011736 100644
--- a/tests/py_test.py
+++ b/tests/py_test.py
@@ -1,3 +1,4 @@
+# coding=utf-8
 # Copyright 2014 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -389,23 +390,36 @@ class TestByteLayout(unittest.TestCase):
 
     def test_create_ascii_string(self):
         b = flatbuffers.Builder(0)
-        b.CreateString(u"foo".encode('ascii'))
+        b.CreateString(u"foo", encoding='ascii')
+
         # 0-terminated, no pad:
         self.assertBuilderEquals(b, [3, 0, 0, 0, 'f', 'o', 'o', 0])
-        b.CreateString(u"moop".encode('ascii'))
+        b.CreateString(u"moop", encoding='ascii')
         # 0-terminated, 3-byte pad:
         self.assertBuilderEquals(b, [4, 0, 0, 0, 'm', 'o', 'o', 'p',
                                      0, 0, 0, 0,
                                      3, 0, 0, 0, 'f', 'o', 'o', 0])
 
+    def test_create_utf8_string(self):
+        b = flatbuffers.Builder(0)
+        b.CreateString(u"Цлїςσδε")
+        self.assertBuilderEquals(b, "\x0e\x00\x00\x00\xd0\xa6\xd0\xbb\xd1\x97" \
+            "\xcf\x82\xcf\x83\xce\xb4\xce\xb5\x00\x00")
+
+        b.CreateString(u"ﾌﾑｱﾑｶﾓｹﾓ")
+        self.assertBuilderEquals(b, "\x18\x00\x00\x00\xef\xbe\x8c\xef\xbe\x91" \
+            "\xef\xbd\xb1\xef\xbe\x91\xef\xbd\xb6\xef\xbe\x93\xef\xbd\xb9\xef" \
+            "\xbe\x93\x00\x00\x00\x00\x0e\x00\x00\x00\xd0\xa6\xd0\xbb\xd1\x97" \
+            "\xcf\x82\xcf\x83\xce\xb4\xce\xb5\x00\x00")
+
     def test_create_arbitrary_string(self):
         b = flatbuffers.Builder(0)
-        s = "\x01\x02\x03".encode('utf-8')
-        b.CreateString(s)
+        s = "\x01\x02\x03"
+        b.CreateString(s) # Default encoding is utf-8.
         # 0-terminated, no pad:
         self.assertBuilderEquals(b, [3, 0, 0, 0, 1, 2, 3, 0])
-        s2 = "\x04\x05\x06\x07".encode('utf-8')
-        b.CreateString(s2)
+        s2 = "\x04\x05\x06\x07"
+        b.CreateString(s2) # Default encoding is utf-8.
         # 0-terminated, 3-byte pad:
         self.assertBuilderEquals(b, [4, 0, 0, 0, 4, 5, 6, 7, 0, 0, 0, 0,
                                      3, 0, 0, 0, 1, 2, 3, 0])

From 4e4a5142fb2d50c08856b3c3292bcf9c649ed2e7 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Tue, 29 Dec 2015 17:05:18 -0800
Subject: [PATCH 039/185] Clarified binary encoding with an example.

Change-Id: I60c900a2f7cbd88fe264f7b0dc78ef86b1580655
Tested: in Chrome.
---
 docs/html/md__internals.html | 31 +++++++++++++++++++++++----
 docs/source/Internals.md     | 41 +++++++++++++++++++++++++++++++++---
 2 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/docs/html/md__internals.html b/docs/html/md__internals.html
index c06672475..34168da03 100644
--- a/docs/html/md__internals.html
+++ b/docs/html/md__internals.html
@@ -75,12 +75,13 @@ $(document).ready(function(){initNavTree('md__internals.html','');});
 <h3>Structs</h3>
 <p>These are the simplest, and as mentioned, intended for simple data that benefits from being extra efficient and doesn't need versioning / extensibility. They are always stored inline in their parent (a struct, table, or vector) for maximum compactness. Structs define a consistent memory layout where all components are aligned to their size, and structs aligned to their largest scalar member. This is done independent of the alignment rules of the underlying compiler to guarantee a cross platform compatible layout. This layout is then enforced in the generated code.</p>
 <h3>Tables</h3>
-<p>These start with an <code>soffset_t</code> to a vtable. This is a signed version of <code>uoffset_t</code>, since vtables may be stored anywhere relative to the object. This offset is substracted (not added) from the object start to arrive at the vtable start. This offset is followed by all the fields as aligned scalars (or offsets). Unlike structs, not all fields need to be present. There is no set order and layout.</p>
+<p>Unlike structs, these are not stored in inline in their parent, but are referred to by offset.</p>
+<p>They start with an <code>soffset_t</code> to a vtable. This is a signed version of <code>uoffset_t</code>, since vtables may be stored anywhere relative to the object. This offset is substracted (not added) from the object start to arrive at the vtable start. This offset is followed by all the fields as aligned scalars (or offsets). Unlike structs, not all fields need to be present. There is no set order and layout.</p>
 <p>To be able to access fields regardless of these uncertainties, we go through a vtable of offsets. Vtables are shared between any objects that happen to have the same vtable values.</p>
-<p>The elements of a vtable are all of type <code>voffset_t</code>, which is a <code>uint16_t</code>. The first element is the size of the vtable in bytes, including the size element. The second one is the size of the object, in bytes (including the vtable offset). This size could be used for streaming, to know how many bytes to read to be able to access all fields of the object. The remaining elements are the N offsets, where N is the amount of fields declared in the schema when the code that constructed this buffer was compiled (thus, the size of the table is N + 2).</p>
+<p>The elements of a vtable are all of type <code>voffset_t</code>, which is a <code>uint16_t</code>. The first element is the size of the vtable in bytes, including the size element. The second one is the size of the object, in bytes (including the vtable offset). This size could be used for streaming, to know how many bytes to read to be able to access all <em>inline</em> fields of the object. The remaining elements are the N offsets, where N is the amount of fields declared in the schema when the code that constructed this buffer was compiled (thus, the size of the table is N + 2).</p>
 <p>All accessor functions in the generated code for tables contain the offset into this table as a constant. This offset is checked against the first field (the number of elements), to protect against newer code reading older data. If this offset is out of range, or the vtable entry is 0, that means the field is not present in this object, and the default value is return. Otherwise, the entry is used as offset to the field to be read.</p>
 <h3>Strings and Vectors</h3>
-<p>Strings are simply a vector of bytes, and are always null-terminated. Vectors are stored as contiguous aligned scalar elements prefixed by a 32bit element count (not including any null termination).</p>
+<p>Strings are simply a vector of bytes, and are always null-terminated. Vectors are stored as contiguous aligned scalar elements prefixed by a 32bit element count (not including any null termination). Neither is stored inline in their parent, but are referred to by offset.</p>
 <h3>Construction</h3>
 <p>The current implementation constructs these buffers backwards (starting at the highest memory address of the buffer), since that significantly reduces the amount of bookkeeping and simplifies the construction API.</p>
 <h3>Code example</h3>
@@ -162,7 +163,29 @@ STRUCT_END(Vec3, 12);
 }
 </pre><p><code>CreateMonster</code> is a convenience function that calls all functions in <code>MonsterBuilder</code> above for you. Note that if you pass values which are defaults as arguments, it will not actually construct that field, so you can probably use this function instead of the builder class in almost all cases. </p><pre class="fragment">inline const Monster *GetMonster(const void *buf) { return flatbuffers::GetRoot&lt;Monster&gt;(buf); }
 </pre><p>This function is only generated for the root table type, to be able to start traversing a FlatBuffer from a raw buffer pointer. </p><pre class="fragment">}; // namespace MyGame
-}; // namespace Sample</pre> </div></div><!-- contents -->
+}; // namespace Sample
+</pre><h3>Encoding example.</h3>
+<p>Below is a sample encoding for the following JSON corresponding to the above schema: </p><pre class="fragment">{ pos: { x: 1, y: 2, z: 3 }, name: "fred", hp: 50 }
+</pre><p>Resulting in this binary buffer: </p><pre class="fragment">// Start of the buffer:
+uint32_t 20  // Offset to the root table.
+
+// Start of the vtable. Not shared in this example, but could be:
+uint16_t 16 // Size of table, starting from here.
+uint16_t 22 // Size of object inline data.
+uint16_t 4, 0, 20, 16, 0, 0  // Offsets to fields from start of (root) table, 0 for not present.
+
+// Start of the root table:
+int32_t 16     // Offset to vtable used (default negative direction)
+float 1, 2, 3  // the Vec3 struct, inline.
+uint32_t 8     // Offset to the name string.
+int16_t 50     // hp field.
+int16_t 0      // Padding for alignment.
+
+// Start of name string:
+uint32_t 4  // Length of string.
+int8_t 'f', 'r', 'e', 'd', 0, 0, 0, 0  // Text + 0 termination + padding.
+</pre><p>Note that this not the only possible encoding, since the writer has some flexibility in which of the children of root object to write first (though in this case there's only one string), and what order to write the fields in. Different orders may also cause different alignments to happen. </p>
+</div></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- Google Analytics -->
 <script>
diff --git a/docs/source/Internals.md b/docs/source/Internals.md
index bf1a980e6..215842d36 100755
--- a/docs/source/Internals.md
+++ b/docs/source/Internals.md
@@ -73,7 +73,10 @@ code.
 
 ### Tables
 
-These start with an `soffset_t` to a vtable. This is a signed version of
+Unlike structs, these are not stored in inline in their parent, but are
+referred to by offset.
+
+They start with an `soffset_t` to a vtable. This is a signed version of
 `uoffset_t`, since vtables may be stored anywhere relative to the object.
 This offset is substracted (not added) from the object start to arrive at
 the vtable start. This offset is followed by all the
@@ -88,7 +91,7 @@ The elements of a vtable are all of type `voffset_t`, which is
 a `uint16_t`. The first element is the size of the vtable in bytes,
 including the size element. The second one is the size of the object, in bytes
 (including the vtable offset). This size could be used for streaming, to know
-how many bytes to read to be able to access all fields of the object.
+how many bytes to read to be able to access all *inline* fields of the object.
 The remaining elements are the N offsets, where N is the amount of fields
 declared in the schema when the code that constructed this buffer was
 compiled (thus, the size of the table is N + 2).
@@ -106,7 +109,8 @@ field to be read.
 Strings are simply a vector of bytes, and are always
 null-terminated. Vectors are stored as contiguous aligned scalar
 elements prefixed by a 32bit element count (not including any
-null termination).
+null termination). Neither is stored inline in their parent, but are referred to
+by offset.
 
 ### Construction
 
@@ -249,4 +253,35 @@ start traversing a FlatBuffer from a raw buffer pointer.
     }; // namespace MyGame
     }; // namespace Sample
 
+### Encoding example.
 
+Below is a sample encoding for the following JSON corresponding to the above
+schema:
+
+    { pos: { x: 1, y: 2, z: 3 }, name: "fred", hp: 50 }
+
+Resulting in this binary buffer:
+
+    // Start of the buffer:
+    uint32_t 20  // Offset to the root table.
+
+    // Start of the vtable. Not shared in this example, but could be:
+    uint16_t 16 // Size of table, starting from here.
+    uint16_t 22 // Size of object inline data.
+    uint16_t 4, 0, 20, 16, 0, 0  // Offsets to fields from start of (root) table, 0 for not present.
+
+    // Start of the root table:
+    int32_t 16     // Offset to vtable used (default negative direction)
+    float 1, 2, 3  // the Vec3 struct, inline.
+    uint32_t 8     // Offset to the name string.
+    int16_t 50     // hp field.
+    int16_t 0      // Padding for alignment.
+
+    // Start of name string:
+    uint32_t 4  // Length of string.
+    int8_t 'f', 'r', 'e', 'd', 0, 0, 0, 0  // Text + 0 termination + padding.
+
+Note that this not the only possible encoding, since the writer has some
+flexibility in which of the children of root object to write first (though in
+this case there's only one string), and what order to write the fields in.
+Different orders may also cause different alignments to happen.

From 0e1601b80de3c69cf49894d58840856f2077731b Mon Sep 17 00:00:00 2001
From: Chris Pickett <github@parnic.com>
Date: Tue, 5 Jan 2016 10:58:21 -0600
Subject: [PATCH 040/185] Fixed compile warning with VS2012

flatbuffers\src\idl_parser.cpp(1525): warning C4127: conditional expression is constant
flatbuffers\src\idl_parser.cpp(1546): warning C4127: conditional expression is constant
---
 src/idl_parser.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index b533d213e..005040a68 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -1522,7 +1522,7 @@ CheckedError Parser::SkipJsonObject() {
   EXPECT('{');
   size_t fieldn = 0;
 
-  while (true) {
+  for (;;) {
     if ((!opts.strict_json || !fieldn) && Is('}')) break;
 
     if (!Is(kTokenStringConstant))
@@ -1543,7 +1543,7 @@ CheckedError Parser::SkipJsonObject() {
 CheckedError Parser::SkipJsonArray() {
   EXPECT('[');
   
-  while (true) {
+  for (;;) {
     if (Is(']')) break;
         
     ECHECK(SkipAnyJsonValue());

From e0b2f81885b09ffba4ec89bfd2c9796d3be01865 Mon Sep 17 00:00:00 2001
From: Chris Pickett <github@parnic.com>
Date: Tue, 5 Jan 2016 10:58:40 -0600
Subject: [PATCH 041/185] Fixed compile warning with VS2012

flatbuffers\src\idl_parser.cpp(1516): warning C4244: 'argument' : conversion from 'int' to 'char', possible loss of data
---
 src/idl_parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 005040a68..31af4738c 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -1513,7 +1513,7 @@ CheckedError Parser::SkipAnyJsonValue() {
       EXPECT(kTokenFloatConstant);
       break;
     default:
-      return Error(std::string("Unexpected token:") + std::string(1, token_));
+      return Error(std::string("Unexpected token:") + std::string(1, static_cast<char>(token_)));
   }
   return NoError();
 }

From 4731c7e50233e47a5e46531a1df7597e69417639 Mon Sep 17 00:00:00 2001
From: Chris Pickett <github@parnic.com>
Date: Tue, 5 Jan 2016 10:58:46 -0600
Subject: [PATCH 042/185] Fix build for platforms not supporting realpath

Added a check for a preprocessor definition that can be set if the platform you're building for doesn't support any notion of absolute path resolution/realpath()/etc.
---
 include/flatbuffers/util.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h
index ba73d67bd..d2d8cae8e 100644
--- a/include/flatbuffers/util.h
+++ b/include/flatbuffers/util.h
@@ -219,6 +219,9 @@ inline void EnsureDirExists(const std::string &filepath) {
 // 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) {
+#ifdef NO_ABSOLUTE_PATH_RESOLUTION
+	return filepath;
+#else
   #ifdef _WIN32
     char abs_path[MAX_PATH];
     return GetFullPathNameA(filepath.c_str(), MAX_PATH, abs_path, nullptr)
@@ -228,6 +231,7 @@ inline std::string AbsolutePath(const std::string &filepath) {
   #endif
     ? abs_path
     : filepath;
+#endif // NO_ABSOLUTE_PATH_RESOLUTION
 }
 
 // To and from UTF-8 unicode conversion functions

From 30013b4ff80dd7d4fde56e1b2b8b988feed6437f Mon Sep 17 00:00:00 2001
From: Chris Pickett <github@parnic.com>
Date: Tue, 5 Jan 2016 13:38:03 -0600
Subject: [PATCH 043/185] Fixed MS static analysis warnings

Cleaned up a few warnings to allow VS2012 to compile idl_parser and idl_gen_text (for exporting binary protobuf blobs as JSON) cleanly under static analysis.
---
 include/flatbuffers/util.h | 3 +++
 src/idl_parser.cpp         | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h
index ba73d67bd..f3fbef497 100644
--- a/include/flatbuffers/util.h
+++ b/include/flatbuffers/util.h
@@ -210,6 +210,9 @@ inline void EnsureDirExists(const std::string &filepath) {
   auto parent = StripFileName(filepath);
   if (parent.length()) EnsureDirExists(parent);
   #ifdef _WIN32
+    #ifdef _MSC_VER
+    #pragma warning(suppress: 6031)
+    #endif
     _mkdir(filepath.c_str());
   #else
     mkdir(filepath.c_str(), S_IRWXU|S_IRGRP|S_IXGRP);
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index b533d213e..91ada0e6d 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -191,7 +191,7 @@ std::string Parser::TokenToStringId(int t) {
 // Parses exactly nibbles worth of hex digits into a number, or error.
 CheckedError Parser::ParseHexNum(int nibbles, int64_t *val) {
   for (int i = 0; i < nibbles; i++)
-    if (!isxdigit(cursor_[i]))
+    if (!isxdigit(static_cast<const unsigned char>(cursor_[i])))
       return Error("escape code must be followed by " + NumToString(nibbles) +
                    " hex digits");
   std::string target(cursor_, cursor_ + nibbles);
@@ -214,7 +214,7 @@ CheckedError Parser::Next() {
       case '{': case '}': case '(': case ')': case '[': case ']':
       case ',': case ':': case ';': case '=': return NoError();
       case '.':
-        if(!isdigit(*cursor_)) return NoError();
+        if(!isdigit(static_cast<const unsigned char>(*cursor_))) return NoError();
         return Error("floating point constant can\'t start with \".\"");
       case '\"':
       case '\'':

From cfd6e7dea8dd5e30374a8528dd420f43f0dfc1ee Mon Sep 17 00:00:00 2001
From: Chris Pickett <github@parnic.com>
Date: Wed, 6 Jan 2016 12:04:46 -0600
Subject: [PATCH 044/185] Documented what the suppressed warning is about

---
 include/flatbuffers/util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h
index f3fbef497..41a6ce07e 100644
--- a/include/flatbuffers/util.h
+++ b/include/flatbuffers/util.h
@@ -211,7 +211,7 @@ inline void EnsureDirExists(const std::string &filepath) {
   if (parent.length()) EnsureDirExists(parent);
   #ifdef _WIN32
     #ifdef _MSC_VER
-    #pragma warning(suppress: 6031)
+      #pragma warning(suppress: 6031) // "return value ignored: <function> could return unexpected value"
     #endif
     _mkdir(filepath.c_str());
   #else

From b4fef31d8410afb2e5ee8d070ac777ebfb89b540 Mon Sep 17 00:00:00 2001
From: Chris Pickett <github@parnic.com>
Date: Wed, 6 Jan 2016 12:20:38 -0600
Subject: [PATCH 045/185] Made requested revisions for naming and spacing

---
 include/flatbuffers/util.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h
index d2d8cae8e..2c3be68d3 100644
--- a/include/flatbuffers/util.h
+++ b/include/flatbuffers/util.h
@@ -219,19 +219,19 @@ inline void EnsureDirExists(const std::string &filepath) {
 // 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) {
-#ifdef NO_ABSOLUTE_PATH_RESOLUTION
-	return filepath;
-#else
-  #ifdef _WIN32
-    char abs_path[MAX_PATH];
-    return GetFullPathNameA(filepath.c_str(), MAX_PATH, abs_path, nullptr)
+  #ifdef FLATBUFFERS_NO_ABSOLUTE_PATH_RESOLUTION
+    return filepath;
   #else
-    char abs_path[PATH_MAX];
-    return realpath(filepath.c_str(), abs_path)
-  #endif
-    ? abs_path
-    : filepath;
-#endif // NO_ABSOLUTE_PATH_RESOLUTION
+    #ifdef _WIN32
+      char abs_path[MAX_PATH];
+      return GetFullPathNameA(filepath.c_str(), MAX_PATH, abs_path, nullptr)
+    #else
+      char abs_path[PATH_MAX];
+      return realpath(filepath.c_str(), abs_path)
+    #endif
+      ? abs_path
+      : filepath;
+  #endif // NO_ABSOLUTE_PATH_RESOLUTION
 }
 
 // To and from UTF-8 unicode conversion functions

From a3363def52d4e7e57cef3b41b01c1d9249917fc1 Mon Sep 17 00:00:00 2001
From: Chris Pickett <github@parnic.com>
Date: Wed, 6 Jan 2016 12:21:17 -0600
Subject: [PATCH 046/185] Updated comment on endif for new name

---
 include/flatbuffers/util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h
index 2c3be68d3..b47d179c6 100644
--- a/include/flatbuffers/util.h
+++ b/include/flatbuffers/util.h
@@ -231,7 +231,7 @@ inline std::string AbsolutePath(const std::string &filepath) {
     #endif
       ? abs_path
       : filepath;
-  #endif // NO_ABSOLUTE_PATH_RESOLUTION
+  #endif // FLATBUFFERS_NO_ABSOLUTE_PATH_RESOLUTION
 }
 
 // To and from UTF-8 unicode conversion functions

From e1e7dfa6259b9e50a5ce2597fc1bedd575b58663 Mon Sep 17 00:00:00 2001
From: Chris Pickett <github@parnic.com>
Date: Wed, 6 Jan 2016 12:33:19 -0600
Subject: [PATCH 047/185] Fixed warning building in VS2012

src\reflection.cpp(297): warning C4267: 'argument' : conversion from 'size_t' to 'flatbuffers::uoffset_t', possible loss of data

sizeof() was promoting the type from uoffset_t to size_t.
---
 src/reflection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/reflection.cpp b/src/reflection.cpp
index ab39e1e20..d82c046cc 100644
--- a/src/reflection.cpp
+++ b/src/reflection.cpp
@@ -289,7 +289,7 @@ void SetString(const reflection::Schema &schema, const std::string &val,
   auto delta = static_cast<int>(val.size()) - static_cast<int>(str->Length());
   auto str_start = static_cast<uoffset_t>(
                      reinterpret_cast<const uint8_t *>(str) - flatbuf->data());
-  auto start = str_start + sizeof(uoffset_t);
+  auto start = str_start + static_cast<uoffset_t>(sizeof(uoffset_t));
   if (delta) {
     // Clear the old string, since we don't want parts of it remaining.
     memset(flatbuf->data() + start, 0, str->Length());

From 178f768f7f8fb2cb96027fe2ec029be96bbca504 Mon Sep 17 00:00:00 2001
From: Chris Pickett <github@parnic.com>
Date: Wed, 6 Jan 2016 14:21:18 -0600
Subject: [PATCH 048/185] Changed how the SA warning is suppressed to avoid
 pragma stuff

---
 include/flatbuffers/util.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h
index 41a6ce07e..8af592302 100644
--- a/include/flatbuffers/util.h
+++ b/include/flatbuffers/util.h
@@ -210,10 +210,7 @@ inline void EnsureDirExists(const std::string &filepath) {
   auto parent = StripFileName(filepath);
   if (parent.length()) EnsureDirExists(parent);
   #ifdef _WIN32
-    #ifdef _MSC_VER
-      #pragma warning(suppress: 6031) // "return value ignored: <function> could return unexpected value"
-    #endif
-    _mkdir(filepath.c_str());
+    (void)_mkdir(filepath.c_str());
   #else
     mkdir(filepath.c_str(), S_IRWXU|S_IRGRP|S_IXGRP);
   #endif

From 6beafd14e09664d526e78c7c945f8f0c40f6de75 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 6 Jan 2016 16:51:00 -0800
Subject: [PATCH 049/185] Updated docs to point to benchmark source code
 location.

Change-Id: If4c8fac6a421ac6436cab0dd7a0ae822a32e90bf
---
 docs/html/md__benchmarks.html | 4 +++-
 docs/source/Benchmarks.md     | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/html/md__benchmarks.html b/docs/html/md__benchmarks.html
index 3b8ec2cd3..840b81f1f 100644
--- a/docs/html/md__benchmarks.html
+++ b/docs/html/md__benchmarks.html
@@ -94,8 +94,10 @@ $(document).ready(function(){initNavTree('md__benchmarks.html','');});
 <li>Thrift: very similar to Protocol Buffers, but appears to be less efficient, and have more dependencies.</li>
 <li>YAML: a superset of JSON and otherwise very similar. Used by e.g. Unity.</li>
 <li>C# comes with built-in serialization functionality, as used by Unity also. Being tied to the language, and having no automatic versioning support limits its applicability.</li>
-<li>Project Anarchy (the free mobile engine by Havok) comes with a serialization system, that however does no automatic versioning (have to code around new fields manually), is very much tied to the rest of the engine, and works without a schema to generate code (tied to your C++ class definition). </li>
+<li>Project Anarchy (the free mobile engine by Havok) comes with a serialization system, that however does no automatic versioning (have to code around new fields manually), is very much tied to the rest of the engine, and works without a schema to generate code (tied to your C++ class definition).</li>
 </ul>
+<h3>Code for benchmarks</h3>
+<p>Code for these benchmarks sits in <code>benchmarks/</code> in git branch <code>benchmarks</code>. It sits in its own branch because it has submodule dependencies that the main project doesn't need, and the code standards do not meet those of the main project. Please read <code>benchmarks/cpp/README.txt</code> before working with the code. </p>
 </div></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- Google Analytics -->
diff --git a/docs/source/Benchmarks.md b/docs/source/Benchmarks.md
index d613d0226..50061d717 100755
--- a/docs/source/Benchmarks.md
+++ b/docs/source/Benchmarks.md
@@ -52,3 +52,9 @@ meant to be representative of game data, e.g. a scene format.
     fields manually), is very much tied to the rest of the engine, and works
     without a schema to generate code (tied to your C++ class definition).
 
+### Code for benchmarks
+
+Code for these benchmarks sits in `benchmarks/` in git branch `benchmarks`.
+It sits in its own branch because it has submodule dependencies that the main
+project doesn't need, and the code standards do not meet those of the main
+project. Please read `benchmarks/cpp/README.txt` before working with the code.

From 514d274a4550b07c85ae8ee8a9321ccfe79b18d0 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 6 Jan 2016 17:48:19 -0800
Subject: [PATCH 050/185] Added android static library target for text
 parsing/generation etc.

Change-Id: If24e3eea90cef2a0d6a9d98fb503d2e3ec34ceed
Tested: on Linux.
---
 android/jni/Android.mk | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 1d89d8864..905fbe91a 100755
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -19,26 +19,33 @@ LOCAL_PATH := $(call my-dir)/../..
 include $(LOCAL_PATH)/android/jni/include.mk
 LOCAL_PATH := $(call realpath-portable,$(LOCAL_PATH))
 
-# Empty static library so that other projects can include FlatBuffers as a
-# module.
+# Empty static library so that other projects can include just the basic
+# FlatBuffers headers as a module.
 include $(CLEAR_VARS)
 LOCAL_MODULE := flatbuffers
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_EXPORT_CPPFLAGS := -std=c++11 -fexceptions -Wall -Wno-literal-suffix
 include $(BUILD_STATIC_LIBRARY)
 
+# static library that additionally includes text parsing/generation/reflection
+# for projects that want richer functionality.
+include $(CLEAR_VARS)
+LOCAL_MODULE := flatbuffers_extra
+LOCAL_SRC_FILES := src/idl_parser.cpp \
+                   src/idl_gen_text.cpp \
+                   src/reflection.cpp
+LOCAL_STATIC_LIBRARIES := flatbuffers
+include $(BUILD_STATIC_LIBRARY)
+
 # FlatBuffers test
 include $(CLEAR_VARS)
 LOCAL_MODULE := FlatBufferTest
 LOCAL_SRC_FILES := android/jni/main.cpp \
                    tests/test.cpp \
-                   src/idl_parser.cpp \
-                   src/idl_gen_text.cpp \
                    src/idl_gen_fbs.cpp \
-                   src/idl_gen_general.cpp \
-                   src/reflection.cpp
+                   src/idl_gen_general.cpp
 LOCAL_LDLIBS := -llog -landroid
-LOCAL_STATIC_LIBRARIES := android_native_app_glue flatbuffers
+LOCAL_STATIC_LIBRARIES := android_native_app_glue flatbuffers_extra
 LOCAL_ARM_MODE := arm
 include $(BUILD_SHARED_LIBRARY)
 

From 63b526db52d562b45c64f1dc6b8185fe8c42c19e Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Fri, 8 Jan 2016 11:39:56 -0800
Subject: [PATCH 051/185] Ensured code is not generated directly from .proto
 files.

The parser state generated from the .proto conversion process is
not exactly the same as what you get by parsing the generated
schema, which can cause problems. This check enforces that you
first convert the .proto, then generate code from the new schema.

Change-Id: I04b53af9288d87e256d1cc109388332fefb3a09f
Tested: on Linux.
---
 src/flatc.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/flatc.cpp b/src/flatc.cpp
index 48d98ce41..97ee79386 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -183,7 +183,6 @@ int main(int argc, const char *argv[]) {
         binary_files_from = filenames.size();
       } else if(arg == "--proto") {
         opts.proto_mode = true;
-        any_generator = true;
       } else if(arg == "--schema") {
         schema_binary = true;
       } else if(arg == "-M") {
@@ -208,8 +207,12 @@ int main(int argc, const char *argv[]) {
 
   if (!filenames.size()) Error("missing input files", false, true);
 
-  if (!any_generator)
+  if (opts.proto_mode) {
+    if (any_generator)
+      Error("cannot generate code directly from .proto files", true);
+  } else if (!any_generator) {
     Error("no options: specify at least one generator.", true);
+  }
 
   // Now process the files:
   parser = new flatbuffers::Parser(opts);

From 42c20d7a6940b951f2523aa957000a79697bea59 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Fri, 8 Jan 2016 13:10:25 -0800
Subject: [PATCH 052/185] Make flatc check for binary files to avoid accidental
 parsing.

Binary file arguments to flatc have to be preceded by -- to
identify them, forgetting this however results in them being
attempted to be parsed as schema/json, with cryptic errors.
This instead gives an error if 0 bytes are contained in your
text file.

Bug: 22069056
Change-Id: I226bf651dcb016f18d7c8ffadcf23466a1fc0b87
Tested: on Linux.
---
 src/flatc.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/flatc.cpp b/src/flatc.cpp
index 97ee79386..dae107e49 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -117,7 +117,7 @@ static void Error(const std::string &err, bool usage, bool show_exe_name) {
       "                  This may crash flatc given a mismatched schema.\n"
       "  --proto         Input is a .proto, translate to .fbs.\n"
       "  --schema        Serialize schemas instead of JSON (use with -b)\n"
-      "FILEs may depend on declarations in earlier files.\n"
+      "FILEs may be schemas, or JSON files (conforming to preceding schema)\n"
       "FILEs after the -- must be binary flatbuffer format files.\n"
       "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"
@@ -251,6 +251,10 @@ int main(int argc, const char *argv[]) {
           }
         }
       } else {
+        // Check if file contains 0 bytes.
+        if (contents.length() != strlen(contents.c_str())) {
+          Error("input file appears to be binary: " + *file_it, true);
+        }
         if (flatbuffers::GetExtension(*file_it) == "fbs") {
           // If we're processing multiple schemas, make sure to start each
           // one from scratch. If it depends on previous schemas it must do

From b63ebad49dc0ff3456c787f9b689144f6e8860c7 Mon Sep 17 00:00:00 2001
From: Chandra Penke <chandrapenke@gmail.com>
Date: Wed, 6 Jan 2016 08:31:53 -0800
Subject: [PATCH 053/185] Fix #3497: Add support for compiling in g++ 4.4 and
 4.5

- Removed uses of lambda expressions

- Added custom defines for constexpr and nullptr

- Removed trailing comma of last value from generated enums
---
 include/flatbuffers/flatbuffers.h             | 48 ++++++++---
 include/flatbuffers/hash.h                    |  6 +-
 include/flatbuffers/idl.h                     |  4 +
 include/flatbuffers/util.h                    |  8 +-
 samples/monster_generated.h                   |  2 +-
 src/flatc.cpp                                 |  1 +
 src/idl_gen_cpp.cpp                           | 57 +++++++++----
 src/idl_parser.cpp                            | 85 ++++++++++---------
 tests/monster_test_generated.h                |  6 +-
 .../namespace_test1_generated.h               |  2 +-
 .../namespace_test2_generated.h               |  2 +-
 tests/test.cpp                                | 35 +++++---
 12 files changed, 166 insertions(+), 90 deletions(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index b6b84030f..65790b822 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -33,11 +33,30 @@
 #if __cplusplus <= 199711L && \
     (!defined(_MSC_VER) || _MSC_VER < 1600) && \
     (!defined(__GNUC__) || \
-      (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40603))
-  #error A C++11 compatible compiler is required for FlatBuffers.
+      (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40400))
+  #error A C++11 compatible compiler with support for the auto typing is required for FlatBuffers.
   #error __cplusplus _MSC_VER __GNUC__  __GNUC_MINOR__  __GNUC_PATCHLEVEL__
 #endif
 
+#if !defined(__clang__) && \
+    defined(__GNUC__) && \
+    (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40600)
+  // Backwards compatability for g++ 4.4, and 4.5 which don't have the nullptr and constexpr
+  // keywords. Note the __clang__ check is needed, because clang presents itself as an older GNUC
+  // compiler.
+  #ifndef nullptr_t
+    const class nullptr_t {
+    public:
+      template<class T> inline operator T*() const { return 0; }
+    private:
+      void operator&() const;
+    } nullptr = {};
+  #endif
+  #ifndef constexpr
+    #define constexpr const
+  #endif
+#endif
+
 // The wire format uses a little endian encoding (since that's efficient for
 // the common platforms).
 #if !defined(FLATBUFFERS_LITTLEENDIAN)
@@ -154,7 +173,11 @@ template<typename T> size_t AlignOf() {
   #ifdef _MSC_VER
     return __alignof(T);
   #else
-    return alignof(T);
+    #ifndef alignof
+      return __alignof__(T);
+    #else
+      return alignof(T);
+    #endif
   #endif
 }
 
@@ -836,15 +859,20 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
     return CreateVectorOfStructs(v.data(), v.size());
   }
 
+  template<typename T>
+  struct TableKeyComparator {
+  TableKeyComparator(vector_downward& buf) : buf_(buf) {}
+    bool operator()(const Offset<T> &a, const Offset<T> &b) const {
+      auto table_a = reinterpret_cast<T *>(buf_.data_at(a.o));
+      auto table_b = reinterpret_cast<T *>(buf_.data_at(b.o));
+      return table_a->KeyCompareLessThan(table_b);
+    }
+    vector_downward& buf_;
+  };
+
   template<typename T> Offset<Vector<Offset<T>>> CreateVectorOfSortedTables(
                                                      Offset<T> *v, size_t len) {
-    std::sort(v, v + len,
-      [this](const Offset<T> &a, const Offset<T> &b) -> bool {
-        auto table_a = reinterpret_cast<T *>(buf_.data_at(a.o));
-        auto table_b = reinterpret_cast<T *>(buf_.data_at(b.o));
-        return table_a->KeyCompareLessThan(table_b);
-      }
-    );
+    std::sort(v, v + len, TableKeyComparator<T>(buf_));
     return CreateVector(v, len);
   }
 
diff --git a/include/flatbuffers/hash.h b/include/flatbuffers/hash.h
index 134d17517..9ae37e5c0 100644
--- a/include/flatbuffers/hash.h
+++ b/include/flatbuffers/hash.h
@@ -20,6 +20,8 @@
 #include <cstdint>
 #include <cstring>
 
+#include "flatbuffers/flatbuffers.h"
+
 namespace flatbuffers {
 
 template <typename T>
@@ -36,8 +38,8 @@ struct FnvTraits<uint32_t> {
 
 template <>
 struct FnvTraits<uint64_t> {
-  static const uint64_t kFnvPrime = 0x00000100000001b3;
-  static const uint64_t kOffsetBasis = 0xcbf29ce484222645;
+  static const uint64_t kFnvPrime = 0x00000100000001b3ULL;
+  static const uint64_t kOffsetBasis = 0xcbf29ce484222645ULL;
 };
 
 template <typename T>
diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index d052d6f4d..66ca8b5c1 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -491,6 +491,10 @@ private:
   FLATBUFFERS_CHECKED_ERROR DoParse(const char *_source,
                                     const char **include_paths,
                                     const char *source_filename);
+  FLATBUFFERS_CHECKED_ERROR CheckClash(std::vector<FieldDef*> &fields,
+                                       StructDef *struct_def,
+                                       const char *suffix,
+                                       BaseType baseType);
 
  public:
   SymbolTable<StructDef> structs_;
diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h
index ba73d67bd..b9ce77dac 100644
--- a/include/flatbuffers/util.h
+++ b/include/flatbuffers/util.h
@@ -38,6 +38,8 @@
 #include <limits.h>
 #endif
 
+#include "flatbuffers/flatbuffers.h"
+
 namespace flatbuffers {
 
 // Convert an integer or floating point value to a string.
@@ -68,7 +70,7 @@ template<> inline std::string NumToString<double>(double t) {
   auto p = s.find_last_not_of('0');
   if (p != std::string::npos) {
     s.resize(p + 1);  // Strip trailing zeroes.
-    if (s.back() == '.')
+    if (s[s.size() - 1] == '.')
       s.erase(s.size() - 1, 1);  // Strip '.' if a whole number.
   }
   return s;
@@ -197,8 +199,8 @@ inline std::string StripFileName(const std::string &filepath) {
 inline std::string ConCatPathFileName(const std::string &path,
                                       const std::string &filename) {
   std::string filepath = path;
-  if (path.length() && path.back() != kPathSeparator &&
-                       path.back() != kPosixPathSeparator)
+  if (path.length() && path[path.size() - 1] != kPathSeparator &&
+                       path[path.size() - 1] != kPosixPathSeparator)
     filepath += kPathSeparator;
   filepath += filename;
   return filepath;
diff --git a/samples/monster_generated.h b/samples/monster_generated.h
index 53935ee93..2277b9738 100644
--- a/samples/monster_generated.h
+++ b/samples/monster_generated.h
@@ -65,7 +65,7 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
     VT_HP = 8,
     VT_NAME = 10,
     VT_INVENTORY = 14,
-    VT_COLOR = 16,
+    VT_COLOR = 16
   };
   const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
   Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
diff --git a/src/flatc.cpp b/src/flatc.cpp
index 48d98ce41..3bffa16fb 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -17,6 +17,7 @@
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
+#include <limits>
 
 static void Error(const std::string &err, bool usage = false,
                   bool show_exe_name = true);
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index fa2708000..bb6942073 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -267,16 +267,24 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
   // Generate field id constants.
   if (struct_def.fields.vec.size() > 0) {
     code += "  enum {\n";
+    bool is_first_field = true; // track the first field that's not deprecated
     for (auto it = struct_def.fields.vec.begin();
          it != struct_def.fields.vec.end();
          ++it) {
       auto &field = **it;
       if (!field.deprecated) {  // Deprecated fields won't be accessible.
+        if (!is_first_field) {
+          // Add trailing comma and newline to previous element. Don't add trailing comma to 
+          // last element since older versions of gcc complain about this.
+          code += ",\n";
+        } else {
+          is_first_field = false;
+        }
         code += "    " + GenFieldOffsetName(field) + " = ";
-        code += NumToString(field.value.offset) + ",\n";
+        code += NumToString(field.value.offset);
       }
     }
-    code += "  };\n";
+    code += "\n  };\n";
   }
   // Generate the accessors.
   for (auto it = struct_def.fields.vec.begin();
@@ -513,15 +521,32 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
 }
 
 static void GenPadding(const FieldDef &field,
-                       const std::function<void (int bits)> &f) {
+            std::string &code,
+            int &padding_id,
+            const std::function<void (int bits, std::string &code, int &padding_id)> &f) {
   if (field.padding) {
     for (int i = 0; i < 4; i++)
       if (static_cast<int>(field.padding) & (1 << i))
-        f((1 << i) * 8);
+        f((1 << i) * 8, code, padding_id);
     assert(!(field.padding & ~0xF));
   }
 }
 
+static void PaddingDefinition(int bits, std::string &code, int &padding_id) {
+  code += "  int" + NumToString(bits) +
+          "_t __padding" + NumToString(padding_id++) + ";\n";
+}
+
+static void PaddingDeclaration(int bits, std::string &code, int &padding_id) {
+  (void)bits;
+  code += " (void)__padding" + NumToString(padding_id++) + ";";
+}
+
+static void PaddingInitializer(int bits, std::string &code, int &padding_id) {
+  (void)bits;
+  code += ", __padding" + NumToString(padding_id++) + "(0)";
+}
+
 // Generate an accessor struct with constructor for a flatbuffers struct.
 static void GenStruct(const Parser &parser, StructDef &struct_def,
                       std::string *code_ptr) {
@@ -543,10 +568,7 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
     auto &field = **it;
     code += "  " + GenTypeGet(parser, field.value.type, " ", "", " ", false);
     code += field.name + "_;\n";
-    GenPadding(field, [&code, &padding_id](int bits) {
-      code += "  int" + NumToString(bits) +
-              "_t __padding" + NumToString(padding_id++) + ";\n";
-    });
+    GenPadding(field, code, padding_id, PaddingDefinition);
   }
 
   // Generate a constructor that takes all fields as arguments.
@@ -574,21 +596,16 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
     } else {
       code += "_" + field.name + ")";
     }
-    GenPadding(field, [&code, &padding_id](int bits) {
-      (void)bits;
-      code += ", __padding" + NumToString(padding_id++) + "(0)";
-    });
+    GenPadding(field, code, padding_id, PaddingInitializer);
   }
+
   code += " {";
   padding_id = 0;
   for (auto it = struct_def.fields.vec.begin();
        it != struct_def.fields.vec.end();
        ++it) {
     auto &field = **it;
-    GenPadding(field, [&code, &padding_id](int bits) {
-      (void)bits;
-      code += " (void)__padding" + NumToString(padding_id++) + ";";
-    });
+    GenPadding(field, code, padding_id, PaddingDeclaration);
   }
   code += " }\n\n";
 
@@ -642,6 +659,12 @@ void CloseNestedNameSpaces(Namespace *ns, std::string *code_ptr) {
 
 }  // namespace cpp
 
+struct IsAlnum {
+  bool operator()(char c) {
+    return !isalnum(c);
+  }
+};
+
 // Iterate through all definitions we haven't generate code for (enums, structs,
 // and tables) and output them to a single file.
 std::string GenerateCPP(const Parser &parser,
@@ -712,7 +735,7 @@ std::string GenerateCPP(const Parser &parser,
     include_guard_ident.erase(
       std::remove_if(include_guard_ident.begin(),
                      include_guard_ident.end(),
-                     [](char c) { return !isalnum(c); }),
+                     IsAlnum()),
       include_guard_ident.end());
     std::string include_guard = "FLATBUFFERS_GENERATED_" + include_guard_ident;
     include_guard += "_";
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index b533d213e..a1e96f663 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -1109,6 +1109,33 @@ CheckedError Parser::StartStruct(const std::string &name, StructDef **dest) {
   return NoError();
 }
 
+CheckedError Parser::CheckClash(std::vector<FieldDef*> &fields,
+                                StructDef *struct_def,
+                                const char *suffix,
+                                BaseType basetype) {
+  auto len = strlen(suffix);
+  for (auto it = fields.begin(); it != fields.end(); ++it) {
+    auto &fname = (*it)->name;
+    if (fname.length() > len &&
+        fname.compare(fname.length() - len, len, suffix) == 0 &&
+        (*it)->value.type.base_type != BASE_TYPE_UTYPE) {
+      auto field = struct_def->fields.Lookup(
+                                             fname.substr(0, fname.length() - len));
+      if (field && field->value.type.base_type == basetype)
+        return Error("Field " + fname +
+                     " would clash with generated functions for field " +
+                     field->name);
+    }
+  }
+  return NoError();
+}
+    
+static bool compareFieldDefs(const FieldDef *a, const FieldDef *b) {
+  auto a_id = atoi(a->attributes.Lookup("id")->constant.c_str());
+  auto b_id = atoi(b->attributes.Lookup("id")->constant.c_str());
+  return a_id < b_id;
+}
+
 CheckedError Parser::ParseDecl() {
   std::vector<std::string> dc = doc_comment_;
   bool fixed = Is(kTokenStruct);
@@ -1151,12 +1178,7 @@ CheckedError Parser::ParseDecl() {
               "either all fields or no fields must have an 'id' attribute");
       // Simply sort by id, then the fields are the same as if no ids had
       // been specified.
-      std::sort(fields.begin(), fields.end(),
-        [](const FieldDef *a, const FieldDef *b) -> bool {
-          auto a_id = atoi(a->attributes.Lookup("id")->constant.c_str());
-          auto b_id = atoi(b->attributes.Lookup("id")->constant.c_str());
-          return a_id < b_id;
-      });
+      std::sort(fields.begin(), fields.end(), compareFieldDefs);
       // Verify we have a contiguous set, and reassign vtable offsets.
       for (int i = 0; i < static_cast<int>(fields.size()); i++) {
         if (i != atoi(fields[i]->attributes.Lookup("id")->constant.c_str()))
@@ -1166,34 +1188,13 @@ CheckedError Parser::ParseDecl() {
       }
     }
   }
-  // Check that no identifiers clash with auto generated fields.
-  // This is not an ideal situation, but should occur very infrequently,
-  // and allows us to keep using very readable names for type & length fields
-  // without inducing compile errors.
-  auto CheckClash = [&fields, &struct_def, this](const char *suffix,
-                                            BaseType basetype) -> CheckedError {
-    auto len = strlen(suffix);
-    for (auto it = fields.begin(); it != fields.end(); ++it) {
-      auto &fname = (*it)->name;
-      if (fname.length() > len &&
-          fname.compare(fname.length() - len, len, suffix) == 0 &&
-          (*it)->value.type.base_type != BASE_TYPE_UTYPE) {
-        auto field = struct_def->fields.Lookup(
-                       fname.substr(0, fname.length() - len));
-        if (field && field->value.type.base_type == basetype)
-          return Error("Field " + fname +
-                " would clash with generated functions for field " +
-                field->name);
-      }
-    }
-    return NoError();
-  };
-  ECHECK(CheckClash("_type", BASE_TYPE_UNION));
-  ECHECK(CheckClash("Type", BASE_TYPE_UNION));
-  ECHECK(CheckClash("_length", BASE_TYPE_VECTOR));
-  ECHECK(CheckClash("Length", BASE_TYPE_VECTOR));
-  ECHECK(CheckClash("_byte_vector", BASE_TYPE_STRING));
-  ECHECK(CheckClash("ByteVector", BASE_TYPE_STRING));
+
+  ECHECK(CheckClash(fields, struct_def, "_type", BASE_TYPE_UNION));
+  ECHECK(CheckClash(fields, struct_def, "Type", BASE_TYPE_UNION));
+  ECHECK(CheckClash(fields, struct_def, "_length", BASE_TYPE_VECTOR));
+  ECHECK(CheckClash(fields, struct_def, "Length", BASE_TYPE_VECTOR));
+  ECHECK(CheckClash(fields, struct_def, "_byte_vector", BASE_TYPE_STRING));
+  ECHECK(CheckClash(fields, struct_def, "ByteVector", BASE_TYPE_STRING));
   EXPECT('}');
   return NoError();
 }
@@ -1235,6 +1236,10 @@ CheckedError Parser::ParseNamespace() {
   return NoError();
 }
 
+static bool compareEnumVals(const EnumVal *a, const EnumVal* b) {
+  return a->value < b->value;
+}
+
 // Best effort parsing of .proto declarations, with the aim to turn them
 // in the closest corresponding FlatBuffer equivalent.
 // We parse everything as identifiers instead of keywords, since we don't
@@ -1285,9 +1290,8 @@ CheckedError Parser::ParseProtoDecl() {
     if (Is(';')) NEXT();
     // Protobuf allows them to be specified in any order, so sort afterwards.
     auto &v = enum_def->vals.vec;
-    std::sort(v.begin(), v.end(), [](const EnumVal *a, const EnumVal *b) {
-      return a->value < b->value;
-    });
+    std::sort(v.begin(), v.end(), compareEnumVals);    
+
     // Temp: remove any duplicates, as .fbs files can't handle them.
     for (auto it = v.begin(); it != v.end(); ) {
       if (it != v.begin() && it[0]->value == it[-1]->value) it = v.erase(it);
@@ -1735,11 +1739,14 @@ std::set<std::string> Parser::GetIncludedFilesRecursive(
 
 // Schema serialization functionality:
 
+template<typename T> bool compareName(const T* a, const T* b) {
+    return a->name < b->name;
+}
+
 template<typename T> void AssignIndices(const std::vector<T *> &defvec) {
   // Pre-sort these vectors, such that we can set the correct indices for them.
   auto vec = defvec;
-  std::sort(vec.begin(), vec.end(),
-            [](const T *a, const T *b) { return a->name < b->name; });
+  std::sort(vec.begin(), vec.end(), compareName<T>);
   for (int i = 0; i < static_cast<int>(vec.size()); i++) vec[i]->index = i;
 }
 
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index 14780bf2d..5f0163f9e 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -98,7 +98,7 @@ STRUCT_END(Vec3, 32);
 
 struct TestSimpleTableWithEnum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum {
-    VT_COLOR = 4,
+    VT_COLOR = 4
   };
   Color color() const { return static_cast<Color>(GetField<int8_t>(VT_COLOR, 2)); }
   bool mutate_color(Color _color) { return SetField(VT_COLOR, static_cast<int8_t>(_color)); }
@@ -132,7 +132,7 @@ struct Stat FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum {
     VT_ID = 4,
     VT_VAL = 6,
-    VT_COUNT = 8,
+    VT_COUNT = 8
   };
   const flatbuffers::String *id() const { return GetPointer<const flatbuffers::String *>(VT_ID); }
   flatbuffers::String *mutable_id() { return GetPointer<flatbuffers::String *>(VT_ID); }
@@ -201,7 +201,7 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
     VT_TESTHASHU32_FNV1A = 46,
     VT_TESTHASHS64_FNV1A = 48,
     VT_TESTHASHU64_FNV1A = 50,
-    VT_TESTARRAYOFBOOLS = 52,
+    VT_TESTARRAYOFBOOLS = 52
   };
   const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
   Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
diff --git a/tests/namespace_test/namespace_test1_generated.h b/tests/namespace_test/namespace_test1_generated.h
index 29f8e1229..e126f4e9d 100644
--- a/tests/namespace_test/namespace_test1_generated.h
+++ b/tests/namespace_test/namespace_test1_generated.h
@@ -43,7 +43,7 @@ STRUCT_END(StructInNestedNS, 8);
 
 struct TableInNestedNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum {
-    VT_FOO = 4,
+    VT_FOO = 4
   };
   int32_t foo() const { return GetField<int32_t>(VT_FOO, 0); }
   bool mutate_foo(int32_t _foo) { return SetField(VT_FOO, _foo); }
diff --git a/tests/namespace_test/namespace_test2_generated.h b/tests/namespace_test/namespace_test2_generated.h
index f60986a61..5075894e1 100644
--- a/tests/namespace_test/namespace_test2_generated.h
+++ b/tests/namespace_test/namespace_test2_generated.h
@@ -22,7 +22,7 @@ struct TableInFirstNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum {
     VT_FOO_TABLE = 4,
     VT_FOO_ENUM = 6,
-    VT_FOO_STRUCT = 8,
+    VT_FOO_STRUCT = 8
   };
   const NamespaceA::NamespaceB::TableInNestedNS *foo_table() const { return GetPointer<const NamespaceA::NamespaceB::TableInNestedNS *>(VT_FOO_TABLE); }
   NamespaceA::NamespaceB::TableInNestedNS *mutable_foo_table() { return GetPointer<NamespaceA::NamespaceB::TableInNestedNS *>(VT_FOO_TABLE); }
diff --git a/tests/test.cpp b/tests/test.cpp
index 83cdaef94..fce249e99 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -478,8 +478,8 @@ void FuzzTest1() {
   const uint16_t ushort_val = 0xFEEE;
   const int32_t  int_val    = 0x83333333;
   const uint32_t uint_val   = 0xFDDDDDDD;
-  const int64_t  long_val   = 0x8444444444444444;
-  const uint64_t ulong_val  = 0xFCCCCCCCCCCCCCCC;
+  const int64_t  long_val   = 0x8444444444444444LL;
+  const uint64_t ulong_val  = 0xFCCCCCCCCCCCCCCCULL;
   const float    float_val  = 3.14159f;
   const double   double_val = 3.14159265359;
 
@@ -564,8 +564,28 @@ void FuzzTest2() {
 
   struct RndDef {
     std::string instances[instances_per_definition];
+
+    // Since we're generating schema and corresponding data in tandem,
+    // this convenience function adds strings to both at once.
+    static void Add(RndDef (&definitions_l)[num_definitions],
+                    std::string &schema_l,
+                    const int instances_per_definition_l,
+                    const char *schema_add, const char *instance_add,
+                    int definition) {
+      schema_l += schema_add;
+      for (int i = 0; i < instances_per_definition_l; i++)
+        definitions_l[definition].instances[i] += instance_add;
+    }
   };
 
+  #define AddToSchemaAndInstances(schema_add, instance_add) \
+    RndDef::Add(definitions, schema, instances_per_definition, \
+                schema_add, instance_add, definition)
+
+  #define Dummy() \
+    RndDef::Add(definitions, schema, instances_per_definition, \
+                "byte", "1", definition)
+
   RndDef definitions[num_definitions];
 
   // We are going to generate num_definitions, the first
@@ -577,17 +597,6 @@ void FuzzTest2() {
   // being generated. We generate multiple instances such that when creating
   // hierarchy, we get some variety by picking one randomly.
   for (int definition = 0; definition < num_definitions; definition++) {
-    // Since we're generating schema & and corresponding data in tandem,
-    // this convenience function adds strings to both at once.
-    auto AddToSchemaAndInstances = [&](const char *schema_add,
-                                       const char *instance_add) {
-      schema += schema_add;
-      for (int i = 0; i < instances_per_definition; i++)
-        definitions[definition].instances[i] += instance_add;
-    };
-    // Generate a default type if we can't generate something else.
-    auto Dummy = [&]() { AddToSchemaAndInstances("byte", "1"); };
-
     std::string definition_name = "D" + flatbuffers::NumToString(definition);
 
     bool is_struct = definition < num_struct_definitions;

From 77a6a786b8c888cb59ce171fb4888d0e0dd145c8 Mon Sep 17 00:00:00 2001
From: Jaak Ristioja <jaak+github@ristioja.ee>
Date: Wed, 13 Jan 2016 15:30:27 +0200
Subject: [PATCH 054/185] Fixed comment typo

---
 src/idl_gen_cpp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index fa2708000..4fc2e3f9c 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -45,7 +45,7 @@ static std::string WrapInNameSpace(const Parser &parser,
 }
 
 // Translates a qualified name in flatbuffer text format to the same name in
-// the equivalent C++ namepsace.
+// the equivalent C++ namespace.
 static std::string TranslateNameSpace(const std::string &qualified_name) {
   std::string cpp_qualified_name = qualified_name;
   size_t start_pos = 0;

From eaa2b414b28bee02bee140658c238da648790a48 Mon Sep 17 00:00:00 2001
From: Oli Wilkinson <Oli Wilkinson>
Date: Mon, 18 Jan 2016 15:23:14 +0000
Subject: [PATCH 055/185] Added generation of typed helpers when using
 nested_flatbuffers in Java/C#. Fixes #3500

---
 src/idl_gen_general.cpp                       | 22 ++++++++++-
 .../FlatBuffersExampleTests.cs                | 39 +++++++++++++++++++
 tests/JavaTest.java                           | 38 ++++++++++++++++++
 tests/MyGame/Example/Monster.cs               |  2 +
 tests/MyGame/Example/Monster.java             |  2 +
 5 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index 70c5badfd..c8dbd1d95 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -876,7 +876,27 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
           break;
       }
     }
-
+	// generate object accessors if is nested_flatbuffer
+	auto nested = field.attributes.Lookup("nested_flatbuffer");
+	if (nested) {
+		auto nested_qualified_name =
+			parser.namespaces_.back()->GetFullyQualifiedName(nested->constant);
+		auto nested_type = parser.structs_.Lookup(nested_qualified_name);
+		auto nested_type_name = WrapInNameSpace(parser, *nested_type);
+		auto nestedMethodName = MakeCamel(field.name, lang.first_camel_upper) 
+			+ "As" + nested_type_name;
+		auto getNestedMethodName = nestedMethodName;
+		if (lang.language == IDLOptions::kCSharp) {
+			getNestedMethodName = "Get" + nestedMethodName;
+		}
+		code += "  public " + nested_type_name + " ";
+		code += nestedMethodName + "() { return ";
+		code += getNestedMethodName + "(new " + nested_type_name + "()); }\n";
+		code += "  public " + nested_type_name + " " + getNestedMethodName;
+		code += "(" + nested_type_name + " obj) { ";
+		code += "int o = __offset(" + NumToString(field.value.offset) +"); ";
+		code += "return o != 0 ? obj.__init(__indirect(__vector(o)), bb) : null; }\n";
+	}
     // generate mutators for scalar fields or vectors of scalars
     if (parser.opts.mutable_buffer) {
       auto underlying_type = field.value.type.base_type == BASE_TYPE_VECTOR
diff --git a/tests/FlatBuffers.Test/FlatBuffersExampleTests.cs b/tests/FlatBuffers.Test/FlatBuffersExampleTests.cs
index 43754c77f..80791dd19 100644
--- a/tests/FlatBuffers.Test/FlatBuffersExampleTests.cs
+++ b/tests/FlatBuffers.Test/FlatBuffersExampleTests.cs
@@ -215,5 +215,44 @@ namespace FlatBuffers.Test
             Assert.AreEqual("NONE", Any.NONE.ToString());
             Assert.AreEqual("Monster", Any.Monster.ToString());
         }
+
+        [FlatBuffersTestMethod]
+        public void TestNestedFlatBuffer()
+        {
+            const string nestedMonsterName = "NestedMonsterName";
+            const short nestedMonsterHp = 600;
+            const short nestedMonsterMana = 1024;
+            // Create nested buffer as a Monster type
+            var fbb1 = new FlatBufferBuilder(16);
+            var str1 = fbb1.CreateString(nestedMonsterName);
+            Monster.StartMonster(fbb1);
+            Monster.AddName(fbb1, str1);
+            Monster.AddHp(fbb1, nestedMonsterHp);
+            Monster.AddMana(fbb1, nestedMonsterMana);
+            var monster1 = Monster.EndMonster(fbb1);
+            Monster.FinishMonsterBuffer(fbb1, monster1);
+            var fbb1Bytes = fbb1.SizedByteArray();
+            fbb1 = null;
+
+            // Create a Monster which has the first buffer as a nested buffer
+            var fbb2 = new FlatBufferBuilder(16);
+            var str2 = fbb2.CreateString("My Monster");
+            var nestedBuffer = Monster.CreateTestnestedflatbufferVector(fbb2, fbb1Bytes);
+            Monster.StartMonster(fbb2);
+            Monster.AddName(fbb2, str2);
+            Monster.AddHp(fbb2, 50);
+            Monster.AddMana(fbb2, 32);
+            Monster.AddTestnestedflatbuffer(fbb2, nestedBuffer);
+            var monster = Monster.EndMonster(fbb2);
+            Monster.FinishMonsterBuffer(fbb2, monster);
+            
+            // Now test the data extracted from the nested buffer
+            var mons = Monster.GetRootAsMonster(fbb2.DataBuffer);
+            var nestedMonster = mons.TestnestedflatbufferAsMonster();
+
+            Assert.AreEqual(nestedMonsterMana, nestedMonster.Mana);
+            Assert.AreEqual(nestedMonsterHp, nestedMonster.Hp);
+            Assert.AreEqual(nestedMonsterName, nestedMonster.Name);
+        }
     }
 }
diff --git a/tests/JavaTest.java b/tests/JavaTest.java
index 0bc0dbadb..154fdec67 100755
--- a/tests/JavaTest.java
+++ b/tests/JavaTest.java
@@ -159,6 +159,8 @@ class JavaTest {
 
         TestNamespaceNesting();
 
+        TestNestedFlatBuffer();
+
         System.out.println("FlatBuffers test: completed successfully");
     }
 
@@ -242,6 +244,42 @@ class JavaTest {
         TableInFirstNS.addFooTable(fbb, nestedTableOff);
         int off = TableInFirstNS.endTableInFirstNS(fbb);
     }
+    
+    static void TestNestedFlatBuffer() {
+        final String nestedMonsterName = "NestedMonsterName";
+        final short nestedMonsterHp = 600;
+        final short nestedMonsterMana = 1024;
+        
+        FlatBufferBuilder fbb1 = new FlatBufferBuilder(16);
+        int str1 = fbb1.createString(nestedMonsterName);
+        Monster.startMonster(fbb1);
+        Monster.addName(fbb1, str1);
+        Monster.addHp(fbb1, nestedMonsterHp);
+        Monster.addMana(fbb1, nestedMonsterMana);
+        int monster1 = Monster.endMonster(fbb1);
+        Monster.finishMonsterBuffer(fbb1, monster1);
+        byte[] fbb1Bytes = fbb1.sizedByteArray();
+        fbb1 = null;
+        
+        FlatBufferBuilder fbb2 = new FlatBufferBuilder(16);        
+        int str2 = fbb2.createString("My Monster");
+        int nestedBuffer = Monster.createTestnestedflatbufferVector(fbb2, fbb1Bytes);
+        Monster.startMonster(fbb2);
+        Monster.addName(fbb2, str2);
+        Monster.addHp(fbb2, (short)50);
+        Monster.addMana(fbb2, (short)32);
+        Monster.addTestnestedflatbuffer(fbb2, nestedBuffer);
+        int monster = Monster.endMonster(fbb2);
+        Monster.finishMonsterBuffer(fbb2, monster);
+        
+        // Now test the data extracted from the nested buffer
+        Monster mons = Monster.getRootAsMonster(fbb2.dataBuffer());
+        Monster nestedMonster = mons.testnestedflatbufferAsMonster();
+
+        TestEq(nestedMonsterMana, nestedMonster.mana());
+        TestEq(nestedMonsterHp, nestedMonster.hp());
+        TestEq(nestedMonsterName, nestedMonster.name());
+    }
 
     static <T> void TestEq(T a, T b) {
         if (!a.equals(b)) {
diff --git a/tests/MyGame/Example/Monster.cs b/tests/MyGame/Example/Monster.cs
index b324a8d5c..e456db8ca 100644
--- a/tests/MyGame/Example/Monster.cs
+++ b/tests/MyGame/Example/Monster.cs
@@ -45,6 +45,8 @@ public sealed class Monster : Table {
   public byte GetTestnestedflatbuffer(int j) { int o = __offset(30); return o != 0 ? bb.Get(__vector(o) + j * 1) : (byte)0; }
   public int TestnestedflatbufferLength { get { int o = __offset(30); return o != 0 ? __vector_len(o) : 0; } }
   public ArraySegment<byte>? GetTestnestedflatbufferBytes() { return __vector_as_arraysegment(30); }
+  public Monster TestnestedflatbufferAsMonster() { return GetTestnestedflatbufferAsMonster(new Monster()); }
+  public Monster GetTestnestedflatbufferAsMonster(Monster obj) { int o = __offset(30); return o != 0 ? obj.__init(__indirect(__vector(o)), bb) : null; }
   public bool MutateTestnestedflatbuffer(int j, byte testnestedflatbuffer) { int o = __offset(30); if (o != 0) { bb.Put(__vector(o) + j * 1, testnestedflatbuffer); return true; } else { return false; } }
   public Stat Testempty { get { return GetTestempty(new Stat()); } }
   public Stat GetTestempty(Stat obj) { int o = __offset(32); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
diff --git a/tests/MyGame/Example/Monster.java b/tests/MyGame/Example/Monster.java
index 669bed922..16c7386e6 100644
--- a/tests/MyGame/Example/Monster.java
+++ b/tests/MyGame/Example/Monster.java
@@ -51,6 +51,8 @@ public final class Monster extends Table {
   public int testnestedflatbuffer(int j) { int o = __offset(30); return o != 0 ? bb.get(__vector(o) + j * 1) & 0xFF : 0; }
   public int testnestedflatbufferLength() { int o = __offset(30); return o != 0 ? __vector_len(o) : 0; }
   public ByteBuffer testnestedflatbufferAsByteBuffer() { return __vector_as_bytebuffer(30, 1); }
+  public Monster testnestedflatbufferAsMonster() { return testnestedflatbufferAsMonster(new Monster()); }
+  public Monster testnestedflatbufferAsMonster(Monster obj) { int o = __offset(30); return o != 0 ? obj.__init(__indirect(__vector(o)), bb) : null; }
   public boolean mutateTestnestedflatbuffer(int j, int testnestedflatbuffer) { int o = __offset(30); if (o != 0) { bb.put(__vector(o) + j * 1, (byte)testnestedflatbuffer); return true; } else { return false; } }
   public Stat testempty() { return testempty(new Stat()); }
   public Stat testempty(Stat obj) { int o = __offset(32); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }

From cbe8747b59d143ad2bfe73ecc838b711f8102886 Mon Sep 17 00:00:00 2001
From: Oli Wilkinson <Oli Wilkinson>
Date: Mon, 18 Jan 2016 18:58:53 +0000
Subject: [PATCH 056/185] Added check (& skipping) of the utf-8 byte order mark
 (0xEF BB BF) at the beginning of the file

---
 include/flatbuffers/idl.h | 1 +
 src/idl_parser.cpp        | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index d052d6f4d..6708f1382 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -444,6 +444,7 @@ private:
   FLATBUFFERS_CHECKED_ERROR Error(const std::string &msg);
   FLATBUFFERS_CHECKED_ERROR ParseHexNum(int nibbles, int64_t *val);
   FLATBUFFERS_CHECKED_ERROR Next();
+  FLATBUFFERS_CHECKED_ERROR SkipByteOrderMark();
   bool Is(int t);
   FLATBUFFERS_CHECKED_ERROR Expect(int t);
   std::string TokenToStringId(int t);
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index e4013e8d4..96ea012be 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -200,6 +200,14 @@ CheckedError Parser::ParseHexNum(int nibbles, int64_t *val) {
   return NoError();
 }
 
+CheckedError Parser::SkipByteOrderMark() {
+  if (static_cast<unsigned char>(*cursor_) != 0xef) return NoError();
+  cursor_++;
+  if (static_cast<unsigned char>(*cursor_++) != 0xbb) return Error("invalid utf-8 byte order mark");
+  if (static_cast<unsigned char>(*cursor_++) != 0xbf) return Error("invalid utf-8 byte order mark");
+  return NoError();
+}
+
 CheckedError Parser::Next() {
   doc_comment_.clear();
   bool seen_newline = false;
@@ -1584,6 +1592,7 @@ CheckedError Parser::DoParse(const char *source, const char **include_paths,
   builder_.Clear();
   // Start with a blank namespace just in case this file doesn't have one.
   namespaces_.push_back(new Namespace());
+  ECHECK(SkipByteOrderMark());
   NEXT();
   // Includes must come before type declarations:
   for (;;) {

From f1ab30a49010d5e0d9d29c511186babc5f510234 Mon Sep 17 00:00:00 2001
From: Oli Wilkinson <Oli Wilkinson>
Date: Mon, 18 Jan 2016 20:54:22 +0000
Subject: [PATCH 057/185] Added Visual Studio transient files to .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index ca18d2049..6f3894d06 100755
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,6 @@ java/*.iml
 java/target
 **/*.pyc
 .idea
+build/VS2010/FlatBuffers.sdf
+build/VS2010/FlatBuffers.opensdf
+build/VS2010/ipch/**/*.ipch

From 3de82050ceb0c53eb500646d458a80cc9b9a7cee Mon Sep 17 00:00:00 2001
From: Rene Fichter <rene@fichter.se>
Date: Tue, 19 Jan 2016 13:02:25 +0100
Subject: [PATCH 058/185] Fix build error when flatc binary is missing in PATH.

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e58ead5f6..511860802 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,7 +119,7 @@ function(compile_flatbuffers_schema_to_cpp SRC_FBS)
   string(REGEX REPLACE "\\.fbs$" "_generated.h" GEN_HEADER ${SRC_FBS})
   add_custom_command(
     OUTPUT ${GEN_HEADER}
-    COMMAND flatc -c --no-includes --gen-mutable -o "${SRC_FBS_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/${SRC_FBS}"
+    COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" -c --no-includes --gen-mutable -o "${SRC_FBS_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/${SRC_FBS}"
     DEPENDS flatc)
 endfunction()
 
@@ -128,7 +128,7 @@ function(compile_flatbuffers_schema_to_binary SRC_FBS)
   string(REGEX REPLACE "\\.fbs$" ".bfbs" GEN_BINARY_SCHEMA ${SRC_FBS})
   add_custom_command(
     OUTPUT ${GEN_BINARY_SCHEMA}
-    COMMAND flatc -b --schema -o "${SRC_FBS_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/${SRC_FBS}"
+    COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" -b --schema -o "${SRC_FBS_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/${SRC_FBS}"
     DEPENDS flatc)
 endfunction()
 

From f8c1980fdff1a6985e7346efe84656139b600aaa Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Fri, 8 Jan 2016 14:01:52 -0800
Subject: [PATCH 059/185] Added schema evolution examples to the docs.

Bug: 26296711
Change-Id: I225067d82ac0f8bd71b2b97b1672517ca86cc3b9
Tested: on Linux.
---
 docs/html/md__schemas.html | 16 ++++++++-
 docs/source/Schemas.md     | 69 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/docs/html/md__schemas.html b/docs/html/md__schemas.html
index ae74a33d4..fe7f56357 100644
--- a/docs/html/md__schemas.html
+++ b/docs/html/md__schemas.html
@@ -98,6 +98,7 @@ root_type Monster;
 <li>You cannot delete fields you don't use anymore from the schema, but you can simply stop writing them into your data for almost the same effect. Additionally you can mark them as <code>deprecated</code> as in the example above, which will prevent the generation of accessors in the generated C++, as a way to enforce the field not being used any more. (careful: this may break code!).</li>
 <li>You may change field names and table names, if you're ok with your code breaking until you've renamed them there too.</li>
 </ul>
+<p>See "Schema evolution examples" below for more on this topic.</p>
 <h3>Structs</h3>
 <p>Similar to a table, only now none of the fields are optional (so no defaults either), and fields may not be added or be deprecated. Structs may only contain scalars or other structs. Use this for simple objects where you are very sure no changes will ever be made (as quite clear in the example <code>Vec3</code>). Structs use less memory than tables and are even faster to access (they are always stored in-line in their parent object, and use no virtual table).</p>
 <h3>Types</h3>
@@ -121,6 +122,7 @@ root_type Monster;
 <p>You generally do not want to change default values after they're initially defined. Fields that have the default value are not actually stored in the serialized data but are generated in code, so when you change the default, you'd now get a different value than from code generated from an older version of the schema. There are situations however where this may be desirable, especially if you can ensure a simultaneous rebuild of all code.</p>
 <h3>Enums</h3>
 <p>Define a sequence of named constants, each with a given value, or increasing by one from the previous one. The default first value is <code>0</code>. As you can see in the enum declaration, you specify the underlying integral type of the enum with <code>:</code> (in this case <code>byte</code>), which then determines the type of any fields declared with this enum type.</p>
+<p>Typically, enum values should only ever be added, never removed (there is no deprecation for enums). This requires code to handle forwards compatibility itself, by handling unknown enum values.</p>
 <h3>Unions</h3>
 <p>Unions share a lot of properties with enums, but instead of new names for constants, you use names of tables. You can then declare a union field which can hold a reference to any of those types, and additionally a hidden field with the suffix <code>_type</code> is generated that holds the corresponding enum value, allowing you to know which type to cast to at runtime.</p>
 <p>Unions are a good way to be able to send multiple message types as a FlatBuffer. Note that because a union field is really two fields, it must always be part of a table, it cannot be the root of a FlatBuffer by itself.</p>
@@ -183,7 +185,19 @@ root_type Monster;
 <h3>Schemas and version control</h3>
 <p>FlatBuffers relies on new field declarations being added at the end, and earlier declarations to not be removed, but be marked deprecated when needed. We think this is an improvement over the manual number assignment that happens in Protocol Buffers (and which is still an option using the <code>id</code> attribute mentioned above).</p>
 <p>One place where this is possibly problematic however is source control. If user A adds a field, generates new binary data with this new schema, then tries to commit both to source control after user B already committed a new field also, and just auto-merges the schema, the binary files are now invalid compared to the new schema.</p>
-<p>The solution of course is that you should not be generating binary data before your schema changes have been committed, ensuring consistency with the rest of the world. If this is not practical for you, use explicit field ids, which should always generate a merge conflict if two people try to allocate the same id. </p>
+<p>The solution of course is that you should not be generating binary data before your schema changes have been committed, ensuring consistency with the rest of the world. If this is not practical for you, use explicit field ids, which should always generate a merge conflict if two people try to allocate the same id.</p>
+<h3>Schema evolution examples</h3>
+<p>Some examples to clarify what happens as you change a schema:</p>
+<p>If we have the following original schema: </p><pre class="fragment">table { a:int; b:int; }
+</pre><p>And we extend it: </p><pre class="fragment">table { a:int; b:int; c:int; }
+</pre><p>This is ok. Code compiled with the old schema reading data generated with the new one will simply ignore the presence of the new field. Code compiled with the new schema reading old data will get the default value for <code>c</code> (which is 0 in this case, since it is not specified). </p><pre class="fragment">table { a:int (deprecated); b:int; }
+</pre><p>This is also ok. Code compiled with the old schema reading newer data will now always get the default value for <code>a</code> since it is not present. Code compiled with the new schema now cannot read nor write <code>a</code> anymore (any existing code that tries to do so will result in compile errors), but can still read old data (they will ignore the field). </p><pre class="fragment">table { c:int a:int; b:int; }
+</pre><p>This is NOT ok, as this makes the schemas incompatible. Old code reading newer data will interpret <code>c</code> as if it was <code>a</code>, and new code reading old data accessing <code>a</code> will instead receive <code>b</code>. </p><pre class="fragment">table { c:int (id: 2); a:int (id: 0); b:int (id: 1); }
+</pre><p>This is ok. If your intent was to order/group fields in a way that makes sense semantically, you can do so using explicit id assignment. Now we are compatible with the original schema, and the fields can be ordered in any way, as long as we keep the sequence of ids. </p><pre class="fragment">table { b:int; }
+</pre><p>NOT ok. We can only remove a field by deprecation, regardless of wether we use explicit ids or not. </p><pre class="fragment">table { a:uint; b:uint; }
+</pre><p>This is MAYBE ok, and only in the case where the type change is the same size, like here. If old data never contained any negative numbers, this will be safe to do. </p><pre class="fragment">table { a:int = 1; b:int = 2; }
+</pre><p>Generally NOT ok. Any older data written that had 0 values were not written to the buffer, and rely on the default value to be recreated. These will now have those values appear to <code>1</code> and <code>2</code> instead. There may be cases in which this is ok, but care must be taken. </p><pre class="fragment">table { aa:int; bb:int; }
+</pre><p>Occasionally ok. You've renamed fields, which will break all code (and JSON files!) that use this schema, but as long as the change is obvious, this is not incompatible with the actual binary buffers, since those only ever address fields by id/offset. </p>
 </div></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- Google Analytics -->
diff --git a/docs/source/Schemas.md b/docs/source/Schemas.md
index c38508d8e..8d4348cbf 100755
--- a/docs/source/Schemas.md
+++ b/docs/source/Schemas.md
@@ -68,7 +68,8 @@ and backwards compatibility. Note that:
 -   You may change field names and table names, if you're ok with your
     code breaking until you've renamed them there too.
 
-
+See "Schema evolution examples" below for more on this
+topic.
 
 ### Structs
 
@@ -133,6 +134,10 @@ is `0`. As you can see in the enum declaration, you specify the underlying
 integral type of the enum with `:` (in this case `byte`), which then determines
 the type of any fields declared with this enum type.
 
+Typically, enum values should only ever be added, never removed (there is no
+deprecation for enums). This requires code to handle forwards compatibility
+itself, by handling unknown enum values.
+
 ### Unions
 
 Unions share a lot of properties with enums, but instead of new names
@@ -351,3 +356,65 @@ the world. If this is not practical for you, use explicit field ids, which
 should always generate a merge conflict if two people try to allocate the same
 id.
 
+### Schema evolution examples
+
+Some examples to clarify what happens as you change a schema:
+
+If we have the following original schema:
+
+    table { a:int; b:int; }
+
+And we extend it:
+
+    table { a:int; b:int; c:int; }
+
+This is ok. Code compiled with the old schema reading data generated with the
+new one will simply ignore the presence of the new field. Code compiled with the
+new schema reading old data will get the default value for `c` (which is 0
+in this case, since it is not specified).
+
+    table { a:int (deprecated); b:int; }
+
+This is also ok. Code compiled with the old schema reading newer data will now
+always get the default value for `a` since it is not present. Code compiled
+with the new schema now cannot read nor write `a` anymore (any existing code
+that tries to do so will result in compile errors), but can still read
+old data (they will ignore the field).
+
+    table { c:int a:int; b:int; }
+
+This is NOT ok, as this makes the schemas incompatible. Old code reading newer
+data will interpret `c` as if it was `a`, and new code reading old data
+accessing `a` will instead receive `b`.
+
+    table { c:int (id: 2); a:int (id: 0); b:int (id: 1); }
+
+This is ok. If your intent was to order/group fields in a way that makes sense
+semantically, you can do so using explicit id assignment. Now we are compatible
+with the original schema, and the fields can be ordered in any way, as long as
+we keep the sequence of ids.
+
+    table { b:int; }
+
+NOT ok. We can only remove a field by deprecation, regardless of wether we use
+explicit ids or not.
+
+    table { a:uint; b:uint; }
+
+This is MAYBE ok, and only in the case where the type change is the same size,
+like here. If old data never contained any negative numbers, this will be
+safe to do.
+
+    table { a:int = 1; b:int = 2; }
+
+Generally NOT ok. Any older data written that had 0 values were not written to
+the buffer, and rely on the default value to be recreated. These will now have
+those values appear to `1` and `2` instead. There may be cases in which this
+is ok, but care must be taken.
+
+    table { aa:int; bb:int; }
+
+Occasionally ok. You've renamed fields, which will break all code (and JSON
+files!) that use this schema, but as long as the change is obvious, this is not
+incompatible with the actual binary buffers, since those only ever address
+fields by id/offset.

From e848137ded3524c60faa6def429807faae5340e0 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Fri, 8 Jan 2016 14:31:26 -0800
Subject: [PATCH 060/185] Added min/max values for enums/unions.

Bug: 21642898
Change-Id: Ifaf0b3c4274fe30ef29507ba1c1216d700efe85b
Tested: on Linux.
---
 samples/monster_generated.h                   |  8 ++++++--
 src/idl_gen_cpp.cpp                           | 19 +++++++++++++------
 tests/monster_test_generated.h                |  8 ++++++--
 .../NamespaceA/TableInFirstNS.php             |  2 +-
 .../namespace_test1_generated.h               |  4 +++-
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/samples/monster_generated.h b/samples/monster_generated.h
index 53935ee93..adc8e9b19 100644
--- a/samples/monster_generated.h
+++ b/samples/monster_generated.h
@@ -15,7 +15,9 @@ struct Monster;
 enum Color {
   Color_Red = 0,
   Color_Green = 1,
-  Color_Blue = 2
+  Color_Blue = 2,
+  Color_MIN = Color_Red,
+  Color_MAX = Color_Blue
 };
 
 inline const char **EnumNamesColor() {
@@ -27,7 +29,9 @@ inline const char *EnumNameColor(Color e) { return EnumNamesColor()[static_cast<
 
 enum Any {
   Any_NONE = 0,
-  Any_Monster = 1
+  Any_Monster = 1,
+  Any_MIN = Any_NONE,
+  Any_MAX = Any_Monster
 };
 
 inline const char **EnumNamesAny() {
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index fa2708000..fb34b97e3 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -131,10 +131,10 @@ static std::string GenEnumDecl(const EnumDef &enum_def,
   return (opts.scoped_enums ? "enum class " : "enum ") + enum_def.name;
 }
 
-static std::string GenEnumVal(const EnumDef &enum_def, const EnumVal &enum_val,
+static std::string GenEnumVal(const EnumDef &enum_def,
+                              const std::string &enum_val,
                               const IDLOptions &opts) {
-  return opts.prefixed_enums ? enum_def.name + "_" + enum_val.name
-                             : enum_val.name;
+  return opts.prefixed_enums ? enum_def.name + "_" + enum_val : enum_val;
 }
 
 static std::string GetEnumVal(const EnumDef &enum_def, const EnumVal &enum_val,
@@ -159,15 +159,22 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
   if (parser.opts.scoped_enums)
     code += " : " + GenTypeBasic(parser, enum_def.underlying_type, false);
   code += " {\n";
+  EnumVal *minv = nullptr, *maxv = nullptr;
   for (auto it = enum_def.vals.vec.begin();
        it != enum_def.vals.vec.end();
        ++it) {
     auto &ev = **it;
     GenComment(ev.doc_comment, code_ptr, nullptr, "  ");
-    code += "  " + GenEnumVal(enum_def, ev, parser.opts) + " = ";
-    code += NumToString(ev.value);
-    code += (it + 1) != enum_def.vals.vec.end() ? ",\n" : "\n";
+    code += "  " + GenEnumVal(enum_def, ev.name, parser.opts) + " = ";
+    code += NumToString(ev.value) + ",\n";
+    minv = !minv || minv->value > ev.value ? &ev : minv;
+    maxv = !maxv || maxv->value < ev.value ? &ev : maxv;
   }
+  assert(minv && maxv);
+  code += "  " + GenEnumVal(enum_def, "MIN", parser.opts) + " = ";
+  code += GenEnumVal(enum_def, minv->name, parser.opts) + ",\n";
+  code += "  " + GenEnumVal(enum_def, "MAX", parser.opts) + " = ";
+  code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n";
   code += "};\n\n";
 
   // Generate a generate string table for enum values.
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index 14780bf2d..1ace5f082 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -23,7 +23,9 @@ struct Monster;
 enum Color {
   Color_Red = 1,
   Color_Green = 2,
-  Color_Blue = 8
+  Color_Blue = 8,
+  Color_MIN = Color_Red,
+  Color_MAX = Color_Blue
 };
 
 inline const char **EnumNamesColor() {
@@ -36,7 +38,9 @@ inline const char *EnumNameColor(Color e) { return EnumNamesColor()[static_cast<
 enum Any {
   Any_NONE = 0,
   Any_Monster = 1,
-  Any_TestSimpleTableWithEnum = 2
+  Any_TestSimpleTableWithEnum = 2,
+  Any_MIN = Any_NONE,
+  Any_MAX = Any_TestSimpleTableWithEnum
 };
 
 inline const char **EnumNamesAny() {
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.php b/tests/namespace_test/NamespaceA/TableInFirstNS.php
index 09a2c550b..57a827bc5 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.php
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.php
@@ -36,7 +36,7 @@ class TableInFirstNS extends Table
     {
         $obj = new TableInNestedNS();
         $o = $this->__offset(4);
-        return $o != 0 ? $obj->init($o + $this->bb_pos, $this->bb) : 0;
+        return $o != 0 ? $obj->init($this->__indirect($o + $this->bb_pos), $this->bb) : 0;
     }
 
     /**
diff --git a/tests/namespace_test/namespace_test1_generated.h b/tests/namespace_test/namespace_test1_generated.h
index 29f8e1229..e7a109c6f 100644
--- a/tests/namespace_test/namespace_test1_generated.h
+++ b/tests/namespace_test/namespace_test1_generated.h
@@ -15,7 +15,9 @@ struct StructInNestedNS;
 enum EnumInNestedNS {
   EnumInNestedNS_A = 0,
   EnumInNestedNS_B = 1,
-  EnumInNestedNS_C = 2
+  EnumInNestedNS_C = 2,
+  EnumInNestedNS_MIN_VAL = EnumInNestedNS_A,
+  EnumInNestedNS_MAX_VAL = EnumInNestedNS_C
 };
 
 inline const char **EnumNamesEnumInNestedNS() {

From 049f3f7907e9fc8eb1ecd7c3775139de65552585 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Fri, 8 Jan 2016 15:18:51 -0800
Subject: [PATCH 061/185] Added support for parsing JSON null value.

These cause the field in question to be skipped.

Bug: 16550393
Change-Id: Id05104e89818ee773b8a91fdcc86e18061b9a82f
Tested: on Linux.
---
 docs/html/md__schemas.html  |  1 +
 docs/source/Schemas.md      |  3 +++
 src/idl_parser.cpp          | 39 +++++++++++++++++++++++--------------
 tests/monsterdata_test.json |  3 ++-
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/docs/html/md__schemas.html b/docs/html/md__schemas.html
index fe7f56357..de7969cb4 100644
--- a/docs/html/md__schemas.html
+++ b/docs/html/md__schemas.html
@@ -166,6 +166,7 @@ root_type Monster;
 <li>It accepts field names with and without quotes, like many JSON parsers already do. It outputs them without quotes as well, though can be made to output them using the <code>strict_json</code> flag.</li>
 <li>If a field has an enum type, the parser will recognize symbolic enum values (with or without quotes) instead of numbers, e.g. <code>field: EnumVal</code>. If a field is of integral type, you can still use symbolic names, but values need to be prefixed with their type and need to be quoted, e.g. <code>field: "Enum.EnumVal"</code>. For enums representing flags, you may place multiple inside a string separated by spaces to OR them, e.g. <code>field: "EnumVal1 EnumVal2"</code> or <code>field: "Enum.EnumVal1 Enum.EnumVal2"</code>.</li>
 <li>Similarly, for unions, these need to specified with two fields much like you do when serializing from code. E.g. for a field <code>foo</code>, you must add a field <code>foo_type: FooOne</code> right before the <code>foo</code> field, where <code>FooOne</code> would be the table out of the union you want to use.</li>
+<li>A field that has the value <code>null</code> (e.g. <code>field: null</code>) is intended to have the default value for that field (thus has the same effect as if that field wasn't specified at all).</li>
 </ul>
 <p>When parsing JSON, it recognizes the following escape codes in strings:</p>
 <ul>
diff --git a/docs/source/Schemas.md b/docs/source/Schemas.md
index 8d4348cbf..36bebf17d 100755
--- a/docs/source/Schemas.md
+++ b/docs/source/Schemas.md
@@ -313,6 +313,9 @@ JSON:
     you do when serializing from code. E.g. for a field `foo`, you must
     add a field `foo_type: FooOne` right before the `foo` field, where
     `FooOne` would be the table out of the union you want to use.
+-   A field that has the value `null` (e.g. `field: null`) is intended to
+    have the default value for that field (thus has the same effect as if
+    that field wasn't specified at all).
 
 When parsing JSON, it recognizes the following escape codes in strings:
 
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index e4013e8d4..2312c3ac0 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -151,7 +151,8 @@ std::string Namespace::GetFullyQualifiedName(const std::string &name,
   TD(FileIdentifier, 267, "file_identifier") \
   TD(FileExtension, 268, "file_extension") \
   TD(Include, 269, "include") \
-  TD(Attribute, 270, "attribute")
+  TD(Attribute, 270, "attribute") \
+  TD(Null, 271, "null")
 #ifdef __GNUC__
 __extension__  // Stop GCC complaining about trailing comma with -Wpendantic.
 #endif
@@ -343,6 +344,10 @@ CheckedError Parser::Next() {
             token_ = kTokenFileExtension;
             return NoError();
           }
+          if (attribute_ == "null") {
+            token_ = kTokenNull;
+            return NoError();
+          }
           // If not, it is a user-defined identifier:
           token_ = kTokenIdentifier;
           return NoError();
@@ -688,19 +693,23 @@ CheckedError Parser::ParseTable(const StructDef &struct_def, std::string *value,
       }
     } else {
       EXPECT(':');
-      Value val = field->value;
-      ECHECK(ParseAnyValue(val, field, fieldn));
-      size_t i = field_stack_.size();
-      // Hardcoded insertion-sort with error-check.
-      // If fields are specified in order, then this loop exits immediately.
-      for (; i > field_stack_.size() - fieldn; i--) {
-        auto existing_field = field_stack_[i - 1].second;
-        if (existing_field == field)
-          return Error("field set more than once: " + field->name);
-        if (existing_field->value.offset < field->value.offset) break;
+      if (Is(kTokenNull)) {
+        NEXT(); // Ignore this field.
+      } else {
+        Value val = field->value;
+        ECHECK(ParseAnyValue(val, field, fieldn));
+        size_t i = field_stack_.size();
+        // Hardcoded insertion-sort with error-check.
+        // If fields are specified in order, then this loop exits immediately.
+        for (; i > field_stack_.size() - fieldn; i--) {
+          auto existing_field = field_stack_[i - 1].second;
+          if (existing_field == field)
+            return Error("field set more than once: " + field->name);
+          if (existing_field->value.offset < field->value.offset) break;
+        }
+        field_stack_.insert(field_stack_.begin() + i, std::make_pair(val, field));
+        fieldn++;
       }
-      field_stack_.insert(field_stack_.begin() + i, std::make_pair(val, field));
-      fieldn++;
     }
     if (Is('}')) { NEXT(); break; }
     EXPECT(',');
@@ -1542,10 +1551,10 @@ CheckedError Parser::SkipJsonObject() {
 
 CheckedError Parser::SkipJsonArray() {
   EXPECT('[');
-  
+
   for (;;) {
     if (Is(']')) break;
-        
+
     ECHECK(SkipAnyJsonValue());
 
     if (Is(']')) break;
diff --git a/tests/monsterdata_test.json b/tests/monsterdata_test.json
index 89278755e..12c02d21c 100755
--- a/tests/monsterdata_test.json
+++ b/tests/monsterdata_test.json
@@ -21,7 +21,8 @@
   ],
   test_type: Monster,
   test: {
-    name: "Fred"
+    name: "Fred",
+    pos: null
   },
   test4: [
     {

From 69a31b807a85e9a5ca4efb839f37ecb6dcf3eed5 Mon Sep 17 00:00:00 2001
From: Mark Klara <mrhappyasthma@google.com>
Date: Thu, 3 Dec 2015 20:30:54 -0800
Subject: [PATCH 062/185] Revamping the FlatBuffers docs.

Adding an API reference for the supported languages.

General docs cleanup, including a new `tutorial` section that
supports all of the supported languages.

Added samples for each supported language to mirror the new
tutorial page.

Cleaned up all the links by making them `@ref` style links,
instead of referencing the names of the generated `.html` files.

Removed all generated files that were unnecessarily committed.

Also fixed the C# tests (two were failing due to a missing file).

Bug: b/25801305

Tested: Tested all samples on Ubuntu, Mac, and Android. Docs were
generated using doxygen and viewed on Chrome.

Change-Id: I2acaba6e332a15ae2deff5f26a4a25da7bd2c954
---
 CONTRIBUTING.md => CONTRIBUTING               |    0
 docs/documentation.html                       |    8 -
 docs/html/bc_s.png                            |  Bin 676 -> 0 bytes
 docs/html/bdwn.png                            |  Bin 147 -> 0 bytes
 docs/html/closed.png                          |  Bin 132 -> 0 bytes
 docs/html/doxygen.css                         | 1440 --------------
 docs/html/doxygen.png                         |  Bin 3779 -> 0 bytes
 docs/html/dynsections.js                      |   97 -
 docs/html/fpl_logo_small.png                  |  Bin 5073 -> 0 bytes
 docs/html/ftv2blank.png                       |  Bin 86 -> 0 bytes
 docs/html/ftv2cl.png                          |  Bin 453 -> 0 bytes
 docs/html/ftv2doc.png                         |  Bin 746 -> 0 bytes
 docs/html/ftv2folderclosed.png                |  Bin 616 -> 0 bytes
 docs/html/ftv2folderopen.png                  |  Bin 597 -> 0 bytes
 docs/html/ftv2lastnode.png                    |  Bin 86 -> 0 bytes
 docs/html/ftv2link.png                        |  Bin 746 -> 0 bytes
 docs/html/ftv2mlastnode.png                   |  Bin 246 -> 0 bytes
 docs/html/ftv2mnode.png                       |  Bin 246 -> 0 bytes
 docs/html/ftv2mo.png                          |  Bin 403 -> 0 bytes
 docs/html/ftv2node.png                        |  Bin 86 -> 0 bytes
 docs/html/ftv2ns.png                          |  Bin 388 -> 0 bytes
 docs/html/ftv2plastnode.png                   |  Bin 229 -> 0 bytes
 docs/html/ftv2pnode.png                       |  Bin 229 -> 0 bytes
 docs/html/ftv2splitbar.png                    |  Bin 314 -> 0 bytes
 docs/html/ftv2vertline.png                    |  Bin 86 -> 0 bytes
 docs/html/index.html                          |  149 --
 docs/html/jquery.js                           |   72 -
 docs/html/md__benchmarks.html                 |  113 --
 docs/html/md__building.html                   |   87 -
 docs/html/md__compiler.html                   |  115 --
 docs/html/md__cpp_usage.html                  |  192 --
 docs/html/md__go_usage.html                   |  122 --
 docs/html/md__grammar.html                    |   96 -
 docs/html/md__internals.html                  |  200 --
 docs/html/md__java_usage.html                 |  146 --
 docs/html/md__python_usage.html               |  120 --
 docs/html/md__schemas.html                    |  214 --
 docs/html/md__support.html                    |  124 --
 docs/html/md__white_paper.html                |  109 --
 docs/html/nav_f.png                           |  Bin 153 -> 0 bytes
 docs/html/nav_g.png                           |  Bin 95 -> 0 bytes
 docs/html/nav_h.png                           |  Bin 98 -> 0 bytes
 docs/html/navtree.css                         |  143 --
 docs/html/navtree.js                          |  552 ------
 docs/html/navtreeindex0.js                    |   17 -
 docs/html/open.png                            |  Bin 123 -> 0 bytes
 docs/html/pages.html                          |   92 -
 docs/html/resize.js                           |   97 -
 docs/html/style.css                           |  396 ----
 docs/html/sync_off.png                        |  Bin 853 -> 0 bytes
 docs/html/sync_on.png                         |  Bin 845 -> 0 bytes
 docs/html/tab_a.png                           |  Bin 142 -> 0 bytes
 docs/html/tab_b.png                           |  Bin 169 -> 0 bytes
 docs/html/tab_h.png                           |  Bin 177 -> 0 bytes
 docs/html/tab_s.png                           |  Bin 184 -> 0 bytes
 docs/html/tabs.css                            |   60 -
 docs/source/Benchmarks.md                     |   27 +-
 docs/source/Building.md                       |   44 +-
 docs/source/CONTRIBUTING.md                   |    1 +
 docs/source/Compiler.md                       |    3 +-
 docs/source/CppUsage.md                       |  292 +--
 docs/source/FlatBuffers.md                    |   48 +-
 docs/source/GoApi.md                          |   26 +
 docs/source/GoApi_generated.txt               |  125 ++
 docs/source/GoUsage.md                        |  142 +-
 docs/source/Grammar.md                        |    3 +-
 docs/source/Internals.md                      |   14 +-
 docs/source/JavaCsharpUsage.md                |  141 ++
 docs/source/JavaScriptUsage.md                |  105 +
 docs/source/JavaUsage.md                      |  224 ---
 docs/source/PHPUsage.md                       |   89 +
 docs/source/PythonUsage.md                    |  138 +-
 docs/source/README_TO_GENERATE_DOCS.md        |   32 +
 docs/source/Schemas.md                        |   41 +-
 docs/source/Support.md                        |    5 +-
 docs/source/Tutorial.md                       | 1723 +++++++++++++++++
 docs/source/WhitePaper.md                     |    5 +-
 docs/source/doxyfile                          |  108 +-
 docs/source/doxygen_layout.xml                |  230 +++
 docs/source/groups                            |   20 +
 docs/source/style.css                         |   48 +-
 include/flatbuffers/flatbuffers.h             |  151 +-
 java/com/google/flatbuffers/Constants.java    |    9 +-
 .../google/flatbuffers/FlatBufferBuilder.java |  367 +++-
 java/com/google/flatbuffers/Struct.java       |   10 +-
 java/com/google/flatbuffers/Table.java        |   88 +-
 js/flatbuffers.js                             |   56 +-
 net/FlatBuffers/FlatBufferBuilder.cs          |  135 +-
 php/FlatbufferBuilder.php                     |   94 +-
 python/flatbuffers/builder.py                 |  195 +-
 readme.md                                     |   17 +-
 samples/SampleBinary.cs                       |  137 ++
 samples/SampleBinary.java                     |  106 +
 samples/SampleBinary.php                      |  115 ++
 samples/android/AndroidManifest.xml           |   48 +
 samples/android/build_apk.sh                  |  510 +++++
 samples/android/jni/Android.mk                |    2 +-
 samples/android/jni/main.cpp                  |   21 +-
 samples/android/res/values/strings.xml        |   20 +
 samples/android_sample.sh                     |   35 +
 samples/csharp_sample.sh                      |   49 +
 samples/go_sample.sh                          |   62 +
 samples/java_sample.sh                        |   50 +
 samples/javascript_sample.sh                  |   47 +
 samples/monster.fbs                           |   11 +-
 samples/monster_generated.h                   |  153 --
 samples/monsterdata.json                      |    4 +-
 samples/php_sample.sh                         |   47 +
 samples/python_sample.sh                      |   47 +
 samples/sample_binary.cpp                     |   60 +-
 samples/sample_binary.go                      |  165 ++
 samples/sample_binary.py                      |  137 ++
 samples/sample_text.cpp                       |    5 +-
 samples/samplebinary.js                       |  106 +
 .../Resources/monsterdata_test.mon            |  Bin 0 -> 288 bytes
 115 files changed, 5537 insertions(+), 5917 deletions(-)
 rename CONTRIBUTING.md => CONTRIBUTING (100%)
 delete mode 100755 docs/documentation.html
 delete mode 100644 docs/html/bc_s.png
 delete mode 100644 docs/html/bdwn.png
 delete mode 100644 docs/html/closed.png
 delete mode 100644 docs/html/doxygen.css
 delete mode 100644 docs/html/doxygen.png
 delete mode 100644 docs/html/dynsections.js
 delete mode 100644 docs/html/fpl_logo_small.png
 delete mode 100644 docs/html/ftv2blank.png
 delete mode 100644 docs/html/ftv2cl.png
 delete mode 100644 docs/html/ftv2doc.png
 delete mode 100644 docs/html/ftv2folderclosed.png
 delete mode 100644 docs/html/ftv2folderopen.png
 delete mode 100644 docs/html/ftv2lastnode.png
 delete mode 100644 docs/html/ftv2link.png
 delete mode 100644 docs/html/ftv2mlastnode.png
 delete mode 100644 docs/html/ftv2mnode.png
 delete mode 100644 docs/html/ftv2mo.png
 delete mode 100644 docs/html/ftv2node.png
 delete mode 100644 docs/html/ftv2ns.png
 delete mode 100644 docs/html/ftv2plastnode.png
 delete mode 100644 docs/html/ftv2pnode.png
 delete mode 100644 docs/html/ftv2splitbar.png
 delete mode 100644 docs/html/ftv2vertline.png
 delete mode 100644 docs/html/index.html
 delete mode 100644 docs/html/jquery.js
 delete mode 100644 docs/html/md__benchmarks.html
 delete mode 100644 docs/html/md__building.html
 delete mode 100644 docs/html/md__compiler.html
 delete mode 100644 docs/html/md__cpp_usage.html
 delete mode 100644 docs/html/md__go_usage.html
 delete mode 100644 docs/html/md__grammar.html
 delete mode 100644 docs/html/md__internals.html
 delete mode 100644 docs/html/md__java_usage.html
 delete mode 100644 docs/html/md__python_usage.html
 delete mode 100644 docs/html/md__schemas.html
 delete mode 100644 docs/html/md__support.html
 delete mode 100644 docs/html/md__white_paper.html
 delete mode 100644 docs/html/nav_f.png
 delete mode 100644 docs/html/nav_g.png
 delete mode 100644 docs/html/nav_h.png
 delete mode 100644 docs/html/navtree.css
 delete mode 100644 docs/html/navtree.js
 delete mode 100644 docs/html/navtreeindex0.js
 delete mode 100644 docs/html/open.png
 delete mode 100644 docs/html/pages.html
 delete mode 100644 docs/html/resize.js
 delete mode 100644 docs/html/style.css
 delete mode 100644 docs/html/sync_off.png
 delete mode 100644 docs/html/sync_on.png
 delete mode 100644 docs/html/tab_a.png
 delete mode 100644 docs/html/tab_b.png
 delete mode 100644 docs/html/tab_h.png
 delete mode 100644 docs/html/tab_s.png
 delete mode 100644 docs/html/tabs.css
 create mode 120000 docs/source/CONTRIBUTING.md
 create mode 100644 docs/source/GoApi.md
 create mode 100644 docs/source/GoApi_generated.txt
 create mode 100755 docs/source/JavaCsharpUsage.md
 create mode 100755 docs/source/JavaScriptUsage.md
 delete mode 100755 docs/source/JavaUsage.md
 create mode 100644 docs/source/PHPUsage.md
 create mode 100644 docs/source/README_TO_GENERATE_DOCS.md
 create mode 100644 docs/source/Tutorial.md
 create mode 100644 docs/source/doxygen_layout.xml
 create mode 100644 docs/source/groups
 create mode 100644 samples/SampleBinary.cs
 create mode 100644 samples/SampleBinary.java
 create mode 100644 samples/SampleBinary.php
 create mode 100755 samples/android/AndroidManifest.xml
 create mode 100755 samples/android/build_apk.sh
 create mode 100755 samples/android/res/values/strings.xml
 create mode 100755 samples/android_sample.sh
 create mode 100755 samples/csharp_sample.sh
 create mode 100755 samples/go_sample.sh
 create mode 100755 samples/java_sample.sh
 create mode 100755 samples/javascript_sample.sh
 delete mode 100644 samples/monster_generated.h
 create mode 100755 samples/php_sample.sh
 create mode 100755 samples/python_sample.sh
 create mode 100644 samples/sample_binary.go
 create mode 100644 samples/sample_binary.py
 create mode 100644 samples/samplebinary.js
 create mode 100644 tests/FlatBuffers.Test/Resources/monsterdata_test.mon

diff --git a/CONTRIBUTING.md b/CONTRIBUTING
similarity index 100%
rename from CONTRIBUTING.md
rename to CONTRIBUTING
diff --git a/docs/documentation.html b/docs/documentation.html
deleted file mode 100755
index 1f279d9ea..000000000
--- a/docs/documentation.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<meta http-equiv="refresh" content="0;url=html/index.html">
-</head>
-<body>
-<a href="html/index.html">Click here if you are not redirected.</a>
-</body>
-</html>
diff --git a/docs/html/bc_s.png b/docs/html/bc_s.png
deleted file mode 100644
index 224b29aa9847d5a4b3902efd602b7ddf7d33e6c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 676
zcmV;V0$crwP)<h;3K|Lk000e1NJLTq000O80015c1^@s65rAI}0007ONkl<ZcmeI5
z%WD%+6voe;xyj6=NhXt~4{e$zF*P<SZp4L@2Hd!iQY<tJD@e5{RU55hl&Talf{KWb
zN*6A=C`Gqz5#NvcXzNOCOH(I9n<#?l<k5ws2omoMCgj%s3y1G=&gJ~>y__>=_9%My
z{n931IS})GlGUF8K#6VIbs%684A^L3@%PlP2>_sk`UWPq@f;rU*V%rPy_ekbhXT&s
z(GN{DxFv}*vZp`F>S!r||M`I*nOwwKX+BC~3P5N3-)Y{65c;ywYiAh-1*hZcToLHK
ztpl1xomJ+Yb}K(cfbJr2=GNOnT!UFA7Vy~fBz8?J>XHsbZoDad^8PxfSa0GDgENZS
zuLCEqzb*xWX2CG*b&5IiO#NzrW*;`VC9455M`o1NBh+(k8~`XCEEoC1Ybwf;vr4K3
zg|EB<07?SOqHp9DhLpS&bzgo70I+ghB_#)K7H%AMU3v}xuyQq9&Bm~++VYhF09a+U
zl7>n7Jjm$K#b*FONz~fj;I->Bf;ule1prFN9FovcDGBkpg>)O*-}eLnC{6oZHZ$o%
zXKW$;0_{8hxHQ>l;_*HATI(`7t#^{$(zLe}h*mqwOc*nRY9=?Sx4OOeVIfI|0V(V2
zBrW#G7Ss9wvzr@>H*`r>zE<Gz)cj&*s5lRy$b&*W@2j<GZEpXZ$P|Z!4Q$_|`5gj>
z+e8bOBgqIgldUJlG(YUDviMB`9+DH8n-s9SXRLyJHO1!=wY^79WYZMTa(wiZ!zP66
zA~!21vmF3H2{ngD;+`6j#~6j;$*f*G_2ZD1E;9(yaw7d-QnSCpK(cR1zU3qU0000<
KMNUMnLSTYoA~SLT

diff --git a/docs/html/bdwn.png b/docs/html/bdwn.png
deleted file mode 100644
index 940a0b950443a0bb1b216ac03c45b8a16c955452..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)H!3HEvS)PKZC{Gv1kP61Pb5HX&C<wUB513~7
zF-Lk{?g8$ijf`2F^ip|Vw7EpzIJxiU`6~>2wk~_T<sM_r%les%%^JdHy*A#$ew5wb
vr&wL1c8#4j*F5jfGT)c(PZrEb5O3m+yDrVre6KeTXbXd<tDnm{r-UW|3$!!q

diff --git a/docs/html/closed.png b/docs/html/closed.png
deleted file mode 100644
index 98cc2c909da37a6df914fbf67780eebd99c597f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{V-kvUwAr*{o@8<G4C~~x2bkCl7
zlF9slZh~6z%aUT|WfKm3{P*dDAfv<6>{^CZMh(5KoB^r_<4^zF@3)Cp&&t3hdujKf
f*?bjBoY!V+E))@{xMcbjXe@)LtDnm{r-UW|*e5JT

diff --git a/docs/html/doxygen.css b/docs/html/doxygen.css
deleted file mode 100644
index 0a8f9627a..000000000
--- a/docs/html/doxygen.css
+++ /dev/null
@@ -1,1440 +0,0 @@
-/* The standard CSS for doxygen 1.8.7 */
-
-body, table, div, p, dl {
-	font: 400 14px/22px Roboto,sans-serif;
-}
-
-/* @group Heading Levels */
-
-h1.groupheader {
-	font-size: 150%;
-}
-
-.title {
-	font: 400 14px/28px Roboto,sans-serif;
-	font-size: 150%;
-	font-weight: bold;
-	margin: 10px 2px;
-}
-
-h2.groupheader {
-	border-bottom: 1px solid #879ECB;
-	color: #354C7B;
-	font-size: 150%;
-	font-weight: normal;
-	margin-top: 1.75em;
-	padding-top: 8px;
-	padding-bottom: 4px;
-	width: 100%;
-}
-
-h3.groupheader {
-	font-size: 100%;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	-webkit-transition: text-shadow 0.5s linear;
-	-moz-transition: text-shadow 0.5s linear;
-	-ms-transition: text-shadow 0.5s linear;
-	-o-transition: text-shadow 0.5s linear;
-	transition: text-shadow 0.5s linear;
-	margin-right: 15px;
-}
-
-h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
-	text-shadow: 0 0 15px cyan;
-}
-
-dt {
-	font-weight: bold;
-}
-
-div.multicol {
-	-moz-column-gap: 1em;
-	-webkit-column-gap: 1em;
-	-moz-column-count: 3;
-	-webkit-column-count: 3;
-}
-
-p.startli, p.startdd {
-	margin-top: 2px;
-}
-
-p.starttd {
-	margin-top: 0px;
-}
-
-p.endli {
-	margin-bottom: 0px;
-}
-
-p.enddd {
-	margin-bottom: 4px;
-}
-
-p.endtd {
-	margin-bottom: 2px;
-}
-
-/* @end */
-
-caption {
-	font-weight: bold;
-}
-
-span.legend {
-        font-size: 70%;
-        text-align: center;
-}
-
-h3.version {
-        font-size: 90%;
-        text-align: center;
-}
-
-div.qindex, div.navtab{
-	background-color: #EBEFF6;
-	border: 1px solid #A3B4D7;
-	text-align: center;
-}
-
-div.qindex, div.navpath {
-	width: 100%;
-	line-height: 140%;
-}
-
-div.navtab {
-	margin-right: 15px;
-}
-
-/* @group Link Styling */
-
-a {
-	color: #3D578C;
-	font-weight: normal;
-	text-decoration: none;
-}
-
-.contents a:visited {
-	color: #4665A2;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-a.qindex {
-	font-weight: bold;
-}
-
-a.qindexHL {
-	font-weight: bold;
-	background-color: #9CAFD4;
-	color: #ffffff;
-	border: 1px double #869DCA;
-}
-
-.contents a.qindexHL:visited {
-        color: #ffffff;
-}
-
-a.el {
-	font-weight: bold;
-}
-
-a.elRef {
-}
-
-a.code, a.code:visited, a.line, a.line:visited {
-	color: #4665A2; 
-}
-
-a.codeRef, a.codeRef:visited, a.lineRef, a.lineRef:visited {
-	color: #4665A2; 
-}
-
-/* @end */
-
-dl.el {
-	margin-left: -1cm;
-}
-
-pre.fragment {
-        border: 1px solid #C4CFE5;
-        background-color: #FBFCFD;
-        padding: 4px 6px;
-        margin: 4px 8px 4px 2px;
-        overflow: auto;
-        word-wrap: break-word;
-        font-size:  9pt;
-        line-height: 125%;
-        font-family: monospace, fixed;
-        font-size: 105%;
-}
-
-div.fragment {
-        padding: 4px 6px;
-        margin: 4px 8px 4px 2px;
-	background-color: #FBFCFD;
-	border: 1px solid #C4CFE5;
-}
-
-div.line {
-	font-family: monospace, fixed;
-        font-size: 13px;
-	min-height: 13px;
-	line-height: 1.0;
-	text-wrap: unrestricted;
-	white-space: -moz-pre-wrap; /* Moz */
-	white-space: -pre-wrap;     /* Opera 4-6 */
-	white-space: -o-pre-wrap;   /* Opera 7 */
-	white-space: pre-wrap;      /* CSS3  */
-	word-wrap: break-word;      /* IE 5.5+ */
-	text-indent: -53px;
-	padding-left: 53px;
-	padding-bottom: 0px;
-	margin: 0px;
-	-webkit-transition-property: background-color, box-shadow;
-	-webkit-transition-duration: 0.5s;
-	-moz-transition-property: background-color, box-shadow;
-	-moz-transition-duration: 0.5s;
-	-ms-transition-property: background-color, box-shadow;
-	-ms-transition-duration: 0.5s;
-	-o-transition-property: background-color, box-shadow;
-	-o-transition-duration: 0.5s;
-	transition-property: background-color, box-shadow;
-	transition-duration: 0.5s;
-}
-
-div.line.glow {
-	background-color: cyan;
-	box-shadow: 0 0 10px cyan;
-}
-
-
-span.lineno {
-	padding-right: 4px;
-	text-align: right;
-	border-right: 2px solid #0F0;
-	background-color: #E8E8E8;
-        white-space: pre;
-}
-span.lineno a {
-	background-color: #D8D8D8;
-}
-
-span.lineno a:hover {
-	background-color: #C8C8C8;
-}
-
-div.ah {
-	background-color: black;
-	font-weight: bold;
-	color: #ffffff;
-	margin-bottom: 3px;
-	margin-top: 3px;
-	padding: 0.2em;
-	border: solid thin #333;
-	border-radius: 0.5em;
-	-webkit-border-radius: .5em;
-	-moz-border-radius: .5em;
-	box-shadow: 2px 2px 3px #999;
-	-webkit-box-shadow: 2px 2px 3px #999;
-	-moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
-	background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000);
-}
-
-div.groupHeader {
-	margin-left: 16px;
-	margin-top: 12px;
-	font-weight: bold;
-}
-
-div.groupText {
-	margin-left: 16px;
-	font-style: italic;
-}
-
-body {
-	background-color: white;
-	color: black;
-        margin: 0;
-}
-
-div.contents {
-	margin-top: 10px;
-	margin-left: 12px;
-	margin-right: 8px;
-}
-
-td.indexkey {
-	background-color: #EBEFF6;
-	font-weight: bold;
-	border: 1px solid #C4CFE5;
-	margin: 2px 0px 2px 0;
-	padding: 2px 10px;
-        white-space: nowrap;
-        vertical-align: top;
-}
-
-td.indexvalue {
-	background-color: #EBEFF6;
-	border: 1px solid #C4CFE5;
-	padding: 2px 10px;
-	margin: 2px 0px;
-}
-
-tr.memlist {
-	background-color: #EEF1F7;
-}
-
-p.formulaDsp {
-	text-align: center;
-}
-
-img.formulaDsp {
-	
-}
-
-img.formulaInl {
-	vertical-align: middle;
-}
-
-div.center {
-	text-align: center;
-        margin-top: 0px;
-        margin-bottom: 0px;
-        padding: 0px;
-}
-
-div.center img {
-	border: 0px;
-}
-
-address.footer {
-	text-align: right;
-	padding-right: 12px;
-}
-
-img.footer {
-	border: 0px;
-	vertical-align: middle;
-}
-
-/* @group Code Colorization */
-
-span.keyword {
-	color: #008000
-}
-
-span.keywordtype {
-	color: #604020
-}
-
-span.keywordflow {
-	color: #e08000
-}
-
-span.comment {
-	color: #800000
-}
-
-span.preprocessor {
-	color: #806020
-}
-
-span.stringliteral {
-	color: #002080
-}
-
-span.charliteral {
-	color: #008080
-}
-
-span.vhdldigit { 
-	color: #ff00ff 
-}
-
-span.vhdlchar { 
-	color: #000000 
-}
-
-span.vhdlkeyword { 
-	color: #700070 
-}
-
-span.vhdllogic { 
-	color: #ff0000 
-}
-
-blockquote {
-        background-color: #F7F8FB;
-        border-left: 2px solid #9CAFD4;
-        margin: 0 24px 0 4px;
-        padding: 0 12px 0 16px;
-}
-
-/* @end */
-
-/*
-.search {
-	color: #003399;
-	font-weight: bold;
-}
-
-form.search {
-	margin-bottom: 0px;
-	margin-top: 0px;
-}
-
-input.search {
-	font-size: 75%;
-	color: #000080;
-	font-weight: normal;
-	background-color: #e8eef2;
-}
-*/
-
-td.tiny {
-	font-size: 75%;
-}
-
-.dirtab {
-	padding: 4px;
-	border-collapse: collapse;
-	border: 1px solid #A3B4D7;
-}
-
-th.dirtab {
-	background: #EBEFF6;
-	font-weight: bold;
-}
-
-hr {
-	height: 0px;
-	border: none;
-	border-top: 1px solid #4A6AAA;
-}
-
-hr.footer {
-	height: 1px;
-}
-
-/* @group Member Descriptions */
-
-table.memberdecls {
-	border-spacing: 0px;
-	padding: 0px;
-}
-
-.memberdecls td, .fieldtable tr {
-	-webkit-transition-property: background-color, box-shadow;
-	-webkit-transition-duration: 0.5s;
-	-moz-transition-property: background-color, box-shadow;
-	-moz-transition-duration: 0.5s;
-	-ms-transition-property: background-color, box-shadow;
-	-ms-transition-duration: 0.5s;
-	-o-transition-property: background-color, box-shadow;
-	-o-transition-duration: 0.5s;
-	transition-property: background-color, box-shadow;
-	transition-duration: 0.5s;
-}
-
-.memberdecls td.glow, .fieldtable tr.glow {
-	background-color: cyan;
-	box-shadow: 0 0 15px cyan;
-}
-
-.mdescLeft, .mdescRight,
-.memItemLeft, .memItemRight,
-.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
-	background-color: #F9FAFC;
-	border: none;
-	margin: 4px;
-	padding: 1px 0 0 8px;
-}
-
-.mdescLeft, .mdescRight {
-	padding: 0px 8px 4px 8px;
-	color: #555;
-}
-
-.memSeparator {
-        border-bottom: 1px solid #DEE4F0;
-        line-height: 1px;
-        margin: 0px;
-        padding: 0px;
-}
-
-.memItemLeft, .memTemplItemLeft {
-        white-space: nowrap;
-}
-
-.memItemRight {
-	width: 100%;
-}
-
-.memTemplParams {
-	color: #4665A2;
-        white-space: nowrap;
-	font-size: 80%;
-}
-
-/* @end */
-
-/* @group Member Details */
-
-/* Styles for detailed member documentation */
-
-.memtemplate {
-	font-size: 80%;
-	color: #4665A2;
-	font-weight: normal;
-	margin-left: 9px;
-}
-
-.memnav {
-	background-color: #EBEFF6;
-	border: 1px solid #A3B4D7;
-	text-align: center;
-	margin: 2px;
-	margin-right: 15px;
-	padding: 2px;
-}
-
-.mempage {
-	width: 100%;
-}
-
-.memitem {
-	padding: 0;
-	margin-bottom: 10px;
-	margin-right: 5px;
-        -webkit-transition: box-shadow 0.5s linear;
-        -moz-transition: box-shadow 0.5s linear;
-        -ms-transition: box-shadow 0.5s linear;
-        -o-transition: box-shadow 0.5s linear;
-        transition: box-shadow 0.5s linear;
-        display: table !important;
-        width: 100%;
-}
-
-.memitem.glow {
-         box-shadow: 0 0 15px cyan;
-}
-
-.memname {
-        font-weight: bold;
-        margin-left: 6px;
-}
-
-.memname td {
-	vertical-align: bottom;
-}
-
-.memproto, dl.reflist dt {
-        border-top: 1px solid #A8B8D9;
-        border-left: 1px solid #A8B8D9;
-        border-right: 1px solid #A8B8D9;
-        padding: 6px 0px 6px 0px;
-        color: #253555;
-        font-weight: bold;
-        text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
-        background-image:url('nav_f.png');
-        background-repeat:repeat-x;
-        background-color: #E2E8F2;
-        /* opera specific markup */
-        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        border-top-right-radius: 4px;
-        border-top-left-radius: 4px;
-        /* firefox specific markup */
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        -moz-border-radius-topright: 4px;
-        -moz-border-radius-topleft: 4px;
-        /* webkit specific markup */
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        -webkit-border-top-right-radius: 4px;
-        -webkit-border-top-left-radius: 4px;
-
-}
-
-.memdoc, dl.reflist dd {
-        border-bottom: 1px solid #A8B8D9;      
-        border-left: 1px solid #A8B8D9;      
-        border-right: 1px solid #A8B8D9; 
-        padding: 6px 10px 2px 10px;
-        background-color: #FBFCFD;
-        border-top-width: 0;
-        background-image:url('nav_g.png');
-        background-repeat:repeat-x;
-        background-color: #FFFFFF;
-        /* opera specific markup */
-        border-bottom-left-radius: 4px;
-        border-bottom-right-radius: 4px;
-        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        /* firefox specific markup */
-        -moz-border-radius-bottomleft: 4px;
-        -moz-border-radius-bottomright: 4px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        /* webkit specific markup */
-        -webkit-border-bottom-left-radius: 4px;
-        -webkit-border-bottom-right-radius: 4px;
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-}
-
-dl.reflist dt {
-        padding: 5px;
-}
-
-dl.reflist dd {
-        margin: 0px 0px 10px 0px;
-        padding: 5px;
-}
-
-.paramkey {
-	text-align: right;
-}
-
-.paramtype {
-	white-space: nowrap;
-}
-
-.paramname {
-	color: #602020;
-	white-space: nowrap;
-}
-.paramname em {
-	font-style: normal;
-}
-.paramname code {
-        line-height: 14px;
-}
-
-.params, .retval, .exception, .tparams {
-        margin-left: 0px;
-        padding-left: 0px;
-}       
-
-.params .paramname, .retval .paramname {
-        font-weight: bold;
-        vertical-align: top;
-}
-        
-.params .paramtype {
-        font-style: italic;
-        vertical-align: top;
-}       
-        
-.params .paramdir {
-        font-family: "courier new",courier,monospace;
-        vertical-align: top;
-}
-
-table.mlabels {
-	border-spacing: 0px;
-}
-
-td.mlabels-left {
-	width: 100%;
-	padding: 0px;
-}
-
-td.mlabels-right {
-	vertical-align: bottom;
-	padding: 0px;
-	white-space: nowrap;
-}
-
-span.mlabels {
-        margin-left: 8px;
-}
-
-span.mlabel {
-        background-color: #728DC1;
-        border-top:1px solid #5373B4;
-        border-left:1px solid #5373B4;
-        border-right:1px solid #C4CFE5;
-        border-bottom:1px solid #C4CFE5;
-	text-shadow: none;
-	color: white;
-	margin-right: 4px;
-	padding: 2px 3px;
-	border-radius: 3px;
-	font-size: 7pt;
-	white-space: nowrap;
-	vertical-align: middle;
-}
-
-
-
-/* @end */
-
-/* these are for tree view inside a (index) page */
-
-div.directory {
-        margin: 10px 0px;
-        border-top: 1px solid #9CAFD4;
-        border-bottom: 1px solid #9CAFD4;
-        width: 100%;
-}
-
-.directory table {
-        border-collapse:collapse;
-}
-
-.directory td {
-        margin: 0px;
-        padding: 0px;
-	vertical-align: top;
-}
-
-.directory td.entry {
-        white-space: nowrap;
-        padding-right: 6px;
-	padding-top: 3px;
-}
-
-.directory td.entry a {
-        outline:none;
-}
-
-.directory td.entry a img {
-        border: none;
-}
-
-.directory td.desc {
-        width: 100%;
-        padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 3px;
-	border-left: 1px solid rgba(0,0,0,0.05);
-}
-
-.directory tr.even {
-	padding-left: 6px;
-	background-color: #F7F8FB;
-}
-
-.directory img {
-	vertical-align: -30%;
-}
-
-.directory .levels {
-        white-space: nowrap;
-        width: 100%;
-        text-align: right;
-        font-size: 9pt;
-}
-
-.directory .levels span {
-        cursor: pointer;
-        padding-left: 2px;
-        padding-right: 2px;
-	color: #3D578C;
-}
-
-.arrow {
-    color: #9CAFD4;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    cursor: pointer;
-    font-size: 80%;
-    display: inline-block;
-    width: 16px;
-    height: 22px;
-}
-
-.icon {
-    font-family: Arial, Helvetica;
-    font-weight: bold;
-    font-size: 12px;
-    height: 14px;
-    width: 16px;
-    display: inline-block;
-    background-color: #728DC1;
-    color: white;
-    text-align: center;
-    border-radius: 4px;
-    margin-left: 2px;
-    margin-right: 2px;
-}
-
-.icona {
-    width: 24px;
-    height: 22px;
-    display: inline-block;
-}
-
-.iconfopen {
-    width: 24px;
-    height: 18px;
-    margin-bottom: 4px;
-    background-image:url('ftv2folderopen.png');
-    background-position: 0px -4px;
-    background-repeat: repeat-y;
-    vertical-align:top;
-    display: inline-block;
-}
-
-.iconfclosed {
-    width: 24px;
-    height: 18px;
-    margin-bottom: 4px;
-    background-image:url('ftv2folderclosed.png');
-    background-position: 0px -4px;
-    background-repeat: repeat-y;
-    vertical-align:top;
-    display: inline-block;
-}
-
-.icondoc {
-    width: 24px;
-    height: 18px;
-    margin-bottom: 4px;
-    background-image:url('ftv2doc.png');
-    background-position: 0px -4px;
-    background-repeat: repeat-y;
-    vertical-align:top;
-    display: inline-block;
-}
-
-table.directory {
-    font: 400 14px Roboto,sans-serif;
-}
-
-/* @end */
-
-div.dynheader {
-        margin-top: 8px;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-address {
-	font-style: normal;
-	color: #2A3D61;
-}
-
-table.doxtable {
-	border-collapse:collapse;
-        margin-top: 4px;
-        margin-bottom: 4px;
-}
-
-table.doxtable td, table.doxtable th {
-	border: 1px solid #2D4068;
-	padding: 3px 7px 2px;
-}
-
-table.doxtable th {
-	background-color: #374F7F;
-	color: #FFFFFF;
-	font-size: 110%;
-	padding-bottom: 4px;
-	padding-top: 5px;
-}
-
-table.fieldtable {
-        /*width: 100%;*/
-        margin-bottom: 10px;
-        border: 1px solid #A8B8D9;
-        border-spacing: 0px;
-        -moz-border-radius: 4px;
-        -webkit-border-radius: 4px;
-        border-radius: 4px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
-        -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
-        box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
-}
-
-.fieldtable td, .fieldtable th {
-        padding: 3px 7px 2px;
-}
-
-.fieldtable td.fieldtype, .fieldtable td.fieldname {
-        white-space: nowrap;
-        border-right: 1px solid #A8B8D9;
-        border-bottom: 1px solid #A8B8D9;
-        vertical-align: top;
-}
-
-.fieldtable td.fieldname {
-        padding-top: 3px;
-}
-
-.fieldtable td.fielddoc {
-        border-bottom: 1px solid #A8B8D9;
-        /*width: 100%;*/
-}
-
-.fieldtable td.fielddoc p:first-child {
-        margin-top: 0px;
-}       
-        
-.fieldtable td.fielddoc p:last-child {
-        margin-bottom: 2px;
-}
-
-.fieldtable tr:last-child td {
-        border-bottom: none;
-}
-
-.fieldtable th {
-        background-image:url('nav_f.png');
-        background-repeat:repeat-x;
-        background-color: #E2E8F2;
-        font-size: 90%;
-        color: #253555;
-        padding-bottom: 4px;
-        padding-top: 5px;
-        text-align:left;
-        -moz-border-radius-topleft: 4px;
-        -moz-border-radius-topright: 4px;
-        -webkit-border-top-left-radius: 4px;
-        -webkit-border-top-right-radius: 4px;
-        border-top-left-radius: 4px;
-        border-top-right-radius: 4px;
-        border-bottom: 1px solid #A8B8D9;
-}
-
-
-.tabsearch {
-	top: 0px;
-	left: 10px;
-	height: 36px;
-	background-image: url('tab_b.png');
-	z-index: 101;
-	overflow: hidden;
-	font-size: 13px;
-}
-
-.navpath ul
-{
-	font-size: 11px;
-	background-image:url('tab_b.png');
-	background-repeat:repeat-x;
-	background-position: 0 -5px;
-	height:30px;
-	line-height:30px;
-	color:#8AA0CC;
-	border:solid 1px #C2CDE4;
-	overflow:hidden;
-	margin:0px;
-	padding:0px;
-}
-
-.navpath li
-{
-	list-style-type:none;
-	float:left;
-	padding-left:10px;
-	padding-right:15px;
-	background-image:url('bc_s.png');
-	background-repeat:no-repeat;
-	background-position:right;
-	color:#364D7C;
-}
-
-.navpath li.navelem a
-{
-	height:32px;
-	display:block;
-	text-decoration: none;
-	outline: none;
-	color: #283A5D;
-	font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
-	text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
-	text-decoration: none;        
-}
-
-.navpath li.navelem a:hover
-{
-	color:#6884BD;
-}
-
-.navpath li.footer
-{
-        list-style-type:none;
-        float:right;
-        padding-left:10px;
-        padding-right:15px;
-        background-image:none;
-        background-repeat:no-repeat;
-        background-position:right;
-        color:#364D7C;
-        font-size: 8pt;
-}
-
-
-div.summary
-{
-	float: right;
-	font-size: 8pt;
-	padding-right: 5px;
-	width: 50%;
-	text-align: right;
-}       
-
-div.summary a
-{
-	white-space: nowrap;
-}
-
-div.ingroups
-{
-	font-size: 8pt;
-	width: 50%;
-	text-align: left;
-}
-
-div.ingroups a
-{
-	white-space: nowrap;
-}
-
-div.header
-{
-        background-image:url('nav_h.png');
-        background-repeat:repeat-x;
-	background-color: #F9FAFC;
-	margin:  0px;
-	border-bottom: 1px solid #C4CFE5;
-}
-
-div.headertitle
-{
-	padding: 5px 5px 5px 10px;
-}
-
-dl
-{
-        padding: 0 0 0 10px;
-}
-
-/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug */
-dl.section
-{
-	margin-left: 0px;
-	padding-left: 0px;
-}
-
-dl.note
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #D0C000;
-}
-
-dl.warning, dl.attention
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #FF0000;
-}
-
-dl.pre, dl.post, dl.invariant
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #00D000;
-}
-
-dl.deprecated
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #505050;
-}
-
-dl.todo
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #00C0E0;
-}
-
-dl.test
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #3030E0;
-}
-
-dl.bug
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #C08050;
-}
-
-dl.section dd {
-	margin-bottom: 6px;
-}
-
-
-#projectlogo
-{
-	text-align: center;
-	vertical-align: bottom;
-	border-collapse: separate;
-}
- 
-#projectlogo img
-{ 
-	border: 0px none;
-}
- 
-#projectname
-{
-	font: 300% Tahoma, Arial,sans-serif;
-	margin: 0px;
-	padding: 2px 0px;
-}
-    
-#projectbrief
-{
-	font: 120% Tahoma, Arial,sans-serif;
-	margin: 0px;
-	padding: 0px;
-}
-
-#projectnumber
-{
-	font: 50% Tahoma, Arial,sans-serif;
-	margin: 0px;
-	padding: 0px;
-}
-
-#titlearea
-{
-	padding: 0px;
-	margin: 0px;
-	width: 100%;
-	border-bottom: 1px solid #5373B4;
-}
-
-.image
-{
-        text-align: center;
-}
-
-.dotgraph
-{
-        text-align: center;
-}
-
-.mscgraph
-{
-        text-align: center;
-}
-
-.diagraph
-{
-        text-align: center;
-}
-
-.caption
-{
-	font-weight: bold;
-}
-
-div.zoom
-{
-	border: 1px solid #90A5CE;
-}
-
-dl.citelist {
-        margin-bottom:50px;
-}
-
-dl.citelist dt {
-        color:#334975;
-        float:left;
-        font-weight:bold;
-        margin-right:10px;
-        padding:5px;
-}
-
-dl.citelist dd {
-        margin:2px 0;
-        padding:5px 0;
-}
-
-div.toc {
-        padding: 14px 25px;
-        background-color: #F4F6FA;
-        border: 1px solid #D8DFEE;
-        border-radius: 7px 7px 7px 7px;
-        float: right;
-        height: auto;
-        margin: 0 20px 10px 10px;
-        width: 200px;
-}
-
-div.toc li {
-        background: url("bdwn.png") no-repeat scroll 0 5px transparent;
-        font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif;
-        margin-top: 5px;
-        padding-left: 10px;
-        padding-top: 2px;
-}
-
-div.toc h3 {
-        font: bold 12px/1.2 Arial,FreeSans,sans-serif;
-	color: #4665A2;
-        border-bottom: 0 none;
-        margin: 0;
-}
-
-div.toc ul {
-        list-style: none outside none;
-        border: medium none;
-        padding: 0px;
-}       
-
-div.toc li.level1 {
-        margin-left: 0px;
-}
-
-div.toc li.level2 {
-        margin-left: 15px;
-}
-
-div.toc li.level3 {
-        margin-left: 30px;
-}
-
-div.toc li.level4 {
-        margin-left: 45px;
-}
-
-.inherit_header {
-        font-weight: bold;
-        color: gray;
-        cursor: pointer;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-.inherit_header td {
-        padding: 6px 0px 2px 5px;
-}
-
-.inherit {
-        display: none;
-}
-
-tr.heading h2 {
-        margin-top: 12px;
-        margin-bottom: 4px;
-}
-
-/* tooltip related style info */
-
-.ttc {
-        position: absolute;
-        display: none;
-}
-
-#powerTip {
-	cursor: default;
-	white-space: nowrap;
-	background-color: white;
-	border: 1px solid gray;
-	border-radius: 4px 4px 4px 4px;
-	box-shadow: 1px 1px 7px gray;
-	display: none;
-	font-size: smaller;
-	max-width: 80%;
-	opacity: 0.9;
-	padding: 1ex 1em 1em;
-	position: absolute;
-	z-index: 2147483647;
-}
-
-#powerTip div.ttdoc {
-        color: grey;
-	font-style: italic;
-}
-
-#powerTip div.ttname a {
-        font-weight: bold;
-}
-
-#powerTip div.ttname {
-        font-weight: bold;
-}
-
-#powerTip div.ttdeci {
-        color: #006318;
-}
-
-#powerTip div {
-        margin: 0px;
-        padding: 0px;
-        font: 12px/16px Roboto,sans-serif;
-}
-
-#powerTip:before, #powerTip:after {
-	content: "";
-	position: absolute;
-	margin: 0px;
-}
-
-#powerTip.n:after,  #powerTip.n:before,
-#powerTip.s:after,  #powerTip.s:before,
-#powerTip.w:after,  #powerTip.w:before,
-#powerTip.e:after,  #powerTip.e:before,
-#powerTip.ne:after, #powerTip.ne:before,
-#powerTip.se:after, #powerTip.se:before,
-#powerTip.nw:after, #powerTip.nw:before,
-#powerTip.sw:after, #powerTip.sw:before {
-	border: solid transparent;
-	content: " ";
-	height: 0;
-	width: 0;
-	position: absolute;
-}
-
-#powerTip.n:after,  #powerTip.s:after,
-#powerTip.w:after,  #powerTip.e:after,
-#powerTip.nw:after, #powerTip.ne:after,
-#powerTip.sw:after, #powerTip.se:after {
-	border-color: rgba(255, 255, 255, 0);
-}
-
-#powerTip.n:before,  #powerTip.s:before,
-#powerTip.w:before,  #powerTip.e:before,
-#powerTip.nw:before, #powerTip.ne:before,
-#powerTip.sw:before, #powerTip.se:before {
-	border-color: rgba(128, 128, 128, 0);
-}
-
-#powerTip.n:after,  #powerTip.n:before,
-#powerTip.ne:after, #powerTip.ne:before,
-#powerTip.nw:after, #powerTip.nw:before {
-	top: 100%;
-}
-
-#powerTip.n:after, #powerTip.ne:after, #powerTip.nw:after {
-	border-top-color: #ffffff;
-	border-width: 10px;
-	margin: 0px -10px;
-}
-#powerTip.n:before {
-	border-top-color: #808080;
-	border-width: 11px;
-	margin: 0px -11px;
-}
-#powerTip.n:after, #powerTip.n:before {
-	left: 50%;
-}
-
-#powerTip.nw:after, #powerTip.nw:before {
-	right: 14px;
-}
-
-#powerTip.ne:after, #powerTip.ne:before {
-	left: 14px;
-}
-
-#powerTip.s:after,  #powerTip.s:before,
-#powerTip.se:after, #powerTip.se:before,
-#powerTip.sw:after, #powerTip.sw:before {
-	bottom: 100%;
-}
-
-#powerTip.s:after, #powerTip.se:after, #powerTip.sw:after {
-	border-bottom-color: #ffffff;
-	border-width: 10px;
-	margin: 0px -10px;
-}
-
-#powerTip.s:before, #powerTip.se:before, #powerTip.sw:before {
-	border-bottom-color: #808080;
-	border-width: 11px;
-	margin: 0px -11px;
-}
-
-#powerTip.s:after, #powerTip.s:before {
-	left: 50%;
-}
-
-#powerTip.sw:after, #powerTip.sw:before {
-	right: 14px;
-}
-
-#powerTip.se:after, #powerTip.se:before {
-	left: 14px;
-}
-
-#powerTip.e:after, #powerTip.e:before {
-	left: 100%;
-}
-#powerTip.e:after {
-	border-left-color: #ffffff;
-	border-width: 10px;
-	top: 50%;
-	margin-top: -10px;
-}
-#powerTip.e:before {
-	border-left-color: #808080;
-	border-width: 11px;
-	top: 50%;
-	margin-top: -11px;
-}
-
-#powerTip.w:after, #powerTip.w:before {
-	right: 100%;
-}
-#powerTip.w:after {
-	border-right-color: #ffffff;
-	border-width: 10px;
-	top: 50%;
-	margin-top: -10px;
-}
-#powerTip.w:before {
-	border-right-color: #808080;
-	border-width: 11px;
-	top: 50%;
-	margin-top: -11px;
-}
-
-@media print
-{
-  #top { display: none; }
-  #side-nav { display: none; }
-  #nav-path { display: none; }
-  body { overflow:visible; }
-  h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
-  .summary { display: none; }
-  .memitem { page-break-inside: avoid; }
-  #doc-content
-  {
-    margin-left:0 !important;
-    height:auto !important;
-    width:auto !important;
-    overflow:inherit;
-    display:inline;
-  }
-}
-
diff --git a/docs/html/doxygen.png b/docs/html/doxygen.png
deleted file mode 100644
index 3ff17d807fd8aa003bed8bb2a69e8f0909592fd1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3779
zcmV;!4m|ORP)<h;3K|Lk000e1NJLTq003wJ0018d1^@s63p<F|000h(Nkl<ZcmeHQ
zd0ds%x_&e@B~(leQIt>tMIv#Q0*~7<F|l1ZVT5-RDygU_D&hbl1PO?G!02E&AgGC=
zZN)5-^5BGUBqbS?oI>*`IBSO7_x;@a8#Zk6_PeKR_s92J&)(m+);m9Iz3blw)z#Gi
zP!9lj4$%+*>Hz@HCmM9L9|8c+0u=!H$O3?R0Kgx|#WP<6fKfC8fM-CQZT|_r@`>VO
zX^Hgb|9cJqpdJA5$MCEK`F_2@2Y@s>^+;pF`~jdI0Pvr|vl4`=C)EH@1IFe7pdJ8F
zH(qGi004~QnF)Ggga~8v08kGAs2hKTATxr7pwfNk|4#_AaT>w8P6TV+R2kbS$v==}
zAjf`s0g#V8lB+b3)5oEI*q+{Yt$MZDruD2^;$+(_%Qn+%v0X-bJO=;@kiJ^ygLBnC
z?1OVv_%aex1<B=i>M@jKU|Z~$eI?PoF4Vj>f<jDMm<J9Y`yoa+TL}}nh1XOW>Dzyo
zAiLfpXY*a<I(D9QKZkbcV%budKX>^Sj-S5D0S3@#V$sRW)g)_1e#$%8xdM>Jm7?!h
zu0P2X=xoN>^!4DoPRgph2(2va07yfpXF+<E#%$BN8?9&2`XF7LYR>WH7EOg1GY%Zn
z7~1A<(z7Q$ktEXhW_?GMpHp9l_UL18F3KOsxu81pqoBiNbFSGsof<JcynBP?5;;Hj
z5&eaFaU9!r?$Z!yiA0iczsm`lZQ1Q_f!pH!Vb=UbaniMS2h4rH7k+#41ORG)=X>-W
z6~eloMoz=4?OOnl2J268x5rOY`dCk0us(u<ZFT0vzGbA7HOqUbO4YBUD4VpaA7aAi
z`;yHWY}3Vkp6~i#=>S#Ud4yqOr@?=Q57a}tit|BhY>}~frH1sP`ScHS_d)oqH^lYy
zZ%VP`#10MlE~P?cE(%(#(AUSv_T{+;t@$U}El}(1ig`vZo`Rm;+5&(AYzJ^Ae=h2X
z@Re%vH<EH?l6o;YyW^)wNA36}ocwXH@B9yX*N9`RUu$0?DW6D6ZqU(wh|t!U;k4w{
zH3|#>wZU<K8~-&UxVP@$khUv1RFND27=jD%j`vdBxN>>|f0NI&%$*4eJ<o-E@WY``
zqsV5Uq0M(^e2$XbFQVQY6A&05BoX(oqU-Sbz&pR-sMeX{(#EY_uNvG}BHk}N3y1ea
z&)~4V{6c-_c}Yb90AmPVmxDc9RtA&ZXtL`~<RoleJ4+E0`>weC5OROQrpPMA@*w|o
z()A==l}(@bv^&>H1Ob3C=<^|hob?0+xJ?QQ3-ueQC}zy&JQNib!OqSO@-=>XzxlSF
zAZ^U*1l6EEmg3r};_HY>&Jo_{dOPEFTWPmt=U&F#+0(O59^UIlHbNX+eF8UzyDR*T
z(=5X$VF3!gm@RooS-&iiUYGG^`hMR(07zr_xP`d!^BH?uD>Phl8Rdifx3Af^Zr`Ku
ztL+~HkVeL#bJ)7;`=>;{KNRvjmc}1}c58Sr#Treq=4{xo!ATy|c>iRSp4`dzMMVd@
zL8?uwXDY}Wqgh4mH`|$BTXpUIu6A1-cSq%hJw;@^Zr8TP=GMh*p(m(tN7@!^D~sl$
zz^tf4II4|};+irE$Fnm4NTc5%p{PRA`%}Zk`CE5?#h3|xcyQ<Xbb-O<Z4>sS#iONZ
z6H(@^i9td!$z~bZiJLTax$o>r(p}3o<nje2|Avo`h6^!)bS{!kN^oebdd#5CQZW;b
zA~P)_xQB}-?DMcO;{2ZM^9Wlyhwp^EkrNh$g-#zJZI+W)Fn_KeU+CPzoDA3XHu>@<
zyD7%(>ZYvy=6$U3e!F{Z`uSaYy`xQyl?b{}eg|G3&fz*`QH@mDUn)1%#5u`0m$%D}
z?;tZ0u(mWeMV0QtzjgN!lT*pNRj;6510Wwx?Yi_=tYw|J#7@(Xe7ifDzXuK;JB;QO
z#bg~K$cgm$@{QiL_3yr}y&~wuv=P=#O&Tj=Sr)aCUlYmZMcw?)T?c<qySZ3PfzX|h
zNxj~sZx=;8Umdw9ghf!XjC^g!!4jbxk=-nc)2X_;TCvXGx~JD`-7FPr%}ttM#Q243
zdSwWYRlDX2nZa}#Gt<Dmm^PQv_W8@V1ahd2xzT--lXvzyozAEE>%0rUe1cS+o!qs_
zQ6Gp)-{)V!;=q}llyK3|^WeLKyjf%y;xHku;9(vM!j|~<7w1<b9>c*Mk-;P{T&yG)
z@C-8E?QPynNQ<8f01D`2qexcVEIOU?y}MG)TAE6&VT5`rK8s(4PE;uQ92LTXUQ<>^
ztyQ@=@kRdh@ebUG^Z6NWWIL;_IGJ2ST>$t!$m$qvtj0Qmw8moN6GUV^!Q<bah>KNK
zHBXCtUH<T{Q0VG*iQ!ybGT-d~B6-ML?|B@`9jAJuXM0(zdxXQ88~8P;7XLeUe|t_d
z>8)<!#He?t!J^GeqTQ|g&oVhlWWSQ^3wbH*P~P%5jK!(1iLn|0Ky6Ue@po!$EH;54
z;b>RY9++gH_TUV4^=-j$t}dD3qsN7GclJ^Zc&(j6&a_!$jCf}%c5ey`pm~1)@{yI3
zTdWyB+*X{JFw#z;PwRr5evb2!ueWF;v`B0HoUu4-(~aL=z;OXUUEtG`_$)Oxw6FKg
zEzY`CyKaSBK3xt#8gA|r_|Kehn_HYVBMpEwbn9-fI*!u*eTA1ef8<m-U!GYcFSJLJ
zOPLuMsUG=;l_>Mkl1=!jV4oYwWYM}i`A>_F4nhmlCIC<a0TFv~_Gn5J$t&6%>6WLa
zY%;4&@AlnaG11ejl61Jev21|r*m+?Kru3;1tFDl}#!OzUp6c<MxE}d=F238nid!5E
zbuV4Li)mAR_zs;;KC)#onQ@0|X4)pAsc9QjTs>>go4{C|^erwpG*&h6bs<zmjhG<*
zE{sn|w6-*tdUsTEE)MUBrppa@^|iO0)`UpL`5B|0$bS|TNcm?8(P;6KR3zVdakzT^
zsBpiu>pUPJag}oOkN2912Y3I?(eRc@U9>z#HPBHC?nps7<lndN{fZB#2e8hBJ?W_#
zvKYcfdj<vgzAF_~|7`oJ7%A(QC6W9Love!T&>H5!zP``90!Q1n80jo+B3TWXp!8Pe
zwuKuLLI6l3Gv@+QH*Y}2wPLPQ1<z4ER5ty_VVXxzYOzIn{d_~;>^EZhT#+Ed8q8Wo
z1pTmIBxv14-{l&QVKxAyQF#8Q@NeJwWdKk>?cpiJLkJr+aZ!Me+Cfp!?FWSRf^j2k
z73BRR{WSKaMkJ>1Nbx5dan5hg^_}O{Tj6u%iV%#QGz0Q@j{R^Ik)Z*+(<hQHpK6Z5
zi8eq^eB?|3P+;Mzy(m7G=1H>YvY2ziBG)?AmJa|JV%4UT$k`hcOg5r9R?5>?o~JzK
zJCrj&{i#hG>N7!B4kNX(%igb%kDj0fOQThC-8mtfap82PNRXr1D>lbgg)dYTQ(kbx
z`Ee5kXG~Bh+BHQBf|kJEy6(ga%Wfhvd<CBbJFZu|&ix|RtW*|v*5b8v`i@U0n+f47
zSD?cyrs7)6mOLEQ#wKo0-7FqSilZ<#F2PzZ$MO33Xevog+LBLYy~$@nSkTm3^W^yC
zIq3WalbvYN?L<?79-5^ZkD<zq3;?x3uP+ePW4QK{U>QNDuOfQoe377l#h<A9J4gi0
z4<mxkd?gaZPl$u7PvFeS1JK+=3Z4yZ-0&IVW0nAr#-z!@ac#DB%O-yJZu-*838Tl)
zfLhfR0BRsTs}x^uTZf1DZceAq-6UVWVnvvOfYmAaIKDqNk!<>t&DrMGeIsI5C<&ai
zWG$|hop2@@q5YDa)_-A?B02W;#fH!%k`daQLEItaJJ8Yf1L%8x;kg?)k)00P-lH+w
z)5$QNV6r2$YtnV(4o=0^3{kmaXn*Dm0F*fU(@o)yVVjk|ln8ea6BMy%vZAhW9|wvA
z8RoDkVoMEz1d>|5(k0Nw>22ZT){V<3$^C-cN+|~hKt2)){+l-?3m@-$c?-dlzQ)q-
zZ)j%n^gerV{|+t}9m1_&&Ly!9$rtG4XX|WQ8`xYzGC~U@nYh~g(z<YhXx*Cp6|P&Q
z+&qgTQ*iOjK{t})*a1j`bTm4jd}pY1(@eH1C?v+IyX*vouKAMl_ar-Fo7CB0J+`B!
zO@tRs%)~YFtGCC#lSsGBNG`mdNCagNLGHRWeLO;*wB~O}5I-EeTKCSz6~O^ejO66c
z0Z7B!dkX8bBYo7B91O_`fdat)7RXmXui^e-vnKTv=YIa>9)bdAl#xH)xd5a=@|qql
z|FzEil{P5(@gy!4ek05i$>`E^G~{;pnf6ftpLh$h#W?^#4UkPfa;;?bsIe&kz!+40
zI|6`F2n020)-r`pFaZ38F!S-lJM-o&inOw|66=GMeP@xQU5ghQH{~5Uh~TMTd;I9`
z>YhVB`e^EVj*S7JF39ZgNf}A-0DwOcTT63ydN$I3b?yBQtUI*_fae~kPvzoD$zjX3
zoqBe#>12im4WzZ=f^4+u=!lA|#r%1`WB0-6*3BL#at`47#ebPpR|D1b)3BjT34nYY
z%Ds%d?5$|{LgOIaRO{{oC&RK`O91$fqwM0(C_TALcozu*fWHb%%q&p-q{_8*2Zsi^
zh1ZCnr^UYa;4vQEtHk{~zi>wwMC5o{S=$P0X681y`SXwFH?Ewn{x-MOZynmc)JT5v
zuHLwh;tLfxRrr%|k370}GofLl7thg>ACWWY&msqaVu&ry+`7+Ss>NL^%T1|z{IGMA
zW-SKl=V-^{(f!Kf^#3(|T2W47d(%JVCI4JgRrT1pNz>+ietmFToNv^`gzC@&O-)+i
zPQ~RwK8%C_vf%;%e>NyTp~dM5;!C|N0Q^6|CEb7Bw=Vz~$1#FA;Z*?mKSC)Hl-20s
t8QyHj(g6VK0RYbl8UjE)0O0w=e*@m04r>stuEhWV002ovPDHLkV1hl;dM*F}

diff --git a/docs/html/dynsections.js b/docs/html/dynsections.js
deleted file mode 100644
index 85e183690..000000000
--- a/docs/html/dynsections.js
+++ /dev/null
@@ -1,97 +0,0 @@
-function toggleVisibility(linkObj)
-{
- var base = $(linkObj).attr('id');
- var summary = $('#'+base+'-summary');
- var content = $('#'+base+'-content');
- var trigger = $('#'+base+'-trigger');
- var src=$(trigger).attr('src');
- if (content.is(':visible')===true) {
-   content.hide();
-   summary.show();
-   $(linkObj).addClass('closed').removeClass('opened');
-   $(trigger).attr('src',src.substring(0,src.length-8)+'closed.png');
- } else {
-   content.show();
-   summary.hide();
-   $(linkObj).removeClass('closed').addClass('opened');
-   $(trigger).attr('src',src.substring(0,src.length-10)+'open.png');
- } 
- return false;
-}
-
-function updateStripes()
-{
-  $('table.directory tr').
-       removeClass('even').filter(':visible:even').addClass('even');
-}
-
-function toggleLevel(level)
-{
-  $('table.directory tr').each(function() {
-    var l = this.id.split('_').length-1;
-    var i = $('#img'+this.id.substring(3));
-    var a = $('#arr'+this.id.substring(3));
-    if (l<level+1) {
-      i.removeClass('iconfopen iconfclosed').addClass('iconfopen');
-      a.html('&#9660;');
-      $(this).show();
-    } else if (l==level+1) {
-      i.removeClass('iconfclosed iconfopen').addClass('iconfclosed');
-      a.html('&#9658;');
-      $(this).show();
-    } else {
-      $(this).hide();
-    }
-  });
-  updateStripes();
-}
-
-function toggleFolder(id)
-{
-  // the clicked row
-  var currentRow = $('#row_'+id);
-
-  // all rows after the clicked row
-  var rows = currentRow.nextAll("tr");
-
-  var re = new RegExp('^row_'+id+'\\d+_$', "i"); //only one sub
-
-  // only match elements AFTER this one (can't hide elements before)
-  var childRows = rows.filter(function() { return this.id.match(re); });
-
-  // first row is visible we are HIDING
-  if (childRows.filter(':first').is(':visible')===true) {
-    // replace down arrow by right arrow for current row
-    var currentRowSpans = currentRow.find("span");
-    currentRowSpans.filter(".iconfopen").removeClass("iconfopen").addClass("iconfclosed");
-    currentRowSpans.filter(".arrow").html('&#9658;');
-    rows.filter("[id^=row_"+id+"]").hide(); // hide all children
-  } else { // we are SHOWING
-    // replace right arrow by down arrow for current row
-    var currentRowSpans = currentRow.find("span");
-    currentRowSpans.filter(".iconfclosed").removeClass("iconfclosed").addClass("iconfopen");
-    currentRowSpans.filter(".arrow").html('&#9660;');
-    // replace down arrows by right arrows for child rows
-    var childRowsSpans = childRows.find("span");
-    childRowsSpans.filter(".iconfopen").removeClass("iconfopen").addClass("iconfclosed");
-    childRowsSpans.filter(".arrow").html('&#9658;');
-    childRows.show(); //show all children
-  }
-  updateStripes();
-}
-
-
-function toggleInherit(id)
-{
-  var rows = $('tr.inherit.'+id);
-  var img = $('tr.inherit_header.'+id+' img');
-  var src = $(img).attr('src');
-  if (rows.filter(':first').is(':visible')===true) {
-    rows.css('display','none');
-    $(img).attr('src',src.substring(0,src.length-8)+'closed.png');
-  } else {
-    rows.css('display','table-row'); // using show() causes jump in firefox
-    $(img).attr('src',src.substring(0,src.length-10)+'open.png');
-  }
-}
-
diff --git a/docs/html/fpl_logo_small.png b/docs/html/fpl_logo_small.png
deleted file mode 100644
index 2c728f3b541184490702effdc4360c3f795cb1bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5073
zcmY*-cQ_nQ*Y*;1t>~R#Mejt^)uNZIUV`WwtkpXaHA)0QunE!mA&A~qO|<AGWTRyD
z9=(@+<$0d(`QCS~Yi7=zxzBx{Gk?uYoZeG)QXnG`0059`YN#08&5CzjiHP8Cw3WyY
zzMF8o4b+tZl_SiXcMD<<4Rdb*fR6HS$9a)6aTkJP?rdb{W2UPkWABa-vUPB`a})|d
zc-)}@0J#8}I}_pPW6KtRaCP&R34nnAg^;<k|GI_2Z2yAzz#(8WT|KrZ?p}^;5<-uJ
zM8NVuHa0dnF9(>6fr{FH!tYiPu#=CEhm5eWzrVkbzqpXQ*9&1$X=!O;5iwygF~K{8
zpm(5~k8OaUn>WY5N&X*?ileu^m$QeDv%4GHUtU`~cV8a}82nf0zwO_7`Z&Y>zml8x
zf6BTmQ26hTu&9uT@PE1QLgoH?WuRWpj(5s``Q=6B{)PNMzW?aR3I7%UU&;Kt(tmmH
zN|gu73IF%l<bgWf+~xoPC55Jnl2HIon?-PfRZk!`+ne?3dB=2XXfK?JNo39Ofto1Z
zGcBjIVq!jUyq-2Sud)8bV<SYgf$@7S>Y|H+Qa%aiG%n+N8gYu?q6$kr5?!!Uw0%Mx
zYnZ1?Ji@g$bobAEYwOu3@5`&<x#smbZ`R<wc}|W!$cuL5#q*<K$=@L_c2ot<Ip6zf
z27WrzULxubO-_60L5@chNv_o2kqhc7^y1F1+gmsRFNz~UAqrnh+!quyq5~Y9GzAqm
zzOQ<n2!mLHt}Hd^2X%{tC6+D>G-#VGY0<9JJWjmahyiMHuh-f|lv+oe;<JiIj_Gz^
z)~Lr5UZRzj<=qm++LK&`VnXDhBnKbaw}{%E@MD{so27?FN12Y&zg(V$Q*Wuqr_pE<
zLm&`iPJeB8eISqihB>eb&CN~IoPGTEh4}D4LCqAK4JN+43uht6$EWm;bz8G#75w-b
z7&O}4{?JcXJL(kAtw%=^VGtGa#M;{0bTHo@zrTy-jd<2cz+3;XO$^J-4_UJ7Bcs#k
z`G1)wva!F%j5A(dUL_ZZ$?&r9DsH39vLwze+<%A`kRnCB4okR4VW-(2*HceuHL^QN
z4~)a6?ga%0Z!$$SwoNqPu57Hq)?H{_CtCYJLTo4)Bm<{uba`wxwh0~}X{m~e8qFY{
zId_X^p;OKCOf*oDEvjf!>4p!Nv>AKB-=Nd^CW<Eb7K5c_GhUG2EQ=Gl-B5PVc7*M_
z=Kw~ma4&<Lh;}B4R2dzu=I^IK%MLAON*;X4#W$-J{va{U`Qp8;L-H)`f=u}SXh-x0
zx~;Q*7Dp{OV3*!w*6rLH3r2mc!f7jKp@P?UHv>%cZpvt%@LBPZNvpRqYt*Vbmja|w
z%C^Ndk3PP037?mUn+>@?4h?<1Kf`M8NYLb%09U}sG96joFLA~x;a<dIL<4e~s6d<_
zdAiuG&Ux*(_Vy(89cmYJX>uzn^>~a>ZLeovE+E?+4v8lXv$l9?nyn=bdkY!rFc%r*
zAzMk|<ukaEH?gO>U-ndQomaF1BrBHqqeFdJulKMJ)Rlr(j^g^yZc#5Ark<}DjN+tV
zO(`x62BW+Rfn=N6%%)c|{bPOviM`(*zTXhzd`Rt;2x$ggU+qOTZo6>U9B=7ILE8Wc
zN%zV(QKu|n9cNeje_Ch~>S$N#SE*~!%mf6N+tF-=dALiy?(21n{n24H3ZJ$_H2E**
zI~0$*^=&4}J^TpJeXRJWJ8Ito7W9bj1yrHp5BFZqcVfhAKv(Yq|G0<MbM$hn)ZxKB
z4eIMZ`ZcF2=;apfOIvOE;rOQ0`GzCpa;?1HQ!J$tW;p$Z$KLKbW4J0WBo~xU2ZZmP
z-SR2d&PT%zqKs60&eSolj-cc$3Qzgz*N%*%MsG4T1gvgaR=I)M9tGJ-t(nAV2`T+8
zYPQ86<FA_<N`5rQPN(QjTd{uqz<2y-T!&(@qg{g>a<zE0|Dfs3!YwSy^7$i(Ul~!~
zS?tK;%YDJjkn_~e!55gfR^b~8&x={dDF3ma6q}x|DzfD=k>@ma5z+QQb}&QR8t~(K
zs6RPCOmvILJjc?)?Dqh(G2~VugbR>Huw5D~%Cwa~U;Wj)ydJz@x9%&c`>&$lr&H!a
zdA#Le&nDa)n4q$HRApZ+egR#mbB|Du-rH1=;tsdc%LVqX5xfY~ps-0@I)1n6N=J^d
zOE>vBc*|%=6Y80z`B=P*_(2&^uONkCM1bmLOE70UkM<hPh7QS|8m6RbJkPV-&^EXw
zYVJzAidB{Dv8`K6?B+YAv6qwVTTKXpq8J~u5}M?82j8MH06ruf<!L<dBSXu&;+&p~
zy1~s>^m`Lo=J)QFA0UtTPG5fVmuDrh3l38yf||g5n?Iwh%qj<O8%417-0#{Dq+(P)
z&jw8&!hToJZHlj{*Ekbvn3%dyW5P}u-mGkGO1N*I+$4O`=(n%wzM}cFdXE3qhR;4w
zp?g%Jw+TaD&><%#_hn;rJ@{Zf#&dJLL)kBcMa(GiRUl*YFq0I!ov7|tuc_?%i3u7P
zQ(*Ii!%r31#8K=0KfJVdRx(c4pW&%U-Z<%+_??_;7%EZxRk~-_a8BROOej-Nd4q`H
zZr=5@u*g*jHf$%x1YGL^VBk33?ssKvREM#2F|C1IXeKlJe#xg)TNW#TUj<15MM~kr
zX0F(3hxd&#INL#w03w`j(;}72e!c!T6_`Z_2f-lLn+Ney@kc!DNi6-ljOwpt!$;-i
zU&bWu_E%a%E4X=QfT_iqJ4m<kidmmFF-<j`@3S*>dD@gd8%$sE>LGl~kKS0q7mO{!
zgXsx(N@zY8?>kQ9Kk(R<GFffN&0y9!03{;@kpMmPb1W`2hjk%t=(TUGLuH~5Bo(2^
zcWo5xHRu>1pumPt&q_{?(GqxmsXJ>A8RF$#tDaB?Jfo>iHzB42`l*w%`|_rfKOM=#
zUNfibrY};Zvqyto%(XsB8oHziko!i@{ANONs8(YZ%xNaIIl)Z%T$J{kZz4BaT$z4H
zfXb?F4Euw~>W{Qxl9~G=1g4XM;QR$KsOwQypx;@L*ZxRH+?@LYDYP{@&5S*LF4`s8
z$Ecc$VQh;NYSJ;n?h{oqKk{K5VWA1DJ;9+=OQTZN>i0C?_#*BeB`8Auph6{VBEGh5
zsuM3U@p&{fzKG^0LL^)=R3eKWMOz#M(x&>%V!ElWEHfFrJ%i(KIZ#Kp9L^=Jz^er8
z&-oDEv0kuWH5Z{VU{K3Zm!Gxv&<c9wx?K~Zi!xTU(`jk_Fqf>-_#Ixb;3+K4L<JIL
zg_Xf&8x?y`&@w3pfQE|_VE^9SNG%|#D;`XB%loG(Q&QJh6^w{ZNXRcOb;ezmwgd&q
zrsFx-fui;oq@$o%l6>wQLg3+sYq?aejLeeuE)GNR#)EURg+2|hVQ?zg*Qg9oG$_{#
z(6?=2i~Q%Yz@_R)Qc3$p|3@N)n-`r2jp2e8QU#Rlq&o&tPv0>~cE8%<->)p7k|;4U
zhsqND%Iy*&;Zd}F7*|@E@*3R|s+$zQFLm-D0zrl|*hJ!Lk?8bc+nlQpjW7oD#$}?|
zVeSh^yoC-Bwx4SM@yl33-V3}wb$)@0Uwq30+6w**3U5cNGalO8R`!71@x%pbsL0OR
z6^*mk)RRR2Y^$DgZ_X9-C@RpTTyJYn5qj;vNg!TW74itzOf6TBEr{JfzH;Xr$3<vr
zP8nxSF7RWDPH?&f`+9bs?jzMPH+y*Bx$kqBc?*7*tSAA)#;ztt`E|zBc_1VEePTVi
zG3-lom2mRU7Kw9tXUWplIqQ*d3WRy|Q0gmE5LqqB*<hUxGg_Acqu(ko<{Y6}BdB3I
z@-}X4V+RjK2et9LAlJeklOE3paU7PLf>CnO=#reslFm2WiXAx&HZt0zZ#H5j_%D99
z(6w>!Q|MTJ+ZnwNzWUKOeq}8Tmhr>AMYLv0um7w=KVA%E|I+=37MR>bIh!s8d}CX!
z#hd^wu1ER*UY%<PVf$jfES2r1J1>xR{}Nqcy~slLByZMi-mA*<xs@aE`=heA=BXVk
zO)QPtc`XrzP+7cW$wXfegPuas3Dt|vU8P@|o?W*@T2C_*2VNQ!7b5LAKfUdlh(f&C
z_$gUjDP4dM+`d_H1X+4>F29tmm8TJZbx93NWbW!bk+cc=&7XO_*0@+<84f<XUL_0d
zWgD10T30vaFaq=_I$^$7@LZ3QWwL)zu9|iu$@>M*2R&*AIi~NdwT8I`4jl|tkZ8Wu
z5`fM9B3gU)-uGRn3@KwpN^Z&nx=+CmsLoyj%RgOE3<oQ86ARG<En&K;yHnTculG~F
z_PZp6ZjvQi*Y-Y3Bsz#N>aX8JMHfuYPcD~{4AD7wmnv%vnT(nFJt@#P<jAzwFr6#w
zCegs(;OOt9k;BE_KB1>)P=gKAM`)+U#;f9SBgL#`<9CX6iJoSwE$-X$B`BrEb43$_
zm~g%swKm>eEVBZwdJIKrb29^6;%)h~%aIZ+GB*^;#cdH!t|;VA1S{RM3B`Dl+<J^U
zeVTP3Gm#gOgo~tP<NAjIsK=3ugbF0?eL|Nca8>QT3<!{nl=Q=1v>Hx|=D3YHym5=D
zaJTLg+}10>&A1oDbxG8ZB)i`pF=5JzqZZg}-9^n1$+<T%+aG$chuLci&vT<NygIe@
z!{V%*cEsL_3b6_yKM5P!-Wvk(+fqT>e<BPh>&hW6wpnoTt4o_Q@SqsypsxwP`?CPw
z@@VPBACyNK8yt=ktZ5xbG%7LA*JCK(*>AmN<(D`bM;h+aO9oK;p|kyMkG(r0!;^ND
zeEyI_lV_Vw8A#)o8?+1B>qS_`d^QbKuT2}fn6uNH@h74($G#~)-b^E~@a6EvevRE&
zK^YI0hK^M7)<xJ(zwN-(oR9Xs3p@h^H9Su`Z0LyU*nV!0Uth~QTD;8tx-d?%a<H4T
zJYJy51qTS6O1|}38T;lL7Fl;ui0`m>D^=6s$(sKa%JBiymb>Z9B|mdSb?$#oam-T^
z@$}CLYqxCo(0;XhfqU|IgBraqySLNJXdeuHjfg@E8g>|#_TzmSKGE0{!@8Wr&rKuW
z>=84SfmhAXI1tc5qX>z%@4&*SBnV)ycXoJsjpZi^_NRs1jvPtWg@8yq=>qIl(B46+
z0blAs;Cg(XNOE@#$0=RQLrS%L(k}BKQ2fwo#y9fvh%r!YVKvRSmiiS=2f?9f`%Kl(
zLAb?TUUp24VDGCccFF$F&^797<752B{fTcY=FhrBRU|_hZ^c4sgjm*X<E&qsCeE_t
zPU8v0C58$L*SMw<lq3uo%;Pibv2b$-nsVE6RaR`51dIuc&|(x0)IXCes`qcI2K3Qo
zVlD2yI(_IqWVz&t%-QJmV`D@Q-6%YbBZ;n;;!jr6G;38Y#j?BAx?%m7T?9H;`gxj!
z*thL9cUv0$Fa&<bQ(~CI_yu{b7Xir;qW2`k2hMHog>WexVb82q5*1$S+)`@IgrLBv
zky}xkwqijMH^eO$!^4nI#Eitk45>vUxR%SSgAU0LS0ySM;5QMM#7mj+FTQyqEG&mL
z3Zi;f0xPjtHMgbU*k0b9{bvrNa$UjqOhq(;SiNUn-O~?cs2;p0)R5c}-#M6mz%!pa
zWu{nT6&`VA=MbH&SpQ3V+WzhlDXNo6JR=!V?WxkLK;ZsWN=!VM;-pG->=mH`8H=ij
zR`g2Gh5?bg^A>1)Cn7CqDhN->tWW|u2zW0tET}zFP)o_52g~Z@gax4F(|WPV+O`C%
zZ-dX-qXq_&V{#B=B4+V3FNe(x-)VisRBnGx%H;%(77|`$=y;|v`Mb5?%>k@348scN
zyO4%*s6k0Fs?`AhDi6lyRBXb;CDe=f^9tWPk6qx;h{qWS<Zo(UL!&roMFdRNd6E-T
z$BE|^-vU{(Nz~n@nZxx2l|F}GS8`q)E3e(guO}lz;sOHUPfBVz&k5KbaH1-|#reO7
zb$@(3;$p!!Q=xCJ{OO?ih(J>``k^`9p_)jSu0F>o&f<!y+RI2eRwrbAPdtlzsH&*6
znyJm&a1`lbucmBKDSja#Tu`&%=%G!zy4GCXJ|pYbrA9_n)`zgOXpSY<^n}vQoKC03
zrvY!QyZHykEBCv{rwFGg6XC%3C!7NhsgWiwlVNsv1Cob(#4+uhKF+sdfjt5^sa%nA
z%kXAD0~v!b<ONV^_kN2@J~lreEsjO>=uNx+M2@?sHdh^*)fY$0n5h4xBd)A&*(+dy
zJN2stCiWSf75_-2W)slFRV}WKN0IXJ`X=hR3<pt{hZP&qjbrc{&q9>#4@c0Pf$$8K
zKA;B2G+N1`sM%Tv-|6x3Z?qkgM$$&{Q_?}@CZn|alw6tS({b*&1-tM0)X7s#(|H2Q
z^2#0;u?Z<GMnG)6EklaP^GA#YW$EcPO+wH-2_f}$Jm}%rTQF@AKwV@YYQd4zAZofq
zR+z_7;OM;#S7>rroSndHd*igG<T1C;5nqn6)VdQoxtr&{n$(zoijf9Zjn##qdF3By
z<#fAC=VT;Ip10ACgtuRSU64b@1lfGM>~rY!sd&-J|H{$;UyAFQXlcVrPOsTuvhPoY
k814(#XmNDa<QbMQc(Cjt<iS+k-+wku)u$?z$~F=I1D1`7+W-In

diff --git a/docs/html/ftv2blank.png b/docs/html/ftv2blank.png
deleted file mode 100644
index 63c605bb4c3d941c921a4b6cfa74951e946bcb48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 86
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRr!3HExu9B$%QnH>djv*C{Z|`mdau^P8_z}#X
h?B8GEpdi4(BFDx$je&7RrDQEg&ePS;Wt~$(69Dh@6T1Ka

diff --git a/docs/html/ftv2cl.png b/docs/html/ftv2cl.png
deleted file mode 100644
index 132f6577bf7f085344904602815a260d29f55d9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 453
zcmV;$0XqJPP)<h;3K|Lk000e1NJLTq000;O000&U1^@s6+I?Jz0004uNkl<ZcmeI*
zJ4hoz9LMo*G>VBF;ev;toEj8_OB0EQg5eYilIj#JZG_m^33l3^k4mtzx!TVD?g)Y$
zrvwRDSqT!wLIM$dWCIa$vtxE|mzbTzu-y&$FvF6WA2a{Wr1g}`WdPT-0JzEZ0IxAv
z-Z+ejZc&H;I5-pb_SUB}04j0^V)3t{`z<7asDl2Tw3w3sP%)0^8$bhEg)IOTBcRXv
zFfq~3&gvJ$F-U7mpBW8z1GY~HK&7h4^YI~Orv~wLnC0PP_dAkv;nzX{9Q|8Gv=2ca
z@v)c9T;D#h`TZ2X&&$ff2wedmot995de~-s3I)yauahg;7qn*?1n?F$e+PwP37}~;
z1N<Fr08O(6oL}b6aV*kfj`bSoZ_{M77oZ`w8szdCsq~dB^zguYxu~^S-z<Q7RLwX@
zUGSupm>KUk7reVK^7A;$QRW7qAx40HHUZ<|k3U%nz(Ec`#i+q9K!dgcROAlCS?`L=
v>#=f?wF5ZND!1uAfQsk;KN^4&*8~0npJiJ%2dj9(00000NkvXXu0mjfWVFf_

diff --git a/docs/html/ftv2doc.png b/docs/html/ftv2doc.png
deleted file mode 100644
index 17edabff95f7b8da13c9516a04efe05493c29501..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq000;O000&U1^@s6+I?Jz00089Nkl<ZcmeI5
zO;1x>7=@pnbNXRFEm&G8P!&WHG=d)>K?YZ1bzou)2{$))<VZ%w8AHp|fq%mP;4ffy
zZ-fC6h(S;T@^On$pg;?)``rZ-=s7qr4DR5hE4!!NdDmX=TJJeiSGimUI5QXkXNfZ>
zumDct!>4SyxL;zgaG>wy`^Hv*+}0kUfCrz~BCOViSb$_*&;{TGGn2^x9K*!Sf0=lV
zpP=7O;GA0*Jm*tTYj$IoXvimpnV4S1Z5f$p*f$Db2iq2zrVGQUz~yq`ahn7ck(|CE
z7Gz;%OP~J6)tEZWDzjhL9h2hdfoU2)Nd%T<5Kt;Y0XLt&<@6pQx!n<GayH9yHg8K}
z>w*5`@bq#?l*?3z{Hlzoc=Pr>oB5(9i6~_&-}A(4{Q$>c>%rV&E|a(r&;?i5cQB=}
zYSDU5nXG)NS4HEs0it2AHe2>shCyr7`6@4*6{r@8fXR<pt)Tx_l7FX`b+T&0J~3Ac
zDisC2f48s?Pz6U1j(Y#7FGXj244=p1VQ-4TfmZrD8|c58q%jdB67*815?3si0IJ}q
zK#I#XHom~r+!`&75xy*K>bTA?=IFVWAQJL&H5H{)DpM#{W(GL+Idzf^)uRV@oB8u$
z8v{MfJbTiiRg4bza<41N<zz(9MkMF~u!W-n>Azrl{=3fl_D+$t+^!xlQ8S}{UtY`e
z;;&9UhyZqQRN%2pot{*Ei0*4~hSF_3AH2@fKU!$NSflS>{@tZpDT4`M2WRTTVH+D?
z)GFlEGGHe?koB}i|1w45!BF}N_q&^HJ&-tyR{(afC6H7|aml|tBBbv}55C5DNP8p3
z)~jLEO4Z&2hZmP^i-e%(@d!(E|KRafiU8Q5u(wU((j8un3<FfbmLT1ma;4wB2Ka6K
c|6iFu0IFBSu=gW%4*&oF07*qoM6N<$f>OR*Hvj+t

diff --git a/docs/html/ftv2folderclosed.png b/docs/html/ftv2folderclosed.png
deleted file mode 100644
index bb8ab35edce8e97554e360005ee9fc5bffb36e66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 616
zcmV-u0+;=XP)<h;3K|Lk000e1NJLTq000;O000&U1^@s6+I?Jz0006nNkl<ZcmeHQ
zO;6N77=GINb=Z(>a9#ETzayK)T~Jw&MMH>OIr#&;dC}is*2Mqdf&akCc=O@`qC+4i
z5Iu3w#1M@KqXCz8TIZd1wli&kkl2HVcAiZ8PUn5z_kG@-y;?yK06=cA0U%H0PH+kU
zl6dp}OR(|r8-RG+YLu`zbI}5TlOU6ToR41{9=uz^?dGTNL;wIMf|V3`d1Wj3y!#6`
zBLZ?xpKR~^2x}?~zA(_NUu3IaDB$tKma*XUdOZN~c=dLt_h_k!dbxm_*ibDM<n!c>
zlFX`g{k$X}yIe%$N)cn1LNu=q<K5OS7CNKPk1f&9-+dXiicCfAy8a*|m;2$mAHWmO
zXHGi+kV1-pHt+rM<gA>9_CS)*<?(PP8<}W6a5(^^keLBRMb50K&dQM@pmn94ZU=xQ
zQX)TlxfVQ_9);_LB~VUu;v|U_-?p*(;VWJ|=^7%ZGN6sBL~)dHv|OyK(wPKdmH>>A
zsX_mM4<gjHpqc8Q=uo450T?4i;CdW;`z|<XAntIp>L@`(cSNQKMFc$RtYbx{79<Tw
zWXi-A43v#7I@t_Ijx7TKV2n(H{k|uniNrjlLmWw}y*t^*R9a-QX?;6B==9%$de=Kk
z*QYpi761&SjtX%clomR5cK>#j-J7hk*>*+ZZhM4Hw?<fJyv$}=71o`ou(^pUn-ky6
z->I?rsXCi#mRWJ=-0LGV5a-WR0Qgt<|Nqf)C-@80`5gIz45^_20000<MNUMnLSTaR
CZX#j;

diff --git a/docs/html/ftv2folderopen.png b/docs/html/ftv2folderopen.png
deleted file mode 100644
index d6c7f676a3b3ef8c2c307d319dff3c6a604eb227..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 597
zcmV-b0;>IqP)<h;3K|Lk000e1NJLTq000;O000&U1^@s6+I?Jz0006UNkl<ZcmeHQ
zKX21e5dS%8nlx#!9XpK>X=#(TiCT&PiIIVc55T}TU}EUh*{q$|`3@{d>{Tc9Bo>e=
zfmF3!f>fbI9#GoEHh0f`i5)wkLpva0ztf%HpZneK?w-7AK@b4Itw{y|Zd3k!fH?q2
zlhckHd_V2M_X7+)U&_Xcfvtw60l;--DgZmLSw-Y?S>)zIqMyJ1#FwLU*%bl38ok+!
zh78H87n`ZTS;uhzAR$M`zZ`bVhq=+%u9^$5jDplgxd44}9;IRqUH1YHH|@6oFe%z(
zo4)_>E$F&^P-f(#)>(TrnbE>Pefs9~@iN=|)Rz|V`sGfHNrJ)0gJb8xx+SBmRf@1l
zvuzt=vGfI)<-F9!o&3l?>9~0QbUDT(wFdnQPv%xdD)m*g%!20>Bc9iYmGAp<9YAa(
z0QgY<a!3GSVHw98r3tc|WLmCr=#k@b07--d0B^h;_*7huEOe@B5HbiIMnQNV2X-w6
zOrIHW*Nh!-3RJ{NFA7|xb7mLqy*mtQR%uj&==!8@USn{@{Ji@c`@7F#U6jIrqNF?z
zhGG8IoU)VO(*u}!lcNr&IgdJw?)fXgkFy?t@!%{)3!Y}PHt9|Ph>gTWqf1qN++Gqp
z8@AYPTB3E|6s=WLG?xw0tm|U!o=&zd+H0oRYE;Dbx+Na9s^STqX|Gnq%H8s(nGDGJ
j8vwW|`Ts`)fSK|Kx=IK@RG@g200000NkvXXu0mjfauFEA

diff --git a/docs/html/ftv2lastnode.png b/docs/html/ftv2lastnode.png
deleted file mode 100644
index 63c605bb4c3d941c921a4b6cfa74951e946bcb48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 86
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRr!3HExu9B$%QnH>djv*C{Z|`mdau^P8_z}#X
h?B8GEpdi4(BFDx$je&7RrDQEg&ePS;Wt~$(69Dh@6T1Ka

diff --git a/docs/html/ftv2link.png b/docs/html/ftv2link.png
deleted file mode 100644
index 17edabff95f7b8da13c9516a04efe05493c29501..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq000;O000&U1^@s6+I?Jz00089Nkl<ZcmeI5
zO;1x>7=@pnbNXRFEm&G8P!&WHG=d)>K?YZ1bzou)2{$))<VZ%w8AHp|fq%mP;4ffy
zZ-fC6h(S;T@^On$pg;?)``rZ-=s7qr4DR5hE4!!NdDmX=TJJeiSGimUI5QXkXNfZ>
zumDct!>4SyxL;zgaG>wy`^Hv*+}0kUfCrz~BCOViSb$_*&;{TGGn2^x9K*!Sf0=lV
zpP=7O;GA0*Jm*tTYj$IoXvimpnV4S1Z5f$p*f$Db2iq2zrVGQUz~yq`ahn7ck(|CE
z7Gz;%OP~J6)tEZWDzjhL9h2hdfoU2)Nd%T<5Kt;Y0XLt&<@6pQx!n<GayH9yHg8K}
z>w*5`@bq#?l*?3z{Hlzoc=Pr>oB5(9i6~_&-}A(4{Q$>c>%rV&E|a(r&;?i5cQB=}
zYSDU5nXG)NS4HEs0it2AHe2>shCyr7`6@4*6{r@8fXR<pt)Tx_l7FX`b+T&0J~3Ac
zDisC2f48s?Pz6U1j(Y#7FGXj244=p1VQ-4TfmZrD8|c58q%jdB67*815?3si0IJ}q
zK#I#XHom~r+!`&75xy*K>bTA?=IFVWAQJL&H5H{)DpM#{W(GL+Idzf^)uRV@oB8u$
z8v{MfJbTiiRg4bza<41N<zz(9MkMF~u!W-n>Azrl{=3fl_D+$t+^!xlQ8S}{UtY`e
z;;&9UhyZqQRN%2pot{*Ei0*4~hSF_3AH2@fKU!$NSflS>{@tZpDT4`M2WRTTVH+D?
z)GFlEGGHe?koB}i|1w45!BF}N_q&^HJ&-tyR{(afC6H7|aml|tBBbv}55C5DNP8p3
z)~jLEO4Z&2hZmP^i-e%(@d!(E|KRafiU8Q5u(wU((j8un3<FfbmLT1ma;4wB2Ka6K
c|6iFu0IFBSu=gW%4*&oF07*qoM6N<$f>OR*Hvj+t

diff --git a/docs/html/ftv2mlastnode.png b/docs/html/ftv2mlastnode.png
deleted file mode 100644
index 0b63f6d38c4b9ec907b820192ebe9724ed6eca22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmV<S015wzP)<h;3K|Lk000e1NJLTq000mG000&U1^@s6$*LTD0002JNkl<ZcmeI*
zAx;B97{&1)q=(=LT%h;h3{`DFU=Y+bY0?v5>kw!R34#Lv2LOS^S2tZA31X++9RY}n
zChwn@Z)Wz*WWHH{)HDtJnq&A2hk$<w7_^JU^7%7%0zJH4kA|nU6I?=t2?`YfNxzFd
zLI<~*e?p<IJGcmIw6zLXu+2_Dc6pD@(bhEM-}eIron6S{S?uGdd`*1=UDVom9yVbN
wee?!o*N50y`~~``KBRnn4>b-y(>?@z0iHr41EKCGp#T5?07*qoM6N<$f(V3Pvj6}9

diff --git a/docs/html/ftv2mnode.png b/docs/html/ftv2mnode.png
deleted file mode 100644
index 0b63f6d38c4b9ec907b820192ebe9724ed6eca22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmV<S015wzP)<h;3K|Lk000e1NJLTq000mG000&U1^@s6$*LTD0002JNkl<ZcmeI*
zAx;B97{&1)q=(=LT%h;h3{`DFU=Y+bY0?v5>kw!R34#Lv2LOS^S2tZA31X++9RY}n
zChwn@Z)Wz*WWHH{)HDtJnq&A2hk$<w7_^JU^7%7%0zJH4kA|nU6I?=t2?`YfNxzFd
zLI<~*e?p<IJGcmIw6zLXu+2_Dc6pD@(bhEM-}eIron6S{S?uGdd`*1=UDVom9yVbN
wee?!o*N50y`~~``KBRnn4>b-y(>?@z0iHr41EKCGp#T5?07*qoM6N<$f(V3Pvj6}9

diff --git a/docs/html/ftv2mo.png b/docs/html/ftv2mo.png
deleted file mode 100644
index 4bfb80f76e65815989a9350ad79d8ce45380e2b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq000;O000&U1^@s6+I?Jz00046Nkl<ZcmeI5
zF-!YE7{-5TgV;ia(xE75tRh7h1s4Yw9mGi-9R(-BZ{Vuv+Ns~bkKy9vAUOHw4^l0H
z;vhn+R8WZTU3#TLk~4t}4uN0Z<C44QeV@x+R>${!fXv7NWJ%@%u4(KapRY>T6_x;E
zxE7kt!}Tiw8@d9Sd`rTGum>z#Q14vIm`wm1#-byD1muMi02@YNO5LRF0o!Y{`a!Ya
z{^&p0Su|s705&2QxmqdexG+-zNKL3f@8gTQSJrKByfo+oNJ^-{|Mn||Q5SDwjQVsS
zr1}7o5-QMs>gYIMD>GRw@$lT`z4r-_m{5U#cR{urD_)TOeY)(UD|qZ^&y`I<MO}bY
zM1DoXp5L@y08$YtVAetTpU*h}sc_VBE!)2J+l@1H-O9$B1Bk;^&;UrtDS!>Vijqk~
xs(9-kWFr7E^!lgi8GsFK5kOY_{Xbgf0^etEU%fLevs?fG002ovPDHLkV1nB&vX1}&

diff --git a/docs/html/ftv2node.png b/docs/html/ftv2node.png
deleted file mode 100644
index 63c605bb4c3d941c921a4b6cfa74951e946bcb48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 86
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRr!3HExu9B$%QnH>djv*C{Z|`mdau^P8_z}#X
h?B8GEpdi4(BFDx$je&7RrDQEg&ePS;Wt~$(69Dh@6T1Ka

diff --git a/docs/html/ftv2ns.png b/docs/html/ftv2ns.png
deleted file mode 100644
index 72e3d71c2892d6f00e259facebc88b45f6db2e35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 388
zcmV-~0ek+5P)<h;3K|Lk000e1NJLTq000;O000&U1^@s6+I?Jz0003?Nkl<ZcmeI*
zF-rq66u|L+t)3v*7Dtuhfr4&=4i1XoAcErNY{5mpfQyr$C~lp)>f+++<lv%<gV0Su
z;Xts9AhihMbiTw(q2MLlmD>#cT|!Ck<t5>D&4pnIkeMEUEM*>`*9>+Juji$!h-m<e
zx~SFmmhJ&ubO!SBb?I)z7BJ(W=G@6|RsdYg799X2kQYY)E+#-(J;uu=Bz0}Kq89tx
zHkK#a->W%M^8s9957{3nvbrz^&=u<~TAUrFROkmt%^F~Ez+-c53Lv%iH3d38!Rv?K
zrb&MYAhp;Gf<}wS;9ZZq2@;!uYG;=Z>~GKE^{HD4keu}lnyqhc>kWX^tQn|warJ~h
zT+rtMkdz6aHoN%z(o|&wpu@@OpJnF_z{PA)6(FHw02iHslz^(N{4*+K9)QJHR87wT
iTyp>aXaF{u2lxRou|^4tux6eB0000<MNUMnLSTXyu&sgs

diff --git a/docs/html/ftv2plastnode.png b/docs/html/ftv2plastnode.png
deleted file mode 100644
index c6ee22f937a07d1dbfc27c669d11f8ed13e2f152..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 229
zcmV<B02=>^P)<h;3K|Lk000e1NJLTq000mG000&U1^@s6$*LTD00022Nkl<ZcmeI5
zJq`g;6h;q`*aoFUtJG`64iq|xMyXIs*n>R?RzRoKvklcaQ%HF6%rK2&ZgO(-ihJ_C
zzrK<r3Bb=(0g6xxp!U32tWOu)WH##T0rK!7uo|*cw6RYWr9yxxq2N&i=_#5kSpmd|
z3DT;|QpwOhR&)di$#aNpIVkD_gya#NrE7vMK**;p+$8f1VhPe)Xk`t*OK>gp4jgO(
fd_(yg|3PpEQb#9`a?Pz_00000NkvXXu0mjftR`5K

diff --git a/docs/html/ftv2pnode.png b/docs/html/ftv2pnode.png
deleted file mode 100644
index c6ee22f937a07d1dbfc27c669d11f8ed13e2f152..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 229
zcmV<B02=>^P)<h;3K|Lk000e1NJLTq000mG000&U1^@s6$*LTD00022Nkl<ZcmeI5
zJq`g;6h;q`*aoFUtJG`64iq|xMyXIs*n>R?RzRoKvklcaQ%HF6%rK2&ZgO(-ihJ_C
zzrK<r3Bb=(0g6xxp!U32tWOu)WH##T0rK!7uo|*cw6RYWr9yxxq2N&i=_#5kSpmd|
z3DT;|QpwOhR&)di$#aNpIVkD_gya#NrE7vMK**;p+$8f1VhPe)Xk`t*OK>gp4jgO(
fd_(yg|3PpEQb#9`a?Pz_00000NkvXXu0mjftR`5K

diff --git a/docs/html/ftv2splitbar.png b/docs/html/ftv2splitbar.png
deleted file mode 100644
index fe895f2c58179b471a22d8320b39a4bd7312ec8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^Yzz!63>-{AmhX=Jf(#6djGiuzAr*{o?=JLmPLyc>
z_*`QK&+BH@jW<lVxsx`Ym~nPnqw$O~`M84{XS6<Mm0<Zit<Tk``D^RashfFq{wG<#
zZG2vRxL<$IhkFMSBd@N1`uRtp)t>rYJ7>r6%keRM@)Qyv8R=enp0jiI>aWlGyB58O
zFVR20d+y`K7vDw(hJF3;>dD*3-?v=<8M)@x|E<fHWtM%;-WUJ&>EGLnJsniYK!2U1
Y!`|5biEc?d1`HDhPgg&ebxsLQ02F6;9RL6T

diff --git a/docs/html/ftv2vertline.png b/docs/html/ftv2vertline.png
deleted file mode 100644
index 63c605bb4c3d941c921a4b6cfa74951e946bcb48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 86
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRr!3HExu9B$%QnH>djv*C{Z|`mdau^P8_z}#X
h?B8GEpdi4(BFDx$je&7RrDQEg&ePS;Wt~$(69Dh@6T1Ka

diff --git a/docs/html/index.html b/docs/html/index.html
deleted file mode 100644
index f5d83531b..000000000
--- a/docs/html/index.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Main Page</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('index.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">FlatBuffers Documentation</div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>FlatBuffers is an efficient cross platform serialization library for C++, Java, C#, Go, Python and JavaScript (C, PHP &amp; Ruby in progress). It was originally created at Google for game development and other performance-critical applications.</p>
-<p>It is available as Open Source on <a href="http://github.com/google/flatbuffers">GitHub</a> under the Apache license, v2 (see LICENSE.txt).</p>
-<h2>Why use FlatBuffers?</h2>
-<ul>
-<li><b>Access to serialized data without parsing/unpacking</b> - What sets FlatBuffers apart is that it represents hierarchical data in a flat binary buffer in such a way that it can still be accessed directly without parsing/unpacking, while also still supporting data structure evolution (forwards/backwards compatibility).</li>
-<li><b>Memory efficiency and speed</b> - The only memory needed to access your data is that of the buffer. It requires 0 additional allocations (in C++, other languages may vary). FlatBuffers is also very suitable for use with mmap (or streaming), requiring only part of the buffer to be in memory. Access is close to the speed of raw struct access with only one extra indirection (a kind of vtable) to allow for format evolution and optional fields. It is aimed at projects where spending time and space (many memory allocations) to be able to access or construct serialized data is undesirable, such as in games or any other performance sensitive applications. See the <a href="md__benchmarks.html">benchmarks</a> for details.</li>
-<li><b>Flexible</b> - Optional fields means not only do you get great forwards and backwards compatibility (increasingly important for long-lived games: don't have to update all data with each new version!). It also means you have a lot of choice in what data you write and what data you don't, and how you design data structures.</li>
-<li><b>Tiny code footprint</b> - Small amounts of generated code, and just a single small header as the minimum dependency, which is very easy to integrate. Again, see the benchmark section for details.</li>
-<li><b>Strongly typed</b> - Errors happen at compile time rather than manually having to write repetitive and error prone run-time checks. Useful code can be generated for you.</li>
-<li><p class="startli"><b>Convenient to use</b> - Generated C++ code allows for terse access &amp; construction code. Then there's optional functionality for parsing schemas and JSON-like text representations at runtime efficiently if needed (faster and more memory efficient than other JSON parsers).</p>
-<p class="startli">Java and Go code supports object-reuse. C# has efficient struct based accessors.</p>
-</li>
-<li><b>Cross platform code with no dependencies</b> - C++ code will work with any recent gcc/clang and VS2010. Comes with build files for the tests &amp; samples (Android .mk files, and cmake for all other platforms).</li>
-</ul>
-<h3>Why not use Protocol Buffers, or .. ?</h3>
-<p>Protocol Buffers is indeed relatively similar to FlatBuffers, with the primary difference being that FlatBuffers does not need a parsing/ unpacking step to a secondary representation before you can access data, often coupled with per-object memory allocation. The code is an order of magnitude bigger, too. Protocol Buffers has neither optional text import/export nor schema language features like unions.</p>
-<h3>But all the cool kids use JSON!</h3>
-<p>JSON is very readable (which is why we use it as our optional text format) and very convenient when used together with dynamically typed languages (such as JavaScript). When serializing data from statically typed languages, however, JSON not only has the obvious drawback of runtime inefficiency, but also forces you to write <em>more</em> code to access data (counterintuitively) due to its dynamic-typing serialization system. In this context, it is only a better choice for systems that have very little to no information ahead of time about what data needs to be stored.</p>
-<p>Read more about the "why" of FlatBuffers in the <a href="md__white_paper.html">white paper</a>.</p>
-<h3>Who uses FlatBuffers?</h3>
-<ul>
-<li><a href="http://www.cocos2d-x.org/">Cocos2d-x</a>, the #1 open source mobile game engine, uses it to serialize all their <a href="http://www.cocos2d-x.org/reference/native-cpp/V3.5/d7/d2d/namespaceflatbuffers.html">game data</a>.</li>
-<li><a href="http://facebook.com/">Facebook</a> uses it for client-server communication in their Android app. They have a nice <a href="https://code.facebook.com/posts/872547912839369/improving-facebook-s-performance-on-android-with-flatbuffers/">article</a> explaining how it speeds up loading their posts.</li>
-<li><a href="https://developers.google.com/games/#Tools">Fun Propulsion Labs</a> at Google uses it extensively in all their libraries and games.</li>
-</ul>
-<h2>Usage in brief</h2>
-<p>This section is a quick rundown of how to use this system. Subsequent sections provide a more in-depth usage guide.</p>
-<ul>
-<li>Write a schema file that allows you to define the data structures you may want to serialize. Fields can have a scalar type (ints/floats of all sizes), or they can be a: string; array of any type; reference to yet another object; or, a set of possible objects (unions). Fields are optional and have defaults, so they don't need to be present for every object instance.</li>
-<li>Use <code>flatc</code> (the FlatBuffer compiler) to generate a C++ header (or Java/C#/Go/Python.. classes) with helper classes to access and construct serialized data. This header (say <code>mydata_generated.h</code>) only depends on <code>flatbuffers.h</code>, which defines the core functionality.</li>
-<li>Use the <code>FlatBufferBuilder</code> class to construct a flat binary buffer. The generated functions allow you to add objects to this buffer recursively, often as simply as making a single function call.</li>
-<li>Store or send your buffer somewhere!</li>
-<li>When reading it back, you can obtain the pointer to the root object from the binary buffer, and from there traverse it conveniently in-place with <code>object-&gt;field()</code>.</li>
-</ul>
-<h2>In-depth documentation</h2>
-<ul>
-<li>How to <a href="md__building.html">build the compiler</a> and samples on various platforms.</li>
-<li>How to <a href="md__compiler.html">use the compiler</a>.</li>
-<li>How to <a href="md__schemas.html">write a schema</a>.</li>
-<li>How to <a href="md__cpp_usage.html">use the generated C++ code</a> in your own programs.</li>
-<li>How to <a href="md__java_usage.html">use the generated Java/C# code</a> in your own programs.</li>
-<li>How to <a href="md__go_usage.html">use the generated Go code</a> in your own programs.</li>
-<li><a href="md__support.html">Support matrix</a> for platforms/languages/features.</li>
-<li>Some <a href="md__benchmarks.html">benchmarks</a> showing the advantage of using FlatBuffers.</li>
-<li>A <a href="md__white_paper.html">white paper</a> explaining the "why" of FlatBuffers.</li>
-<li>A description of the <a href="md__internals.html">internals</a> of FlatBuffers.</li>
-<li>A formal <a href="md__grammar.html">grammar</a> of the schema language.</li>
-</ul>
-<h2>Online resources</h2>
-<ul>
-<li><a href="http://github.com/google/flatbuffers">GitHub repository</a></li>
-<li><a href="http://google.github.io/flatbuffers">Landing page</a></li>
-<li><a href="http://group.google.com/group/flatbuffers">FlatBuffers Google Group</a></li>
-<li><a href="http://github.com/google/flatbuffers/issues">FlatBuffers Issues Tracker</a></li>
-<li>Independent implementations &amp; tools:<ul>
-<li><a href="https://github.com/dvidelabs/flatcc">FlatCC</a> Alternative FlatBuffers parser, code generator and runtime all in C.</li>
-</ul>
-</li>
-<li>Videos:<ul>
-<li>Colt's <a href="https://www.youtube.com/watch?v=iQTxMkSJ1dQ">DevByte</a>.</li>
-<li>GDC 2015 <a href="https://www.youtube.com/watch?v=olmL1fUnQAQ">Lightning Talk</a>.</li>
-<li>FlatBuffers for <a href="https://www.youtube.com/watch?v=-BPVId_lA5w">Go</a>.</li>
-<li>Evolution of FlatBuffers <a href="https://www.youtube.com/watch?v=a0QE0xS8rKM">visualization</a>.</li>
-</ul>
-</li>
-<li>Useful documentation created by others:<ul>
-<li><a href="https://rwinslow.com/tags/flatbuffers/">FlatBuffers in Go</a></li>
-<li><a href="http://frogermcs.github.io/flatbuffers-in-android-introdution/">FlatBuffers in Android</a></li>
-<li><a href="http://frogermcs.github.io/json-parsing-with-flatbuffers-in-android/">Parsing JSON to FlatBuffers in Java</a></li>
-<li><a href="http://exiin.com/blog/flatbuffers-for-unity-sample-code/">FlatBuffers in Unity</a> </li>
-</ul>
-</li>
-</ul>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/jquery.js b/docs/html/jquery.js
deleted file mode 100644
index 3db33e62d..000000000
--- a/docs/html/jquery.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.7.1
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Mon Nov 21 21:11:03 2011 -0500
- */
-(function(bb,L){var av=bb.document,bu=bb.navigator,bl=bb.location;var b=(function(){var bF=function(b0,b1){return new bF.fn.init(b0,b1,bD)},bU=bb.jQuery,bH=bb.$,bD,bY=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,bM=/\S/,bI=/^\s+/,bE=/\s+$/,bA=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,bN=/^[\],:{}\s]*$/,bW=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,bP=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,bJ=/(?:^|:|,)(?:\s*\[)+/g,by=/(webkit)[ \/]([\w.]+)/,bR=/(opera)(?:.*version)?[ \/]([\w.]+)/,bQ=/(msie) ([\w.]+)/,bS=/(mozilla)(?:.*? rv:([\w.]+))?/,bB=/-([a-z]|[0-9])/ig,bZ=/^-ms-/,bT=function(b0,b1){return(b1+"").toUpperCase()},bX=bu.userAgent,bV,bC,e,bL=Object.prototype.toString,bG=Object.prototype.hasOwnProperty,bz=Array.prototype.push,bK=Array.prototype.slice,bO=String.prototype.trim,bv=Array.prototype.indexOf,bx={};bF.fn=bF.prototype={constructor:bF,init:function(b0,b4,b3){var b2,b5,b1,b6;if(!b0){return this}if(b0.nodeType){this.context=this[0]=b0;this.length=1;return this}if(b0==="body"&&!b4&&av.body){this.context=av;this[0]=av.body;this.selector=b0;this.length=1;return this}if(typeof b0==="string"){if(b0.charAt(0)==="<"&&b0.charAt(b0.length-1)===">"&&b0.length>=3){b2=[null,b0,null]}else{b2=bY.exec(b0)}if(b2&&(b2[1]||!b4)){if(b2[1]){b4=b4 instanceof bF?b4[0]:b4;b6=(b4?b4.ownerDocument||b4:av);b1=bA.exec(b0);if(b1){if(bF.isPlainObject(b4)){b0=[av.createElement(b1[1])];bF.fn.attr.call(b0,b4,true)}else{b0=[b6.createElement(b1[1])]}}else{b1=bF.buildFragment([b2[1]],[b6]);b0=(b1.cacheable?bF.clone(b1.fragment):b1.fragment).childNodes}return bF.merge(this,b0)}else{b5=av.getElementById(b2[2]);if(b5&&b5.parentNode){if(b5.id!==b2[2]){return b3.find(b0)}this.length=1;this[0]=b5}this.context=av;this.selector=b0;return this}}else{if(!b4||b4.jquery){return(b4||b3).find(b0)}else{return this.constructor(b4).find(b0)}}}else{if(bF.isFunction(b0)){return b3.ready(b0)}}if(b0.selector!==L){this.selector=b0.selector;this.context=b0.context}return bF.makeArray(b0,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return bK.call(this,0)},get:function(b0){return b0==null?this.toArray():(b0<0?this[this.length+b0]:this[b0])},pushStack:function(b1,b3,b0){var b2=this.constructor();if(bF.isArray(b1)){bz.apply(b2,b1)}else{bF.merge(b2,b1)}b2.prevObject=this;b2.context=this.context;if(b3==="find"){b2.selector=this.selector+(this.selector?" ":"")+b0}else{if(b3){b2.selector=this.selector+"."+b3+"("+b0+")"}}return b2},each:function(b1,b0){return bF.each(this,b1,b0)},ready:function(b0){bF.bindReady();bC.add(b0);return this},eq:function(b0){b0=+b0;return b0===-1?this.slice(b0):this.slice(b0,b0+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(bK.apply(this,arguments),"slice",bK.call(arguments).join(","))},map:function(b0){return this.pushStack(bF.map(this,function(b2,b1){return b0.call(b2,b1,b2)}))},end:function(){return this.prevObject||this.constructor(null)},push:bz,sort:[].sort,splice:[].splice};bF.fn.init.prototype=bF.fn;bF.extend=bF.fn.extend=function(){var b9,b2,b0,b1,b6,b7,b5=arguments[0]||{},b4=1,b3=arguments.length,b8=false;if(typeof b5==="boolean"){b8=b5;b5=arguments[1]||{};b4=2}if(typeof b5!=="object"&&!bF.isFunction(b5)){b5={}}if(b3===b4){b5=this;--b4}for(;b4<b3;b4++){if((b9=arguments[b4])!=null){for(b2 in b9){b0=b5[b2];b1=b9[b2];if(b5===b1){continue}if(b8&&b1&&(bF.isPlainObject(b1)||(b6=bF.isArray(b1)))){if(b6){b6=false;b7=b0&&bF.isArray(b0)?b0:[]}else{b7=b0&&bF.isPlainObject(b0)?b0:{}}b5[b2]=bF.extend(b8,b7,b1)}else{if(b1!==L){b5[b2]=b1}}}}}return b5};bF.extend({noConflict:function(b0){if(bb.$===bF){bb.$=bH}if(b0&&bb.jQuery===bF){bb.jQuery=bU}return bF},isReady:false,readyWait:1,holdReady:function(b0){if(b0){bF.readyWait++}else{bF.ready(true)}},ready:function(b0){if((b0===true&&!--bF.readyWait)||(b0!==true&&!bF.isReady)){if(!av.body){return setTimeout(bF.ready,1)}bF.isReady=true;if(b0!==true&&--bF.readyWait>0){return}bC.fireWith(av,[bF]);if(bF.fn.trigger){bF(av).trigger("ready").off("ready")}}},bindReady:function(){if(bC){return}bC=bF.Callbacks("once memory");if(av.readyState==="complete"){return setTimeout(bF.ready,1)}if(av.addEventListener){av.addEventListener("DOMContentLoaded",e,false);bb.addEventListener("load",bF.ready,false)}else{if(av.attachEvent){av.attachEvent("onreadystatechange",e);bb.attachEvent("onload",bF.ready);var b0=false;try{b0=bb.frameElement==null}catch(b1){}if(av.documentElement.doScroll&&b0){bw()}}}},isFunction:function(b0){return bF.type(b0)==="function"},isArray:Array.isArray||function(b0){return bF.type(b0)==="array"},isWindow:function(b0){return b0&&typeof b0==="object"&&"setInterval" in b0},isNumeric:function(b0){return !isNaN(parseFloat(b0))&&isFinite(b0)},type:function(b0){return b0==null?String(b0):bx[bL.call(b0)]||"object"},isPlainObject:function(b2){if(!b2||bF.type(b2)!=="object"||b2.nodeType||bF.isWindow(b2)){return false}try{if(b2.constructor&&!bG.call(b2,"constructor")&&!bG.call(b2.constructor.prototype,"isPrototypeOf")){return false}}catch(b1){return false}var b0;for(b0 in b2){}return b0===L||bG.call(b2,b0)},isEmptyObject:function(b1){for(var b0 in b1){return false}return true},error:function(b0){throw new Error(b0)},parseJSON:function(b0){if(typeof b0!=="string"||!b0){return null}b0=bF.trim(b0);if(bb.JSON&&bb.JSON.parse){return bb.JSON.parse(b0)}if(bN.test(b0.replace(bW,"@").replace(bP,"]").replace(bJ,""))){return(new Function("return "+b0))()}bF.error("Invalid JSON: "+b0)},parseXML:function(b2){var b0,b1;try{if(bb.DOMParser){b1=new DOMParser();b0=b1.parseFromString(b2,"text/xml")}else{b0=new ActiveXObject("Microsoft.XMLDOM");b0.async="false";b0.loadXML(b2)}}catch(b3){b0=L}if(!b0||!b0.documentElement||b0.getElementsByTagName("parsererror").length){bF.error("Invalid XML: "+b2)}return b0},noop:function(){},globalEval:function(b0){if(b0&&bM.test(b0)){(bb.execScript||function(b1){bb["eval"].call(bb,b1)})(b0)}},camelCase:function(b0){return b0.replace(bZ,"ms-").replace(bB,bT)},nodeName:function(b1,b0){return b1.nodeName&&b1.nodeName.toUpperCase()===b0.toUpperCase()},each:function(b3,b6,b2){var b1,b4=0,b5=b3.length,b0=b5===L||bF.isFunction(b3);if(b2){if(b0){for(b1 in b3){if(b6.apply(b3[b1],b2)===false){break}}}else{for(;b4<b5;){if(b6.apply(b3[b4++],b2)===false){break}}}}else{if(b0){for(b1 in b3){if(b6.call(b3[b1],b1,b3[b1])===false){break}}}else{for(;b4<b5;){if(b6.call(b3[b4],b4,b3[b4++])===false){break}}}}return b3},trim:bO?function(b0){return b0==null?"":bO.call(b0)}:function(b0){return b0==null?"":b0.toString().replace(bI,"").replace(bE,"")},makeArray:function(b3,b1){var b0=b1||[];if(b3!=null){var b2=bF.type(b3);if(b3.length==null||b2==="string"||b2==="function"||b2==="regexp"||bF.isWindow(b3)){bz.call(b0,b3)}else{bF.merge(b0,b3)}}return b0},inArray:function(b2,b3,b1){var b0;if(b3){if(bv){return bv.call(b3,b2,b1)}b0=b3.length;b1=b1?b1<0?Math.max(0,b0+b1):b1:0;for(;b1<b0;b1++){if(b1 in b3&&b3[b1]===b2){return b1}}}return -1},merge:function(b4,b2){var b3=b4.length,b1=0;if(typeof b2.length==="number"){for(var b0=b2.length;b1<b0;b1++){b4[b3++]=b2[b1]}}else{while(b2[b1]!==L){b4[b3++]=b2[b1++]}}b4.length=b3;return b4},grep:function(b1,b6,b0){var b2=[],b5;b0=!!b0;for(var b3=0,b4=b1.length;b3<b4;b3++){b5=!!b6(b1[b3],b3);if(b0!==b5){b2.push(b1[b3])}}return b2},map:function(b0,b7,b8){var b5,b6,b4=[],b2=0,b1=b0.length,b3=b0 instanceof bF||b1!==L&&typeof b1==="number"&&((b1>0&&b0[0]&&b0[b1-1])||b1===0||bF.isArray(b0));if(b3){for(;b2<b1;b2++){b5=b7(b0[b2],b2,b8);if(b5!=null){b4[b4.length]=b5}}}else{for(b6 in b0){b5=b7(b0[b6],b6,b8);if(b5!=null){b4[b4.length]=b5}}}return b4.concat.apply([],b4)},guid:1,proxy:function(b4,b3){if(typeof b3==="string"){var b2=b4[b3];b3=b4;b4=b2}if(!bF.isFunction(b4)){return L}var b0=bK.call(arguments,2),b1=function(){return b4.apply(b3,b0.concat(bK.call(arguments)))};b1.guid=b4.guid=b4.guid||b1.guid||bF.guid++;return b1},access:function(b0,b8,b6,b2,b5,b7){var b1=b0.length;if(typeof b8==="object"){for(var b3 in b8){bF.access(b0,b3,b8[b3],b2,b5,b6)}return b0}if(b6!==L){b2=!b7&&b2&&bF.isFunction(b6);for(var b4=0;b4<b1;b4++){b5(b0[b4],b8,b2?b6.call(b0[b4],b4,b5(b0[b4],b8)):b6,b7)}return b0}return b1?b5(b0[0],b8):L},now:function(){return(new Date()).getTime()},uaMatch:function(b1){b1=b1.toLowerCase();var b0=by.exec(b1)||bR.exec(b1)||bQ.exec(b1)||b1.indexOf("compatible")<0&&bS.exec(b1)||[];return{browser:b0[1]||"",version:b0[2]||"0"}},sub:function(){function b0(b3,b4){return new b0.fn.init(b3,b4)}bF.extend(true,b0,this);b0.superclass=this;b0.fn=b0.prototype=this();b0.fn.constructor=b0;b0.sub=this.sub;b0.fn.init=function b2(b3,b4){if(b4&&b4 instanceof bF&&!(b4 instanceof b0)){b4=b0(b4)}return bF.fn.init.call(this,b3,b4,b1)};b0.fn.init.prototype=b0.fn;var b1=b0(av);return b0},browser:{}});bF.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(b1,b0){bx["[object "+b0+"]"]=b0.toLowerCase()});bV=bF.uaMatch(bX);if(bV.browser){bF.browser[bV.browser]=true;bF.browser.version=bV.version}if(bF.browser.webkit){bF.browser.safari=true}if(bM.test("\xA0")){bI=/^[\s\xA0]+/;bE=/[\s\xA0]+$/}bD=bF(av);if(av.addEventListener){e=function(){av.removeEventListener("DOMContentLoaded",e,false);bF.ready()}}else{if(av.attachEvent){e=function(){if(av.readyState==="complete"){av.detachEvent("onreadystatechange",e);bF.ready()}}}}function bw(){if(bF.isReady){return}try{av.documentElement.doScroll("left")}catch(b0){setTimeout(bw,1);return}bF.ready()}return bF})();var a2={};function X(e){var bv=a2[e]={},bw,bx;e=e.split(/\s+/);for(bw=0,bx=e.length;bw<bx;bw++){bv[e[bw]]=true}return bv}b.Callbacks=function(bw){bw=bw?(a2[bw]||X(bw)):{};var bB=[],bC=[],bx,by,bv,bz,bA,bE=function(bF){var bG,bJ,bI,bH,bK;for(bG=0,bJ=bF.length;bG<bJ;bG++){bI=bF[bG];bH=b.type(bI);if(bH==="array"){bE(bI)}else{if(bH==="function"){if(!bw.unique||!bD.has(bI)){bB.push(bI)}}}}},e=function(bG,bF){bF=bF||[];bx=!bw.memory||[bG,bF];by=true;bA=bv||0;bv=0;bz=bB.length;for(;bB&&bA<bz;bA++){if(bB[bA].apply(bG,bF)===false&&bw.stopOnFalse){bx=true;break}}by=false;if(bB){if(!bw.once){if(bC&&bC.length){bx=bC.shift();bD.fireWith(bx[0],bx[1])}}else{if(bx===true){bD.disable()}else{bB=[]}}}},bD={add:function(){if(bB){var bF=bB.length;bE(arguments);if(by){bz=bB.length}else{if(bx&&bx!==true){bv=bF;e(bx[0],bx[1])}}}return this},remove:function(){if(bB){var bF=arguments,bH=0,bI=bF.length;for(;bH<bI;bH++){for(var bG=0;bG<bB.length;bG++){if(bF[bH]===bB[bG]){if(by){if(bG<=bz){bz--;if(bG<=bA){bA--}}}bB.splice(bG--,1);if(bw.unique){break}}}}}return this},has:function(bG){if(bB){var bF=0,bH=bB.length;for(;bF<bH;bF++){if(bG===bB[bF]){return true}}}return false},empty:function(){bB=[];return this},disable:function(){bB=bC=bx=L;return this},disabled:function(){return !bB},lock:function(){bC=L;if(!bx||bx===true){bD.disable()}return this},locked:function(){return !bC},fireWith:function(bG,bF){if(bC){if(by){if(!bw.once){bC.push([bG,bF])}}else{if(!(bw.once&&bx)){e(bG,bF)}}}return this},fire:function(){bD.fireWith(this,arguments);return this},fired:function(){return !!bx}};return bD};var aJ=[].slice;b.extend({Deferred:function(by){var bx=b.Callbacks("once memory"),bw=b.Callbacks("once memory"),bv=b.Callbacks("memory"),e="pending",bA={resolve:bx,reject:bw,notify:bv},bC={done:bx.add,fail:bw.add,progress:bv.add,state:function(){return e},isResolved:bx.fired,isRejected:bw.fired,then:function(bE,bD,bF){bB.done(bE).fail(bD).progress(bF);return this},always:function(){bB.done.apply(bB,arguments).fail.apply(bB,arguments);return this},pipe:function(bF,bE,bD){return b.Deferred(function(bG){b.each({done:[bF,"resolve"],fail:[bE,"reject"],progress:[bD,"notify"]},function(bI,bL){var bH=bL[0],bK=bL[1],bJ;if(b.isFunction(bH)){bB[bI](function(){bJ=bH.apply(this,arguments);if(bJ&&b.isFunction(bJ.promise)){bJ.promise().then(bG.resolve,bG.reject,bG.notify)}else{bG[bK+"With"](this===bB?bG:this,[bJ])}})}else{bB[bI](bG[bK])}})}).promise()},promise:function(bE){if(bE==null){bE=bC}else{for(var bD in bC){bE[bD]=bC[bD]}}return bE}},bB=bC.promise({}),bz;for(bz in bA){bB[bz]=bA[bz].fire;bB[bz+"With"]=bA[bz].fireWith}bB.done(function(){e="resolved"},bw.disable,bv.lock).fail(function(){e="rejected"},bx.disable,bv.lock);if(by){by.call(bB,bB)}return bB},when:function(bA){var bx=aJ.call(arguments,0),bv=0,e=bx.length,bB=new Array(e),bw=e,by=e,bC=e<=1&&bA&&b.isFunction(bA.promise)?bA:b.Deferred(),bE=bC.promise();function bD(bF){return function(bG){bx[bF]=arguments.length>1?aJ.call(arguments,0):bG;if(!(--bw)){bC.resolveWith(bC,bx)}}}function bz(bF){return function(bG){bB[bF]=arguments.length>1?aJ.call(arguments,0):bG;bC.notifyWith(bE,bB)}}if(e>1){for(;bv<e;bv++){if(bx[bv]&&bx[bv].promise&&b.isFunction(bx[bv].promise)){bx[bv].promise().then(bD(bv),bC.reject,bz(bv))
-}else{--bw}}if(!bw){bC.resolveWith(bC,bx)}}else{if(bC!==bA){bC.resolveWith(bC,e?[bA]:[])}}return bE}});b.support=(function(){var bJ,bI,bF,bG,bx,bE,bA,bD,bz,bK,bB,by,bw,bv=av.createElement("div"),bH=av.documentElement;bv.setAttribute("className","t");bv.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";bI=bv.getElementsByTagName("*");bF=bv.getElementsByTagName("a")[0];if(!bI||!bI.length||!bF){return{}}bG=av.createElement("select");bx=bG.appendChild(av.createElement("option"));bE=bv.getElementsByTagName("input")[0];bJ={leadingWhitespace:(bv.firstChild.nodeType===3),tbody:!bv.getElementsByTagName("tbody").length,htmlSerialize:!!bv.getElementsByTagName("link").length,style:/top/.test(bF.getAttribute("style")),hrefNormalized:(bF.getAttribute("href")==="/a"),opacity:/^0.55/.test(bF.style.opacity),cssFloat:!!bF.style.cssFloat,checkOn:(bE.value==="on"),optSelected:bx.selected,getSetAttribute:bv.className!=="t",enctype:!!av.createElement("form").enctype,html5Clone:av.createElement("nav").cloneNode(true).outerHTML!=="<:nav></:nav>",submitBubbles:true,changeBubbles:true,focusinBubbles:false,deleteExpando:true,noCloneEvent:true,inlineBlockNeedsLayout:false,shrinkWrapBlocks:false,reliableMarginRight:true};bE.checked=true;bJ.noCloneChecked=bE.cloneNode(true).checked;bG.disabled=true;bJ.optDisabled=!bx.disabled;try{delete bv.test}catch(bC){bJ.deleteExpando=false}if(!bv.addEventListener&&bv.attachEvent&&bv.fireEvent){bv.attachEvent("onclick",function(){bJ.noCloneEvent=false});bv.cloneNode(true).fireEvent("onclick")}bE=av.createElement("input");bE.value="t";bE.setAttribute("type","radio");bJ.radioValue=bE.value==="t";bE.setAttribute("checked","checked");bv.appendChild(bE);bD=av.createDocumentFragment();bD.appendChild(bv.lastChild);bJ.checkClone=bD.cloneNode(true).cloneNode(true).lastChild.checked;bJ.appendChecked=bE.checked;bD.removeChild(bE);bD.appendChild(bv);bv.innerHTML="";if(bb.getComputedStyle){bA=av.createElement("div");bA.style.width="0";bA.style.marginRight="0";bv.style.width="2px";bv.appendChild(bA);bJ.reliableMarginRight=(parseInt((bb.getComputedStyle(bA,null)||{marginRight:0}).marginRight,10)||0)===0}if(bv.attachEvent){for(by in {submit:1,change:1,focusin:1}){bB="on"+by;bw=(bB in bv);if(!bw){bv.setAttribute(bB,"return;");bw=(typeof bv[bB]==="function")}bJ[by+"Bubbles"]=bw}}bD.removeChild(bv);bD=bG=bx=bA=bv=bE=null;b(function(){var bM,bU,bV,bT,bN,bO,bL,bS,bR,e,bP,bQ=av.getElementsByTagName("body")[0];if(!bQ){return}bL=1;bS="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;";bR="visibility:hidden;border:0;";e="style='"+bS+"border:5px solid #000;padding:0;'";bP="<div "+e+"><div></div></div><table "+e+" cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";bM=av.createElement("div");bM.style.cssText=bR+"width:0;height:0;position:static;top:0;margin-top:"+bL+"px";bQ.insertBefore(bM,bQ.firstChild);bv=av.createElement("div");bM.appendChild(bv);bv.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";bz=bv.getElementsByTagName("td");bw=(bz[0].offsetHeight===0);bz[0].style.display="";bz[1].style.display="none";bJ.reliableHiddenOffsets=bw&&(bz[0].offsetHeight===0);bv.innerHTML="";bv.style.width=bv.style.paddingLeft="1px";b.boxModel=bJ.boxModel=bv.offsetWidth===2;if(typeof bv.style.zoom!=="undefined"){bv.style.display="inline";bv.style.zoom=1;bJ.inlineBlockNeedsLayout=(bv.offsetWidth===2);bv.style.display="";bv.innerHTML="<div style='width:4px;'></div>";bJ.shrinkWrapBlocks=(bv.offsetWidth!==2)}bv.style.cssText=bS+bR;bv.innerHTML=bP;bU=bv.firstChild;bV=bU.firstChild;bN=bU.nextSibling.firstChild.firstChild;bO={doesNotAddBorder:(bV.offsetTop!==5),doesAddBorderForTableAndCells:(bN.offsetTop===5)};bV.style.position="fixed";bV.style.top="20px";bO.fixedPosition=(bV.offsetTop===20||bV.offsetTop===15);bV.style.position=bV.style.top="";bU.style.overflow="hidden";bU.style.position="relative";bO.subtractsBorderForOverflowNotVisible=(bV.offsetTop===-5);bO.doesNotIncludeMarginInBodyOffset=(bQ.offsetTop!==bL);bQ.removeChild(bM);bv=bM=null;b.extend(bJ,bO)});return bJ})();var aS=/^(?:\{.*\}|\[.*\])$/,aA=/([A-Z])/g;b.extend({cache:{},uuid:0,expando:"jQuery"+(b.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:true},hasData:function(e){e=e.nodeType?b.cache[e[b.expando]]:e[b.expando];return !!e&&!S(e)},data:function(bx,bv,bz,by){if(!b.acceptData(bx)){return}var bG,bA,bD,bE=b.expando,bC=typeof bv==="string",bF=bx.nodeType,e=bF?b.cache:bx,bw=bF?bx[bE]:bx[bE]&&bE,bB=bv==="events";if((!bw||!e[bw]||(!bB&&!by&&!e[bw].data))&&bC&&bz===L){return}if(!bw){if(bF){bx[bE]=bw=++b.uuid}else{bw=bE}}if(!e[bw]){e[bw]={};if(!bF){e[bw].toJSON=b.noop}}if(typeof bv==="object"||typeof bv==="function"){if(by){e[bw]=b.extend(e[bw],bv)}else{e[bw].data=b.extend(e[bw].data,bv)}}bG=bA=e[bw];if(!by){if(!bA.data){bA.data={}}bA=bA.data}if(bz!==L){bA[b.camelCase(bv)]=bz}if(bB&&!bA[bv]){return bG.events}if(bC){bD=bA[bv];if(bD==null){bD=bA[b.camelCase(bv)]}}else{bD=bA}return bD},removeData:function(bx,bv,by){if(!b.acceptData(bx)){return}var bB,bA,bz,bC=b.expando,bD=bx.nodeType,e=bD?b.cache:bx,bw=bD?bx[bC]:bC;if(!e[bw]){return}if(bv){bB=by?e[bw]:e[bw].data;if(bB){if(!b.isArray(bv)){if(bv in bB){bv=[bv]}else{bv=b.camelCase(bv);if(bv in bB){bv=[bv]}else{bv=bv.split(" ")}}}for(bA=0,bz=bv.length;bA<bz;bA++){delete bB[bv[bA]]}if(!(by?S:b.isEmptyObject)(bB)){return}}}if(!by){delete e[bw].data;if(!S(e[bw])){return}}if(b.support.deleteExpando||!e.setInterval){delete e[bw]}else{e[bw]=null}if(bD){if(b.support.deleteExpando){delete bx[bC]}else{if(bx.removeAttribute){bx.removeAttribute(bC)}else{bx[bC]=null}}}},_data:function(bv,e,bw){return b.data(bv,e,bw,true)},acceptData:function(bv){if(bv.nodeName){var e=b.noData[bv.nodeName.toLowerCase()];if(e){return !(e===true||bv.getAttribute("classid")!==e)}}return true}});b.fn.extend({data:function(by,bA){var bB,e,bw,bz=null;if(typeof by==="undefined"){if(this.length){bz=b.data(this[0]);if(this[0].nodeType===1&&!b._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var bx=0,bv=e.length;bx<bv;bx++){bw=e[bx].name;if(bw.indexOf("data-")===0){bw=b.camelCase(bw.substring(5));a5(this[0],bw,bz[bw])}}b._data(this[0],"parsedAttrs",true)}}return bz}else{if(typeof by==="object"){return this.each(function(){b.data(this,by)})}}bB=by.split(".");bB[1]=bB[1]?"."+bB[1]:"";if(bA===L){bz=this.triggerHandler("getData"+bB[1]+"!",[bB[0]]);if(bz===L&&this.length){bz=b.data(this[0],by);bz=a5(this[0],by,bz)}return bz===L&&bB[1]?this.data(bB[0]):bz}else{return this.each(function(){var bC=b(this),bD=[bB[0],bA];bC.triggerHandler("setData"+bB[1]+"!",bD);b.data(this,by,bA);bC.triggerHandler("changeData"+bB[1]+"!",bD)})}},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function a5(bx,bw,by){if(by===L&&bx.nodeType===1){var bv="data-"+bw.replace(aA,"-$1").toLowerCase();by=bx.getAttribute(bv);if(typeof by==="string"){try{by=by==="true"?true:by==="false"?false:by==="null"?null:b.isNumeric(by)?parseFloat(by):aS.test(by)?b.parseJSON(by):by}catch(bz){}b.data(bx,bw,by)}else{by=L}}return by}function S(bv){for(var e in bv){if(e==="data"&&b.isEmptyObject(bv[e])){continue}if(e!=="toJSON"){return false}}return true}function bi(by,bx,bA){var bw=bx+"defer",bv=bx+"queue",e=bx+"mark",bz=b._data(by,bw);if(bz&&(bA==="queue"||!b._data(by,bv))&&(bA==="mark"||!b._data(by,e))){setTimeout(function(){if(!b._data(by,bv)&&!b._data(by,e)){b.removeData(by,bw,true);bz.fire()}},0)}}b.extend({_mark:function(bv,e){if(bv){e=(e||"fx")+"mark";b._data(bv,e,(b._data(bv,e)||0)+1)}},_unmark:function(by,bx,bv){if(by!==true){bv=bx;bx=by;by=false}if(bx){bv=bv||"fx";var e=bv+"mark",bw=by?0:((b._data(bx,e)||1)-1);if(bw){b._data(bx,e,bw)}else{b.removeData(bx,e,true);bi(bx,bv,"mark")}}},queue:function(bv,e,bx){var bw;if(bv){e=(e||"fx")+"queue";bw=b._data(bv,e);if(bx){if(!bw||b.isArray(bx)){bw=b._data(bv,e,b.makeArray(bx))}else{bw.push(bx)}}return bw||[]}},dequeue:function(by,bx){bx=bx||"fx";var bv=b.queue(by,bx),bw=bv.shift(),e={};if(bw==="inprogress"){bw=bv.shift()}if(bw){if(bx==="fx"){bv.unshift("inprogress")}b._data(by,bx+".run",e);bw.call(by,function(){b.dequeue(by,bx)},e)}if(!bv.length){b.removeData(by,bx+"queue "+bx+".run",true);bi(by,bx,"queue")}}});b.fn.extend({queue:function(e,bv){if(typeof e!=="string"){bv=e;e="fx"}if(bv===L){return b.queue(this[0],e)}return this.each(function(){var bw=b.queue(this,e,bv);if(e==="fx"&&bw[0]!=="inprogress"){b.dequeue(this,e)}})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(bv,e){bv=b.fx?b.fx.speeds[bv]||bv:bv;e=e||"fx";return this.queue(e,function(bx,bw){var by=setTimeout(bx,bv);bw.stop=function(){clearTimeout(by)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(bD,bw){if(typeof bD!=="string"){bw=bD;bD=L}bD=bD||"fx";var e=b.Deferred(),bv=this,by=bv.length,bB=1,bz=bD+"defer",bA=bD+"queue",bC=bD+"mark",bx;function bE(){if(!(--bB)){e.resolveWith(bv,[bv])}}while(by--){if((bx=b.data(bv[by],bz,L,true)||(b.data(bv[by],bA,L,true)||b.data(bv[by],bC,L,true))&&b.data(bv[by],bz,b.Callbacks("once memory"),true))){bB++;bx.add(bE)}}bE();return e.promise()}});var aP=/[\n\t\r]/g,af=/\s+/,aU=/\r/g,g=/^(?:button|input)$/i,D=/^(?:button|input|object|select|textarea)$/i,l=/^a(?:rea)?$/i,ao=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,F=b.support.getSetAttribute,be,aY,aF;b.fn.extend({attr:function(e,bv){return b.access(this,e,bv,true,b.attr)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,bv){return b.access(this,e,bv,true,b.prop)},removeProp:function(e){e=b.propFix[e]||e;return this.each(function(){try{this[e]=L;delete this[e]}catch(bv){}})},addClass:function(by){var bA,bw,bv,bx,bz,bB,e;if(b.isFunction(by)){return this.each(function(bC){b(this).addClass(by.call(this,bC,this.className))})}if(by&&typeof by==="string"){bA=by.split(af);for(bw=0,bv=this.length;bw<bv;bw++){bx=this[bw];if(bx.nodeType===1){if(!bx.className&&bA.length===1){bx.className=by}else{bz=" "+bx.className+" ";for(bB=0,e=bA.length;bB<e;bB++){if(!~bz.indexOf(" "+bA[bB]+" ")){bz+=bA[bB]+" "}}bx.className=b.trim(bz)}}}}return this},removeClass:function(bz){var bA,bw,bv,by,bx,bB,e;if(b.isFunction(bz)){return this.each(function(bC){b(this).removeClass(bz.call(this,bC,this.className))})}if((bz&&typeof bz==="string")||bz===L){bA=(bz||"").split(af);for(bw=0,bv=this.length;bw<bv;bw++){by=this[bw];if(by.nodeType===1&&by.className){if(bz){bx=(" "+by.className+" ").replace(aP," ");for(bB=0,e=bA.length;bB<e;bB++){bx=bx.replace(" "+bA[bB]+" "," ")}by.className=b.trim(bx)}else{by.className=""}}}}return this},toggleClass:function(bx,bv){var bw=typeof bx,e=typeof bv==="boolean";if(b.isFunction(bx)){return this.each(function(by){b(this).toggleClass(bx.call(this,by,this.className,bv),bv)})}return this.each(function(){if(bw==="string"){var bA,bz=0,by=b(this),bB=bv,bC=bx.split(af);while((bA=bC[bz++])){bB=e?bB:!by.hasClass(bA);by[bB?"addClass":"removeClass"](bA)}}else{if(bw==="undefined"||bw==="boolean"){if(this.className){b._data(this,"__className__",this.className)}this.className=this.className||bx===false?"":b._data(this,"__className__")||""}}})},hasClass:function(e){var bx=" "+e+" ",bw=0,bv=this.length;for(;bw<bv;bw++){if(this[bw].nodeType===1&&(" "+this[bw].className+" ").replace(aP," ").indexOf(bx)>-1){return true}}return false},val:function(bx){var e,bv,by,bw=this[0];if(!arguments.length){if(bw){e=b.valHooks[bw.nodeName.toLowerCase()]||b.valHooks[bw.type];if(e&&"get" in e&&(bv=e.get(bw,"value"))!==L){return bv}bv=bw.value;return typeof bv==="string"?bv.replace(aU,""):bv==null?"":bv}return}by=b.isFunction(bx);return this.each(function(bA){var bz=b(this),bB;if(this.nodeType!==1){return}if(by){bB=bx.call(this,bA,bz.val())}else{bB=bx}if(bB==null){bB=""}else{if(typeof bB==="number"){bB+=""}else{if(b.isArray(bB)){bB=b.map(bB,function(bC){return bC==null?"":bC+""})}}}e=b.valHooks[this.nodeName.toLowerCase()]||b.valHooks[this.type];if(!e||!("set" in e)||e.set(this,bB,"value")===L){this.value=bB}})}});b.extend({valHooks:{option:{get:function(e){var bv=e.attributes.value;return !bv||bv.specified?e.value:e.text}},select:{get:function(e){var bA,bv,bz,bx,by=e.selectedIndex,bB=[],bC=e.options,bw=e.type==="select-one";if(by<0){return null}bv=bw?by:0;bz=bw?by+1:bC.length;for(;bv<bz;bv++){bx=bC[bv];if(bx.selected&&(b.support.optDisabled?!bx.disabled:bx.getAttribute("disabled")===null)&&(!bx.parentNode.disabled||!b.nodeName(bx.parentNode,"optgroup"))){bA=b(bx).val();if(bw){return bA}bB.push(bA)}}if(bw&&!bB.length&&bC.length){return b(bC[by]).val()}return bB},set:function(bv,bw){var e=b.makeArray(bw);b(bv).find("option").each(function(){this.selected=b.inArray(b(this).val(),e)>=0});if(!e.length){bv.selectedIndex=-1}return e}}},attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(bA,bx,bB,bz){var bw,e,by,bv=bA.nodeType;
-if(!bA||bv===3||bv===8||bv===2){return}if(bz&&bx in b.attrFn){return b(bA)[bx](bB)}if(typeof bA.getAttribute==="undefined"){return b.prop(bA,bx,bB)}by=bv!==1||!b.isXMLDoc(bA);if(by){bx=bx.toLowerCase();e=b.attrHooks[bx]||(ao.test(bx)?aY:be)}if(bB!==L){if(bB===null){b.removeAttr(bA,bx);return}else{if(e&&"set" in e&&by&&(bw=e.set(bA,bB,bx))!==L){return bw}else{bA.setAttribute(bx,""+bB);return bB}}}else{if(e&&"get" in e&&by&&(bw=e.get(bA,bx))!==null){return bw}else{bw=bA.getAttribute(bx);return bw===null?L:bw}}},removeAttr:function(bx,bz){var by,bA,bv,e,bw=0;if(bz&&bx.nodeType===1){bA=bz.toLowerCase().split(af);e=bA.length;for(;bw<e;bw++){bv=bA[bw];if(bv){by=b.propFix[bv]||bv;b.attr(bx,bv,"");bx.removeAttribute(F?bv:by);if(ao.test(bv)&&by in bx){bx[by]=false}}}}},attrHooks:{type:{set:function(e,bv){if(g.test(e.nodeName)&&e.parentNode){b.error("type property can't be changed")}else{if(!b.support.radioValue&&bv==="radio"&&b.nodeName(e,"input")){var bw=e.value;e.setAttribute("type",bv);if(bw){e.value=bw}return bv}}}},value:{get:function(bv,e){if(be&&b.nodeName(bv,"button")){return be.get(bv,e)}return e in bv?bv.value:null},set:function(bv,bw,e){if(be&&b.nodeName(bv,"button")){return be.set(bv,bw,e)}bv.value=bw}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(bz,bx,bA){var bw,e,by,bv=bz.nodeType;if(!bz||bv===3||bv===8||bv===2){return}by=bv!==1||!b.isXMLDoc(bz);if(by){bx=b.propFix[bx]||bx;e=b.propHooks[bx]}if(bA!==L){if(e&&"set" in e&&(bw=e.set(bz,bA,bx))!==L){return bw}else{return(bz[bx]=bA)}}else{if(e&&"get" in e&&(bw=e.get(bz,bx))!==null){return bw}else{return bz[bx]}}},propHooks:{tabIndex:{get:function(bv){var e=bv.getAttributeNode("tabindex");return e&&e.specified?parseInt(e.value,10):D.test(bv.nodeName)||l.test(bv.nodeName)&&bv.href?0:L}}}});b.attrHooks.tabindex=b.propHooks.tabIndex;aY={get:function(bv,e){var bx,bw=b.prop(bv,e);return bw===true||typeof bw!=="boolean"&&(bx=bv.getAttributeNode(e))&&bx.nodeValue!==false?e.toLowerCase():L},set:function(bv,bx,e){var bw;if(bx===false){b.removeAttr(bv,e)}else{bw=b.propFix[e]||e;if(bw in bv){bv[bw]=true}bv.setAttribute(e,e.toLowerCase())}return e}};if(!F){aF={name:true,id:true};be=b.valHooks.button={get:function(bw,bv){var e;e=bw.getAttributeNode(bv);return e&&(aF[bv]?e.nodeValue!=="":e.specified)?e.nodeValue:L},set:function(bw,bx,bv){var e=bw.getAttributeNode(bv);if(!e){e=av.createAttribute(bv);bw.setAttributeNode(e)}return(e.nodeValue=bx+"")}};b.attrHooks.tabindex.set=be.set;b.each(["width","height"],function(bv,e){b.attrHooks[e]=b.extend(b.attrHooks[e],{set:function(bw,bx){if(bx===""){bw.setAttribute(e,"auto");return bx}}})});b.attrHooks.contenteditable={get:be.get,set:function(bv,bw,e){if(bw===""){bw="false"}be.set(bv,bw,e)}}}if(!b.support.hrefNormalized){b.each(["href","src","width","height"],function(bv,e){b.attrHooks[e]=b.extend(b.attrHooks[e],{get:function(bx){var bw=bx.getAttribute(e,2);return bw===null?L:bw}})})}if(!b.support.style){b.attrHooks.style={get:function(e){return e.style.cssText.toLowerCase()||L},set:function(e,bv){return(e.style.cssText=""+bv)}}}if(!b.support.optSelected){b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(bv){var e=bv.parentNode;if(e){e.selectedIndex;if(e.parentNode){e.parentNode.selectedIndex}}return null}})}if(!b.support.enctype){b.propFix.enctype="encoding"}if(!b.support.checkOn){b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return e.getAttribute("value")===null?"on":e.value}}})}b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,bv){if(b.isArray(bv)){return(e.checked=b.inArray(b(e).val(),bv)>=0)}}})});var bd=/^(?:textarea|input|select)$/i,n=/^([^\.]*)?(?:\.(.+))?$/,J=/\bhover(\.\S+)?\b/,aO=/^key/,bf=/^(?:mouse|contextmenu)|click/,T=/^(?:focusinfocus|focusoutblur)$/,U=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,Y=function(e){var bv=U.exec(e);if(bv){bv[1]=(bv[1]||"").toLowerCase();bv[3]=bv[3]&&new RegExp("(?:^|\\s)"+bv[3]+"(?:\\s|$)")}return bv},j=function(bw,e){var bv=bw.attributes||{};return((!e[1]||bw.nodeName.toLowerCase()===e[1])&&(!e[2]||(bv.id||{}).value===e[2])&&(!e[3]||e[3].test((bv["class"]||{}).value)))},bt=function(e){return b.event.special.hover?e:e.replace(J,"mouseenter$1 mouseleave$1")};b.event={add:function(bx,bC,bJ,bA,by){var bD,bB,bK,bI,bH,bF,e,bG,bv,bz,bw,bE;if(bx.nodeType===3||bx.nodeType===8||!bC||!bJ||!(bD=b._data(bx))){return}if(bJ.handler){bv=bJ;bJ=bv.handler}if(!bJ.guid){bJ.guid=b.guid++}bK=bD.events;if(!bK){bD.events=bK={}}bB=bD.handle;if(!bB){bD.handle=bB=function(bL){return typeof b!=="undefined"&&(!bL||b.event.triggered!==bL.type)?b.event.dispatch.apply(bB.elem,arguments):L};bB.elem=bx}bC=b.trim(bt(bC)).split(" ");for(bI=0;bI<bC.length;bI++){bH=n.exec(bC[bI])||[];bF=bH[1];e=(bH[2]||"").split(".").sort();bE=b.event.special[bF]||{};bF=(by?bE.delegateType:bE.bindType)||bF;bE=b.event.special[bF]||{};bG=b.extend({type:bF,origType:bH[1],data:bA,handler:bJ,guid:bJ.guid,selector:by,quick:Y(by),namespace:e.join(".")},bv);bw=bK[bF];if(!bw){bw=bK[bF]=[];bw.delegateCount=0;if(!bE.setup||bE.setup.call(bx,bA,e,bB)===false){if(bx.addEventListener){bx.addEventListener(bF,bB,false)}else{if(bx.attachEvent){bx.attachEvent("on"+bF,bB)}}}}if(bE.add){bE.add.call(bx,bG);if(!bG.handler.guid){bG.handler.guid=bJ.guid}}if(by){bw.splice(bw.delegateCount++,0,bG)}else{bw.push(bG)}b.event.global[bF]=true}bx=null},global:{},remove:function(bJ,bE,bv,bH,bB){var bI=b.hasData(bJ)&&b._data(bJ),bF,bx,bz,bL,bC,bA,bG,bw,by,bK,bD,e;if(!bI||!(bw=bI.events)){return}bE=b.trim(bt(bE||"")).split(" ");for(bF=0;bF<bE.length;bF++){bx=n.exec(bE[bF])||[];bz=bL=bx[1];bC=bx[2];if(!bz){for(bz in bw){b.event.remove(bJ,bz+bE[bF],bv,bH,true)}continue}by=b.event.special[bz]||{};bz=(bH?by.delegateType:by.bindType)||bz;bD=bw[bz]||[];bA=bD.length;bC=bC?new RegExp("(^|\\.)"+bC.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(bG=0;bG<bD.length;bG++){e=bD[bG];if((bB||bL===e.origType)&&(!bv||bv.guid===e.guid)&&(!bC||bC.test(e.namespace))&&(!bH||bH===e.selector||bH==="**"&&e.selector)){bD.splice(bG--,1);if(e.selector){bD.delegateCount--}if(by.remove){by.remove.call(bJ,e)}}}if(bD.length===0&&bA!==bD.length){if(!by.teardown||by.teardown.call(bJ,bC)===false){b.removeEvent(bJ,bz,bI.handle)}delete bw[bz]}}if(b.isEmptyObject(bw)){bK=bI.handle;if(bK){bK.elem=null}b.removeData(bJ,["events","handle"],true)}},customEvent:{getData:true,setData:true,changeData:true},trigger:function(bv,bD,bA,bJ){if(bA&&(bA.nodeType===3||bA.nodeType===8)){return}var bG=bv.type||bv,bx=[],e,bw,bC,bH,bz,by,bF,bE,bB,bI;if(T.test(bG+b.event.triggered)){return}if(bG.indexOf("!")>=0){bG=bG.slice(0,-1);bw=true}if(bG.indexOf(".")>=0){bx=bG.split(".");bG=bx.shift();bx.sort()}if((!bA||b.event.customEvent[bG])&&!b.event.global[bG]){return}bv=typeof bv==="object"?bv[b.expando]?bv:new b.Event(bG,bv):new b.Event(bG);bv.type=bG;bv.isTrigger=true;bv.exclusive=bw;bv.namespace=bx.join(".");bv.namespace_re=bv.namespace?new RegExp("(^|\\.)"+bx.join("\\.(?:.*\\.)?")+"(\\.|$)"):null;by=bG.indexOf(":")<0?"on"+bG:"";if(!bA){e=b.cache;for(bC in e){if(e[bC].events&&e[bC].events[bG]){b.event.trigger(bv,bD,e[bC].handle.elem,true)}}return}bv.result=L;if(!bv.target){bv.target=bA}bD=bD!=null?b.makeArray(bD):[];bD.unshift(bv);bF=b.event.special[bG]||{};if(bF.trigger&&bF.trigger.apply(bA,bD)===false){return}bB=[[bA,bF.bindType||bG]];if(!bJ&&!bF.noBubble&&!b.isWindow(bA)){bI=bF.delegateType||bG;bH=T.test(bI+bG)?bA:bA.parentNode;bz=null;for(;bH;bH=bH.parentNode){bB.push([bH,bI]);bz=bH}if(bz&&bz===bA.ownerDocument){bB.push([bz.defaultView||bz.parentWindow||bb,bI])}}for(bC=0;bC<bB.length&&!bv.isPropagationStopped();bC++){bH=bB[bC][0];bv.type=bB[bC][1];bE=(b._data(bH,"events")||{})[bv.type]&&b._data(bH,"handle");if(bE){bE.apply(bH,bD)}bE=by&&bH[by];if(bE&&b.acceptData(bH)&&bE.apply(bH,bD)===false){bv.preventDefault()}}bv.type=bG;if(!bJ&&!bv.isDefaultPrevented()){if((!bF._default||bF._default.apply(bA.ownerDocument,bD)===false)&&!(bG==="click"&&b.nodeName(bA,"a"))&&b.acceptData(bA)){if(by&&bA[bG]&&((bG!=="focus"&&bG!=="blur")||bv.target.offsetWidth!==0)&&!b.isWindow(bA)){bz=bA[by];if(bz){bA[by]=null}b.event.triggered=bG;bA[bG]();b.event.triggered=L;if(bz){bA[by]=bz}}}}return bv.result},dispatch:function(e){e=b.event.fix(e||bb.event);var bz=((b._data(this,"events")||{})[e.type]||[]),bA=bz.delegateCount,bG=[].slice.call(arguments,0),by=!e.exclusive&&!e.namespace,bH=[],bC,bB,bK,bx,bF,bE,bv,bD,bI,bw,bJ;bG[0]=e;e.delegateTarget=this;if(bA&&!e.target.disabled&&!(e.button&&e.type==="click")){bx=b(this);bx.context=this.ownerDocument||this;for(bK=e.target;bK!=this;bK=bK.parentNode||this){bE={};bD=[];bx[0]=bK;for(bC=0;bC<bA;bC++){bI=bz[bC];bw=bI.selector;if(bE[bw]===L){bE[bw]=(bI.quick?j(bK,bI.quick):bx.is(bw))}if(bE[bw]){bD.push(bI)}}if(bD.length){bH.push({elem:bK,matches:bD})}}}if(bz.length>bA){bH.push({elem:this,matches:bz.slice(bA)})}for(bC=0;bC<bH.length&&!e.isPropagationStopped();bC++){bv=bH[bC];e.currentTarget=bv.elem;for(bB=0;bB<bv.matches.length&&!e.isImmediatePropagationStopped();bB++){bI=bv.matches[bB];if(by||(!e.namespace&&!bI.namespace)||e.namespace_re&&e.namespace_re.test(bI.namespace)){e.data=bI.data;e.handleObj=bI;bF=((b.event.special[bI.origType]||{}).handle||bI.handler).apply(bv.elem,bG);if(bF!==L){e.result=bF;if(bF===false){e.preventDefault();e.stopPropagation()}}}}}return e.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(bv,e){if(bv.which==null){bv.which=e.charCode!=null?e.charCode:e.keyCode}return bv}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(bx,bw){var by,bz,e,bv=bw.button,bA=bw.fromElement;if(bx.pageX==null&&bw.clientX!=null){by=bx.target.ownerDocument||av;bz=by.documentElement;e=by.body;bx.pageX=bw.clientX+(bz&&bz.scrollLeft||e&&e.scrollLeft||0)-(bz&&bz.clientLeft||e&&e.clientLeft||0);bx.pageY=bw.clientY+(bz&&bz.scrollTop||e&&e.scrollTop||0)-(bz&&bz.clientTop||e&&e.clientTop||0)}if(!bx.relatedTarget&&bA){bx.relatedTarget=bA===bx.target?bw.toElement:bA}if(!bx.which&&bv!==L){bx.which=(bv&1?1:(bv&2?3:(bv&4?2:0)))}return bx}},fix:function(bw){if(bw[b.expando]){return bw}var bv,bz,e=bw,bx=b.event.fixHooks[bw.type]||{},by=bx.props?this.props.concat(bx.props):this.props;bw=b.Event(e);for(bv=by.length;bv;){bz=by[--bv];bw[bz]=e[bz]}if(!bw.target){bw.target=e.srcElement||av}if(bw.target.nodeType===3){bw.target=bw.target.parentNode}if(bw.metaKey===L){bw.metaKey=bw.ctrlKey}return bx.filter?bx.filter(bw,e):bw},special:{ready:{setup:b.bindReady},load:{noBubble:true},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(bw,bv,e){if(b.isWindow(this)){this.onbeforeunload=e}},teardown:function(bv,e){if(this.onbeforeunload===e){this.onbeforeunload=null}}}},simulate:function(bw,by,bx,bv){var bz=b.extend(new b.Event(),bx,{type:bw,isSimulated:true,originalEvent:{}});if(bv){b.event.trigger(bz,null,by)}else{b.event.dispatch.call(by,bz)}if(bz.isDefaultPrevented()){bx.preventDefault()}}};b.event.handle=b.event.dispatch;b.removeEvent=av.removeEventListener?function(bv,e,bw){if(bv.removeEventListener){bv.removeEventListener(e,bw,false)}}:function(bv,e,bw){if(bv.detachEvent){bv.detachEvent("on"+e,bw)}};b.Event=function(bv,e){if(!(this instanceof b.Event)){return new b.Event(bv,e)}if(bv&&bv.type){this.originalEvent=bv;this.type=bv.type;this.isDefaultPrevented=(bv.defaultPrevented||bv.returnValue===false||bv.getPreventDefault&&bv.getPreventDefault())?i:bk}else{this.type=bv}if(e){b.extend(this,e)}this.timeStamp=bv&&bv.timeStamp||b.now();this[b.expando]=true};function bk(){return false}function i(){return true}b.Event.prototype={preventDefault:function(){this.isDefaultPrevented=i;var bv=this.originalEvent;if(!bv){return}if(bv.preventDefault){bv.preventDefault()}else{bv.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=i;var bv=this.originalEvent;if(!bv){return}if(bv.stopPropagation){bv.stopPropagation()}bv.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=i;this.stopPropagation()},isDefaultPrevented:bk,isPropagationStopped:bk,isImmediatePropagationStopped:bk};b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(bv,e){b.event.special[bv]={delegateType:e,bindType:e,handle:function(bz){var bB=this,bA=bz.relatedTarget,by=bz.handleObj,bw=by.selector,bx;if(!bA||(bA!==bB&&!b.contains(bB,bA))){bz.type=by.origType;bx=by.handler.apply(this,arguments);bz.type=e}return bx}}});if(!b.support.submitBubbles){b.event.special.submit={setup:function(){if(b.nodeName(this,"form")){return false
-}b.event.add(this,"click._submit keypress._submit",function(bx){var bw=bx.target,bv=b.nodeName(bw,"input")||b.nodeName(bw,"button")?bw.form:L;if(bv&&!bv._submit_attached){b.event.add(bv,"submit._submit",function(e){if(this.parentNode&&!e.isTrigger){b.event.simulate("submit",this.parentNode,e,true)}});bv._submit_attached=true}})},teardown:function(){if(b.nodeName(this,"form")){return false}b.event.remove(this,"._submit")}}}if(!b.support.changeBubbles){b.event.special.change={setup:function(){if(bd.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio"){b.event.add(this,"propertychange._change",function(e){if(e.originalEvent.propertyName==="checked"){this._just_changed=true}});b.event.add(this,"click._change",function(e){if(this._just_changed&&!e.isTrigger){this._just_changed=false;b.event.simulate("change",this,e,true)}})}return false}b.event.add(this,"beforeactivate._change",function(bw){var bv=bw.target;if(bd.test(bv.nodeName)&&!bv._change_attached){b.event.add(bv,"change._change",function(e){if(this.parentNode&&!e.isSimulated&&!e.isTrigger){b.event.simulate("change",this.parentNode,e,true)}});bv._change_attached=true}})},handle:function(bv){var e=bv.target;if(this!==e||bv.isSimulated||bv.isTrigger||(e.type!=="radio"&&e.type!=="checkbox")){return bv.handleObj.handler.apply(this,arguments)}},teardown:function(){b.event.remove(this,"._change");return bd.test(this.nodeName)}}}if(!b.support.focusinBubbles){b.each({focus:"focusin",blur:"focusout"},function(bx,e){var bv=0,bw=function(by){b.event.simulate(e,by.target,b.event.fix(by),true)};b.event.special[e]={setup:function(){if(bv++===0){av.addEventListener(bx,bw,true)}},teardown:function(){if(--bv===0){av.removeEventListener(bx,bw,true)}}}})}b.fn.extend({on:function(bw,e,bz,by,bv){var bA,bx;if(typeof bw==="object"){if(typeof e!=="string"){bz=e;e=L}for(bx in bw){this.on(bx,e,bz,bw[bx],bv)}return this}if(bz==null&&by==null){by=e;bz=e=L}else{if(by==null){if(typeof e==="string"){by=bz;bz=L}else{by=bz;bz=e;e=L}}}if(by===false){by=bk}else{if(!by){return this}}if(bv===1){bA=by;by=function(bB){b().off(bB);return bA.apply(this,arguments)};by.guid=bA.guid||(bA.guid=b.guid++)}return this.each(function(){b.event.add(this,bw,by,bz,e)})},one:function(bv,e,bx,bw){return this.on.call(this,bv,e,bx,bw,1)},off:function(bw,e,by){if(bw&&bw.preventDefault&&bw.handleObj){var bv=bw.handleObj;b(bw.delegateTarget).off(bv.namespace?bv.type+"."+bv.namespace:bv.type,bv.selector,bv.handler);return this}if(typeof bw==="object"){for(var bx in bw){this.off(bx,e,bw[bx])}return this}if(e===false||typeof e==="function"){by=e;e=L}if(by===false){by=bk}return this.each(function(){b.event.remove(this,bw,by,e)})},bind:function(e,bw,bv){return this.on(e,null,bw,bv)},unbind:function(e,bv){return this.off(e,null,bv)},live:function(e,bw,bv){b(this.context).on(e,this.selector,bw,bv);return this},die:function(e,bv){b(this.context).off(e,this.selector||"**",bv);return this},delegate:function(e,bv,bx,bw){return this.on(bv,e,bx,bw)},undelegate:function(e,bv,bw){return arguments.length==1?this.off(e,"**"):this.off(bv,e,bw)},trigger:function(e,bv){return this.each(function(){b.event.trigger(e,bv,this)})},triggerHandler:function(e,bv){if(this[0]){return b.event.trigger(e,bv,this[0],true)}},toggle:function(bx){var bv=arguments,e=bx.guid||b.guid++,bw=0,by=function(bz){var bA=(b._data(this,"lastToggle"+bx.guid)||0)%bw;b._data(this,"lastToggle"+bx.guid,bA+1);bz.preventDefault();return bv[bA].apply(this,arguments)||false};by.guid=e;while(bw<bv.length){bv[bw++].guid=e}return this.click(by)},hover:function(e,bv){return this.mouseenter(e).mouseleave(bv||e)}});b.each(("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu").split(" "),function(bv,e){b.fn[e]=function(bx,bw){if(bw==null){bw=bx;bx=null}return arguments.length>0?this.on(e,null,bx,bw):this.trigger(e)};if(b.attrFn){b.attrFn[e]=true}if(aO.test(e)){b.event.fixHooks[e]=b.event.keyHooks}if(bf.test(e)){b.event.fixHooks[e]=b.event.mouseHooks}});
-/*!
- * Sizzle CSS Selector Engine
- *  Copyright 2011, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){var bH=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,bC="sizcache"+(Math.random()+"").replace(".",""),bI=0,bL=Object.prototype.toString,bB=false,bA=true,bK=/\\/g,bO=/\r\n/g,bQ=/\W/;[0,0].sort(function(){bA=false;return 0});var by=function(bV,e,bY,bZ){bY=bY||[];e=e||av;var b1=e;if(e.nodeType!==1&&e.nodeType!==9){return[]}if(!bV||typeof bV!=="string"){return bY}var bS,b3,b6,bR,b2,b5,b4,bX,bU=true,bT=by.isXML(e),bW=[],b0=bV;do{bH.exec("");bS=bH.exec(b0);if(bS){b0=bS[3];bW.push(bS[1]);if(bS[2]){bR=bS[3];break}}}while(bS);if(bW.length>1&&bD.exec(bV)){if(bW.length===2&&bE.relative[bW[0]]){b3=bM(bW[0]+bW[1],e,bZ)}else{b3=bE.relative[bW[0]]?[e]:by(bW.shift(),e);while(bW.length){bV=bW.shift();if(bE.relative[bV]){bV+=bW.shift()}b3=bM(bV,b3,bZ)}}}else{if(!bZ&&bW.length>1&&e.nodeType===9&&!bT&&bE.match.ID.test(bW[0])&&!bE.match.ID.test(bW[bW.length-1])){b2=by.find(bW.shift(),e,bT);e=b2.expr?by.filter(b2.expr,b2.set)[0]:b2.set[0]}if(e){b2=bZ?{expr:bW.pop(),set:bF(bZ)}:by.find(bW.pop(),bW.length===1&&(bW[0]==="~"||bW[0]==="+")&&e.parentNode?e.parentNode:e,bT);b3=b2.expr?by.filter(b2.expr,b2.set):b2.set;if(bW.length>0){b6=bF(b3)}else{bU=false}while(bW.length){b5=bW.pop();b4=b5;if(!bE.relative[b5]){b5=""}else{b4=bW.pop()}if(b4==null){b4=e}bE.relative[b5](b6,b4,bT)}}else{b6=bW=[]}}if(!b6){b6=b3}if(!b6){by.error(b5||bV)}if(bL.call(b6)==="[object Array]"){if(!bU){bY.push.apply(bY,b6)}else{if(e&&e.nodeType===1){for(bX=0;b6[bX]!=null;bX++){if(b6[bX]&&(b6[bX]===true||b6[bX].nodeType===1&&by.contains(e,b6[bX]))){bY.push(b3[bX])}}}else{for(bX=0;b6[bX]!=null;bX++){if(b6[bX]&&b6[bX].nodeType===1){bY.push(b3[bX])}}}}}else{bF(b6,bY)}if(bR){by(bR,b1,bY,bZ);by.uniqueSort(bY)}return bY};by.uniqueSort=function(bR){if(bJ){bB=bA;bR.sort(bJ);if(bB){for(var e=1;e<bR.length;e++){if(bR[e]===bR[e-1]){bR.splice(e--,1)}}}}return bR};by.matches=function(e,bR){return by(e,null,null,bR)};by.matchesSelector=function(e,bR){return by(bR,null,null,[e]).length>0};by.find=function(bX,e,bY){var bW,bS,bU,bT,bV,bR;if(!bX){return[]}for(bS=0,bU=bE.order.length;bS<bU;bS++){bV=bE.order[bS];if((bT=bE.leftMatch[bV].exec(bX))){bR=bT[1];bT.splice(1,1);if(bR.substr(bR.length-1)!=="\\"){bT[1]=(bT[1]||"").replace(bK,"");bW=bE.find[bV](bT,e,bY);if(bW!=null){bX=bX.replace(bE.match[bV],"");break}}}}if(!bW){bW=typeof e.getElementsByTagName!=="undefined"?e.getElementsByTagName("*"):[]}return{set:bW,expr:bX}};by.filter=function(b1,b0,b4,bU){var bW,e,bZ,b6,b3,bR,bT,bV,b2,bS=b1,b5=[],bY=b0,bX=b0&&b0[0]&&by.isXML(b0[0]);while(b1&&b0.length){for(bZ in bE.filter){if((bW=bE.leftMatch[bZ].exec(b1))!=null&&bW[2]){bR=bE.filter[bZ];bT=bW[1];e=false;bW.splice(1,1);if(bT.substr(bT.length-1)==="\\"){continue}if(bY===b5){b5=[]}if(bE.preFilter[bZ]){bW=bE.preFilter[bZ](bW,bY,b4,b5,bU,bX);if(!bW){e=b6=true}else{if(bW===true){continue}}}if(bW){for(bV=0;(b3=bY[bV])!=null;bV++){if(b3){b6=bR(b3,bW,bV,bY);b2=bU^b6;if(b4&&b6!=null){if(b2){e=true}else{bY[bV]=false}}else{if(b2){b5.push(b3);e=true}}}}}if(b6!==L){if(!b4){bY=b5}b1=b1.replace(bE.match[bZ],"");if(!e){return[]}break}}}if(b1===bS){if(e==null){by.error(b1)}else{break}}bS=b1}return bY};by.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)};var bw=by.getText=function(bU){var bS,bT,e=bU.nodeType,bR="";if(e){if(e===1||e===9){if(typeof bU.textContent==="string"){return bU.textContent}else{if(typeof bU.innerText==="string"){return bU.innerText.replace(bO,"")}else{for(bU=bU.firstChild;bU;bU=bU.nextSibling){bR+=bw(bU)}}}}else{if(e===3||e===4){return bU.nodeValue}}}else{for(bS=0;(bT=bU[bS]);bS++){if(bT.nodeType!==8){bR+=bw(bT)}}}return bR};var bE=by.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")},type:function(e){return e.getAttribute("type")}},relative:{"+":function(bW,bR){var bT=typeof bR==="string",bV=bT&&!bQ.test(bR),bX=bT&&!bV;if(bV){bR=bR.toLowerCase()}for(var bS=0,e=bW.length,bU;bS<e;bS++){if((bU=bW[bS])){while((bU=bU.previousSibling)&&bU.nodeType!==1){}bW[bS]=bX||bU&&bU.nodeName.toLowerCase()===bR?bU||false:bU===bR}}if(bX){by.filter(bR,bW,true)}},">":function(bW,bR){var bV,bU=typeof bR==="string",bS=0,e=bW.length;if(bU&&!bQ.test(bR)){bR=bR.toLowerCase();for(;bS<e;bS++){bV=bW[bS];if(bV){var bT=bV.parentNode;bW[bS]=bT.nodeName.toLowerCase()===bR?bT:false}}}else{for(;bS<e;bS++){bV=bW[bS];if(bV){bW[bS]=bU?bV.parentNode:bV.parentNode===bR}}if(bU){by.filter(bR,bW,true)}}},"":function(bT,bR,bV){var bU,bS=bI++,e=bN;if(typeof bR==="string"&&!bQ.test(bR)){bR=bR.toLowerCase();bU=bR;e=bv}e("parentNode",bR,bS,bT,bU,bV)},"~":function(bT,bR,bV){var bU,bS=bI++,e=bN;if(typeof bR==="string"&&!bQ.test(bR)){bR=bR.toLowerCase();bU=bR;e=bv}e("previousSibling",bR,bS,bT,bU,bV)}},find:{ID:function(bR,bS,bT){if(typeof bS.getElementById!=="undefined"&&!bT){var e=bS.getElementById(bR[1]);return e&&e.parentNode?[e]:[]}},NAME:function(bS,bV){if(typeof bV.getElementsByName!=="undefined"){var bR=[],bU=bV.getElementsByName(bS[1]);for(var bT=0,e=bU.length;bT<e;bT++){if(bU[bT].getAttribute("name")===bS[1]){bR.push(bU[bT])}}return bR.length===0?null:bR}},TAG:function(e,bR){if(typeof bR.getElementsByTagName!=="undefined"){return bR.getElementsByTagName(e[1])}}},preFilter:{CLASS:function(bT,bR,bS,e,bW,bX){bT=" "+bT[1].replace(bK,"")+" ";if(bX){return bT}for(var bU=0,bV;(bV=bR[bU])!=null;bU++){if(bV){if(bW^(bV.className&&(" "+bV.className+" ").replace(/[\t\n\r]/g," ").indexOf(bT)>=0)){if(!bS){e.push(bV)}}else{if(bS){bR[bU]=false}}}}return false},ID:function(e){return e[1].replace(bK,"")},TAG:function(bR,e){return bR[1].replace(bK,"").toLowerCase()},CHILD:function(e){if(e[1]==="nth"){if(!e[2]){by.error(e[0])}e[2]=e[2].replace(/^\+|\s*/g,"");var bR=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(e[2]==="even"&&"2n"||e[2]==="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(bR[1]+(bR[2]||1))-0;e[3]=bR[3]-0}else{if(e[2]){by.error(e[0])}}e[0]=bI++;return e},ATTR:function(bU,bR,bS,e,bV,bW){var bT=bU[1]=bU[1].replace(bK,"");if(!bW&&bE.attrMap[bT]){bU[1]=bE.attrMap[bT]}bU[4]=(bU[4]||bU[5]||"").replace(bK,"");if(bU[2]==="~="){bU[4]=" "+bU[4]+" "}return bU},PSEUDO:function(bU,bR,bS,e,bV){if(bU[1]==="not"){if((bH.exec(bU[3])||"").length>1||/^\w/.test(bU[3])){bU[3]=by(bU[3],null,null,bR)}else{var bT=by.filter(bU[3],bR,bS,true^bV);if(!bS){e.push.apply(e,bT)}return false}}else{if(bE.match.POS.test(bU[0])||bE.match.CHILD.test(bU[0])){return true}}return bU},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){if(e.parentNode){e.parentNode.selectedIndex}return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(bS,bR,e){return !!by(e[3],bS).length},header:function(e){return(/h\d/i).test(e.nodeName)},text:function(bS){var e=bS.getAttribute("type"),bR=bS.type;return bS.nodeName.toLowerCase()==="input"&&"text"===bR&&(e===bR||e===null)},radio:function(e){return e.nodeName.toLowerCase()==="input"&&"radio"===e.type},checkbox:function(e){return e.nodeName.toLowerCase()==="input"&&"checkbox"===e.type},file:function(e){return e.nodeName.toLowerCase()==="input"&&"file"===e.type},password:function(e){return e.nodeName.toLowerCase()==="input"&&"password"===e.type},submit:function(bR){var e=bR.nodeName.toLowerCase();return(e==="input"||e==="button")&&"submit"===bR.type},image:function(e){return e.nodeName.toLowerCase()==="input"&&"image"===e.type},reset:function(bR){var e=bR.nodeName.toLowerCase();return(e==="input"||e==="button")&&"reset"===bR.type},button:function(bR){var e=bR.nodeName.toLowerCase();return e==="input"&&"button"===bR.type||e==="button"},input:function(e){return(/input|select|textarea|button/i).test(e.nodeName)},focus:function(e){return e===e.ownerDocument.activeElement}},setFilters:{first:function(bR,e){return e===0},last:function(bS,bR,e,bT){return bR===bT.length-1},even:function(bR,e){return e%2===0},odd:function(bR,e){return e%2===1
-},lt:function(bS,bR,e){return bR<e[3]-0},gt:function(bS,bR,e){return bR>e[3]-0},nth:function(bS,bR,e){return e[3]-0===bR},eq:function(bS,bR,e){return e[3]-0===bR}},filter:{PSEUDO:function(bS,bX,bW,bY){var e=bX[1],bR=bE.filters[e];if(bR){return bR(bS,bW,bX,bY)}else{if(e==="contains"){return(bS.textContent||bS.innerText||bw([bS])||"").indexOf(bX[3])>=0}else{if(e==="not"){var bT=bX[3];for(var bV=0,bU=bT.length;bV<bU;bV++){if(bT[bV]===bS){return false}}return true}else{by.error(e)}}}},CHILD:function(bS,bU){var bT,b0,bW,bZ,e,bV,bY,bX=bU[1],bR=bS;switch(bX){case"only":case"first":while((bR=bR.previousSibling)){if(bR.nodeType===1){return false}}if(bX==="first"){return true}bR=bS;case"last":while((bR=bR.nextSibling)){if(bR.nodeType===1){return false}}return true;case"nth":bT=bU[2];b0=bU[3];if(bT===1&&b0===0){return true}bW=bU[0];bZ=bS.parentNode;if(bZ&&(bZ[bC]!==bW||!bS.nodeIndex)){bV=0;for(bR=bZ.firstChild;bR;bR=bR.nextSibling){if(bR.nodeType===1){bR.nodeIndex=++bV}}bZ[bC]=bW}bY=bS.nodeIndex-b0;if(bT===0){return bY===0}else{return(bY%bT===0&&bY/bT>=0)}}},ID:function(bR,e){return bR.nodeType===1&&bR.getAttribute("id")===e},TAG:function(bR,e){return(e==="*"&&bR.nodeType===1)||!!bR.nodeName&&bR.nodeName.toLowerCase()===e},CLASS:function(bR,e){return(" "+(bR.className||bR.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(bV,bT){var bS=bT[1],e=by.attr?by.attr(bV,bS):bE.attrHandle[bS]?bE.attrHandle[bS](bV):bV[bS]!=null?bV[bS]:bV.getAttribute(bS),bW=e+"",bU=bT[2],bR=bT[4];return e==null?bU==="!=":!bU&&by.attr?e!=null:bU==="="?bW===bR:bU==="*="?bW.indexOf(bR)>=0:bU==="~="?(" "+bW+" ").indexOf(bR)>=0:!bR?bW&&e!==false:bU==="!="?bW!==bR:bU==="^="?bW.indexOf(bR)===0:bU==="$="?bW.substr(bW.length-bR.length)===bR:bU==="|="?bW===bR||bW.substr(0,bR.length+1)===bR+"-":false},POS:function(bU,bR,bS,bV){var e=bR[2],bT=bE.setFilters[e];if(bT){return bT(bU,bS,bR,bV)}}}};var bD=bE.match.POS,bx=function(bR,e){return"\\"+(e-0+1)};for(var bz in bE.match){bE.match[bz]=new RegExp(bE.match[bz].source+(/(?![^\[]*\])(?![^\(]*\))/.source));bE.leftMatch[bz]=new RegExp(/(^(?:.|\r|\n)*?)/.source+bE.match[bz].source.replace(/\\(\d+)/g,bx))}var bF=function(bR,e){bR=Array.prototype.slice.call(bR,0);if(e){e.push.apply(e,bR);return e}return bR};try{Array.prototype.slice.call(av.documentElement.childNodes,0)[0].nodeType}catch(bP){bF=function(bU,bT){var bS=0,bR=bT||[];if(bL.call(bU)==="[object Array]"){Array.prototype.push.apply(bR,bU)}else{if(typeof bU.length==="number"){for(var e=bU.length;bS<e;bS++){bR.push(bU[bS])}}else{for(;bU[bS];bS++){bR.push(bU[bS])}}}return bR}}var bJ,bG;if(av.documentElement.compareDocumentPosition){bJ=function(bR,e){if(bR===e){bB=true;return 0}if(!bR.compareDocumentPosition||!e.compareDocumentPosition){return bR.compareDocumentPosition?-1:1}return bR.compareDocumentPosition(e)&4?-1:1}}else{bJ=function(bY,bX){if(bY===bX){bB=true;return 0}else{if(bY.sourceIndex&&bX.sourceIndex){return bY.sourceIndex-bX.sourceIndex}}var bV,bR,bS=[],e=[],bU=bY.parentNode,bW=bX.parentNode,bZ=bU;if(bU===bW){return bG(bY,bX)}else{if(!bU){return -1}else{if(!bW){return 1}}}while(bZ){bS.unshift(bZ);bZ=bZ.parentNode}bZ=bW;while(bZ){e.unshift(bZ);bZ=bZ.parentNode}bV=bS.length;bR=e.length;for(var bT=0;bT<bV&&bT<bR;bT++){if(bS[bT]!==e[bT]){return bG(bS[bT],e[bT])}}return bT===bV?bG(bY,e[bT],-1):bG(bS[bT],bX,1)};bG=function(bR,e,bS){if(bR===e){return bS}var bT=bR.nextSibling;while(bT){if(bT===e){return -1}bT=bT.nextSibling}return 1}}(function(){var bR=av.createElement("div"),bS="script"+(new Date()).getTime(),e=av.documentElement;bR.innerHTML="<a name='"+bS+"'/>";e.insertBefore(bR,e.firstChild);if(av.getElementById(bS)){bE.find.ID=function(bU,bV,bW){if(typeof bV.getElementById!=="undefined"&&!bW){var bT=bV.getElementById(bU[1]);return bT?bT.id===bU[1]||typeof bT.getAttributeNode!=="undefined"&&bT.getAttributeNode("id").nodeValue===bU[1]?[bT]:L:[]}};bE.filter.ID=function(bV,bT){var bU=typeof bV.getAttributeNode!=="undefined"&&bV.getAttributeNode("id");return bV.nodeType===1&&bU&&bU.nodeValue===bT}}e.removeChild(bR);e=bR=null})();(function(){var e=av.createElement("div");e.appendChild(av.createComment(""));if(e.getElementsByTagName("*").length>0){bE.find.TAG=function(bR,bV){var bU=bV.getElementsByTagName(bR[1]);if(bR[1]==="*"){var bT=[];for(var bS=0;bU[bS];bS++){if(bU[bS].nodeType===1){bT.push(bU[bS])}}bU=bT}return bU}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){bE.attrHandle.href=function(bR){return bR.getAttribute("href",2)}}e=null})();if(av.querySelectorAll){(function(){var e=by,bT=av.createElement("div"),bS="__sizzle__";bT.innerHTML="<p class='TEST'></p>";if(bT.querySelectorAll&&bT.querySelectorAll(".TEST").length===0){return}by=function(b4,bV,bZ,b3){bV=bV||av;if(!b3&&!by.isXML(bV)){var b2=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b4);if(b2&&(bV.nodeType===1||bV.nodeType===9)){if(b2[1]){return bF(bV.getElementsByTagName(b4),bZ)}else{if(b2[2]&&bE.find.CLASS&&bV.getElementsByClassName){return bF(bV.getElementsByClassName(b2[2]),bZ)}}}if(bV.nodeType===9){if(b4==="body"&&bV.body){return bF([bV.body],bZ)}else{if(b2&&b2[3]){var bY=bV.getElementById(b2[3]);if(bY&&bY.parentNode){if(bY.id===b2[3]){return bF([bY],bZ)}}else{return bF([],bZ)}}}try{return bF(bV.querySelectorAll(b4),bZ)}catch(b0){}}else{if(bV.nodeType===1&&bV.nodeName.toLowerCase()!=="object"){var bW=bV,bX=bV.getAttribute("id"),bU=bX||bS,b6=bV.parentNode,b5=/^\s*[+~]/.test(b4);if(!bX){bV.setAttribute("id",bU)}else{bU=bU.replace(/'/g,"\\$&")}if(b5&&b6){bV=bV.parentNode}try{if(!b5||b6){return bF(bV.querySelectorAll("[id='"+bU+"'] "+b4),bZ)}}catch(b1){}finally{if(!bX){bW.removeAttribute("id")}}}}}return e(b4,bV,bZ,b3)};for(var bR in e){by[bR]=e[bR]}bT=null})()}(function(){var e=av.documentElement,bS=e.matchesSelector||e.mozMatchesSelector||e.webkitMatchesSelector||e.msMatchesSelector;if(bS){var bU=!bS.call(av.createElement("div"),"div"),bR=false;try{bS.call(av.documentElement,"[test!='']:sizzle")}catch(bT){bR=true}by.matchesSelector=function(bW,bY){bY=bY.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!by.isXML(bW)){try{if(bR||!bE.match.PSEUDO.test(bY)&&!/!=/.test(bY)){var bV=bS.call(bW,bY);if(bV||!bU||bW.document&&bW.document.nodeType!==11){return bV}}}catch(bX){}}return by(bY,null,null,[bW]).length>0}}})();(function(){var e=av.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(!e.getElementsByClassName||e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}bE.order.splice(1,0,"CLASS");bE.find.CLASS=function(bR,bS,bT){if(typeof bS.getElementsByClassName!=="undefined"&&!bT){return bS.getElementsByClassName(bR[1])}};e=null})();function bv(bR,bW,bV,bZ,bX,bY){for(var bT=0,bS=bZ.length;bT<bS;bT++){var e=bZ[bT];if(e){var bU=false;e=e[bR];while(e){if(e[bC]===bV){bU=bZ[e.sizset];break}if(e.nodeType===1&&!bY){e[bC]=bV;e.sizset=bT}if(e.nodeName.toLowerCase()===bW){bU=e;break}e=e[bR]}bZ[bT]=bU}}}function bN(bR,bW,bV,bZ,bX,bY){for(var bT=0,bS=bZ.length;bT<bS;bT++){var e=bZ[bT];if(e){var bU=false;e=e[bR];while(e){if(e[bC]===bV){bU=bZ[e.sizset];break}if(e.nodeType===1){if(!bY){e[bC]=bV;e.sizset=bT}if(typeof bW!=="string"){if(e===bW){bU=true;break}}else{if(by.filter(bW,[e]).length>0){bU=e;break}}}e=e[bR]}bZ[bT]=bU}}}if(av.documentElement.contains){by.contains=function(bR,e){return bR!==e&&(bR.contains?bR.contains(e):true)}}else{if(av.documentElement.compareDocumentPosition){by.contains=function(bR,e){return !!(bR.compareDocumentPosition(e)&16)}}else{by.contains=function(){return false}}}by.isXML=function(e){var bR=(e?e.ownerDocument||e:0).documentElement;return bR?bR.nodeName!=="HTML":false};var bM=function(bS,e,bW){var bV,bX=[],bU="",bY=e.nodeType?[e]:e;while((bV=bE.match.PSEUDO.exec(bS))){bU+=bV[0];bS=bS.replace(bE.match.PSEUDO,"")}bS=bE.relative[bS]?bS+"*":bS;for(var bT=0,bR=bY.length;bT<bR;bT++){by(bS,bY[bT],bX,bW)}return by.filter(bU,bX)};by.attr=b.attr;by.selectors.attrMap={};b.find=by;b.expr=by.selectors;b.expr[":"]=b.expr.filters;b.unique=by.uniqueSort;b.text=by.getText;b.isXMLDoc=by.isXML;b.contains=by.contains})();var ab=/Until$/,aq=/^(?:parents|prevUntil|prevAll)/,a9=/,/,bp=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,H=b.expr.match.POS,ay={children:true,contents:true,next:true,prev:true};b.fn.extend({find:function(e){var bw=this,by,bv;if(typeof e!=="string"){return b(e).filter(function(){for(by=0,bv=bw.length;by<bv;by++){if(b.contains(bw[by],this)){return true}}})}var bx=this.pushStack("","find",e),bA,bB,bz;for(by=0,bv=this.length;by<bv;by++){bA=bx.length;b.find(e,this[by],bx);if(by>0){for(bB=bA;bB<bx.length;bB++){for(bz=0;bz<bA;bz++){if(bx[bz]===bx[bB]){bx.splice(bB--,1);break}}}}}return bx},has:function(bv){var e=b(bv);return this.filter(function(){for(var bx=0,bw=e.length;bx<bw;bx++){if(b.contains(this,e[bx])){return true}}})},not:function(e){return this.pushStack(aG(this,e,false),"not",e)},filter:function(e){return this.pushStack(aG(this,e,true),"filter",e)},is:function(e){return !!e&&(typeof e==="string"?H.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(by,bx){var bv=[],bw,e,bz=this[0];if(b.isArray(by)){var bB=1;while(bz&&bz.ownerDocument&&bz!==bx){for(bw=0;bw<by.length;bw++){if(b(bz).is(by[bw])){bv.push({selector:by[bw],elem:bz,level:bB})}}bz=bz.parentNode;bB++}return bv}var bA=H.test(by)||typeof by!=="string"?b(by,bx||this.context):0;for(bw=0,e=this.length;bw<e;bw++){bz=this[bw];while(bz){if(bA?bA.index(bz)>-1:b.find.matchesSelector(bz,by)){bv.push(bz);break}else{bz=bz.parentNode;if(!bz||!bz.ownerDocument||bz===bx||bz.nodeType===11){break}}}}bv=bv.length>1?b.unique(bv):bv;return this.pushStack(bv,"closest",by)},index:function(e){if(!e){return(this[0]&&this[0].parentNode)?this.prevAll().length:-1}if(typeof e==="string"){return b.inArray(this[0],b(e))}return b.inArray(e.jquery?e[0]:e,this)},add:function(e,bv){var bx=typeof e==="string"?b(e,bv):b.makeArray(e&&e.nodeType?[e]:e),bw=b.merge(this.get(),bx);return this.pushStack(C(bx[0])||C(bw[0])?bw:b.unique(bw))},andSelf:function(){return this.add(this.prevObject)}});function C(e){return !e||!e.parentNode||e.parentNode.nodeType===11}b.each({parent:function(bv){var e=bv.parentNode;return e&&e.nodeType!==11?e:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(bv,e,bw){return b.dir(bv,"parentNode",bw)},next:function(e){return b.nth(e,2,"nextSibling")},prev:function(e){return b.nth(e,2,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(bv,e,bw){return b.dir(bv,"nextSibling",bw)},prevUntil:function(bv,e,bw){return b.dir(bv,"previousSibling",bw)},siblings:function(e){return b.sibling(e.parentNode.firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.makeArray(e.childNodes)}},function(e,bv){b.fn[e]=function(by,bw){var bx=b.map(this,bv,by);if(!ab.test(e)){bw=by}if(bw&&typeof bw==="string"){bx=b.filter(bw,bx)}bx=this.length>1&&!ay[e]?b.unique(bx):bx;if((this.length>1||a9.test(bw))&&aq.test(e)){bx=bx.reverse()}return this.pushStack(bx,e,P.call(arguments).join(","))}});b.extend({filter:function(bw,e,bv){if(bv){bw=":not("+bw+")"}return e.length===1?b.find.matchesSelector(e[0],bw)?[e[0]]:[]:b.find.matches(bw,e)},dir:function(bw,bv,by){var e=[],bx=bw[bv];while(bx&&bx.nodeType!==9&&(by===L||bx.nodeType!==1||!b(bx).is(by))){if(bx.nodeType===1){e.push(bx)}bx=bx[bv]}return e},nth:function(by,e,bw,bx){e=e||1;var bv=0;for(;by;by=by[bw]){if(by.nodeType===1&&++bv===e){break}}return by},sibling:function(bw,bv){var e=[];for(;bw;bw=bw.nextSibling){if(bw.nodeType===1&&bw!==bv){e.push(bw)}}return e}});function aG(bx,bw,e){bw=bw||0;if(b.isFunction(bw)){return b.grep(bx,function(bz,by){var bA=!!bw.call(bz,by,bz);return bA===e})}else{if(bw.nodeType){return b.grep(bx,function(bz,by){return(bz===bw)===e})}else{if(typeof bw==="string"){var bv=b.grep(bx,function(by){return by.nodeType===1});if(bp.test(bw)){return b.filter(bw,bv,!e)}else{bw=b.filter(bw,bv)}}}}return b.grep(bx,function(bz,by){return(b.inArray(bz,bw)>=0)===e})}function a(e){var bw=aR.split("|"),bv=e.createDocumentFragment();if(bv.createElement){while(bw.length){bv.createElement(bw.pop())}}return bv}var aR="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ag=/ jQuery\d+="(?:\d+|null)"/g,ar=/^\s+/,R=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,d=/<([\w:]+)/,w=/<tbody/i,W=/<|&#?\w+;/,ae=/<(?:script|style)/i,O=/<(?:script|object|embed|option|style)/i,ah=new RegExp("<(?:"+aR+")","i"),o=/checked\s*(?:[^=]|=\s*.checked.)/i,bm=/\/(java|ecma)script/i,aN=/^\s*<!(?:\[CDATA\[|\-\-)/,ax={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},ac=a(av);
-ax.optgroup=ax.option;ax.tbody=ax.tfoot=ax.colgroup=ax.caption=ax.thead;ax.th=ax.td;if(!b.support.htmlSerialize){ax._default=[1,"div<div>","</div>"]}b.fn.extend({text:function(e){if(b.isFunction(e)){return this.each(function(bw){var bv=b(this);bv.text(e.call(this,bw,bv.text()))})}if(typeof e!=="object"&&e!==L){return this.empty().append((this[0]&&this[0].ownerDocument||av).createTextNode(e))}return b.text(this)},wrapAll:function(e){if(b.isFunction(e)){return this.each(function(bw){b(this).wrapAll(e.call(this,bw))})}if(this[0]){var bv=b(e,this[0].ownerDocument).eq(0).clone(true);if(this[0].parentNode){bv.insertBefore(this[0])}bv.map(function(){var bw=this;while(bw.firstChild&&bw.firstChild.nodeType===1){bw=bw.firstChild}return bw}).append(this)}return this},wrapInner:function(e){if(b.isFunction(e)){return this.each(function(bv){b(this).wrapInner(e.call(this,bv))})}return this.each(function(){var bv=b(this),bw=bv.contents();if(bw.length){bw.wrapAll(e)}else{bv.append(e)}})},wrap:function(e){var bv=b.isFunction(e);return this.each(function(bw){b(this).wrapAll(bv?e.call(this,bw):e)})},unwrap:function(){return this.parent().each(function(){if(!b.nodeName(this,"body")){b(this).replaceWith(this.childNodes)}}).end()},append:function(){return this.domManip(arguments,true,function(e){if(this.nodeType===1){this.appendChild(e)}})},prepend:function(){return this.domManip(arguments,true,function(e){if(this.nodeType===1){this.insertBefore(e,this.firstChild)}})},before:function(){if(this[0]&&this[0].parentNode){return this.domManip(arguments,false,function(bv){this.parentNode.insertBefore(bv,this)})}else{if(arguments.length){var e=b.clean(arguments);e.push.apply(e,this.toArray());return this.pushStack(e,"before",arguments)}}},after:function(){if(this[0]&&this[0].parentNode){return this.domManip(arguments,false,function(bv){this.parentNode.insertBefore(bv,this.nextSibling)})}else{if(arguments.length){var e=this.pushStack(this,"after",arguments);e.push.apply(e,b.clean(arguments));return e}}},remove:function(e,bx){for(var bv=0,bw;(bw=this[bv])!=null;bv++){if(!e||b.filter(e,[bw]).length){if(!bx&&bw.nodeType===1){b.cleanData(bw.getElementsByTagName("*"));b.cleanData([bw])}if(bw.parentNode){bw.parentNode.removeChild(bw)}}}return this},empty:function(){for(var e=0,bv;(bv=this[e])!=null;e++){if(bv.nodeType===1){b.cleanData(bv.getElementsByTagName("*"))}while(bv.firstChild){bv.removeChild(bv.firstChild)}}return this},clone:function(bv,e){bv=bv==null?false:bv;e=e==null?bv:e;return this.map(function(){return b.clone(this,bv,e)})},html:function(bx){if(bx===L){return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(ag,""):null}else{if(typeof bx==="string"&&!ae.test(bx)&&(b.support.leadingWhitespace||!ar.test(bx))&&!ax[(d.exec(bx)||["",""])[1].toLowerCase()]){bx=bx.replace(R,"<$1></$2>");try{for(var bw=0,bv=this.length;bw<bv;bw++){if(this[bw].nodeType===1){b.cleanData(this[bw].getElementsByTagName("*"));this[bw].innerHTML=bx}}}catch(by){this.empty().append(bx)}}else{if(b.isFunction(bx)){this.each(function(bz){var e=b(this);e.html(bx.call(this,bz,e.html()))})}else{this.empty().append(bx)}}}return this},replaceWith:function(e){if(this[0]&&this[0].parentNode){if(b.isFunction(e)){return this.each(function(bx){var bw=b(this),bv=bw.html();bw.replaceWith(e.call(this,bx,bv))})}if(typeof e!=="string"){e=b(e).detach()}return this.each(function(){var bw=this.nextSibling,bv=this.parentNode;b(this).remove();if(bw){b(bw).before(e)}else{b(bv).append(e)}})}else{return this.length?this.pushStack(b(b.isFunction(e)?e():e),"replaceWith",e):this}},detach:function(e){return this.remove(e,true)},domManip:function(bB,bF,bE){var bx,by,bA,bD,bC=bB[0],bv=[];if(!b.support.checkClone&&arguments.length===3&&typeof bC==="string"&&o.test(bC)){return this.each(function(){b(this).domManip(bB,bF,bE,true)})}if(b.isFunction(bC)){return this.each(function(bH){var bG=b(this);bB[0]=bC.call(this,bH,bF?bG.html():L);bG.domManip(bB,bF,bE)})}if(this[0]){bD=bC&&bC.parentNode;if(b.support.parentNode&&bD&&bD.nodeType===11&&bD.childNodes.length===this.length){bx={fragment:bD}}else{bx=b.buildFragment(bB,this,bv)}bA=bx.fragment;if(bA.childNodes.length===1){by=bA=bA.firstChild}else{by=bA.firstChild}if(by){bF=bF&&b.nodeName(by,"tr");for(var bw=0,e=this.length,bz=e-1;bw<e;bw++){bE.call(bF?ba(this[bw],by):this[bw],bx.cacheable||(e>1&&bw<bz)?b.clone(bA,true,true):bA)}}if(bv.length){b.each(bv,bo)}}return this}});function ba(e,bv){return b.nodeName(e,"table")?(e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody"))):e}function t(bB,bv){if(bv.nodeType!==1||!b.hasData(bB)){return}var by,bx,e,bA=b._data(bB),bz=b._data(bv,bA),bw=bA.events;if(bw){delete bz.handle;bz.events={};for(by in bw){for(bx=0,e=bw[by].length;bx<e;bx++){b.event.add(bv,by+(bw[by][bx].namespace?".":"")+bw[by][bx].namespace,bw[by][bx],bw[by][bx].data)}}}if(bz.data){bz.data=b.extend({},bz.data)}}function ai(bv,e){var bw;if(e.nodeType!==1){return}if(e.clearAttributes){e.clearAttributes()}if(e.mergeAttributes){e.mergeAttributes(bv)}bw=e.nodeName.toLowerCase();if(bw==="object"){e.outerHTML=bv.outerHTML}else{if(bw==="input"&&(bv.type==="checkbox"||bv.type==="radio")){if(bv.checked){e.defaultChecked=e.checked=bv.checked}if(e.value!==bv.value){e.value=bv.value}}else{if(bw==="option"){e.selected=bv.defaultSelected}else{if(bw==="input"||bw==="textarea"){e.defaultValue=bv.defaultValue}}}}e.removeAttribute(b.expando)}b.buildFragment=function(bz,bx,bv){var by,e,bw,bA,bB=bz[0];if(bx&&bx[0]){bA=bx[0].ownerDocument||bx[0]}if(!bA.createDocumentFragment){bA=av}if(bz.length===1&&typeof bB==="string"&&bB.length<512&&bA===av&&bB.charAt(0)==="<"&&!O.test(bB)&&(b.support.checkClone||!o.test(bB))&&(b.support.html5Clone||!ah.test(bB))){e=true;bw=b.fragments[bB];if(bw&&bw!==1){by=bw}}if(!by){by=bA.createDocumentFragment();b.clean(bz,bA,by,bv)}if(e){b.fragments[bB]=bw?by:1}return{fragment:by,cacheable:e}};b.fragments={};b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,bv){b.fn[e]=function(bw){var bz=[],bC=b(bw),bB=this.length===1&&this[0].parentNode;if(bB&&bB.nodeType===11&&bB.childNodes.length===1&&bC.length===1){bC[bv](this[0]);return this}else{for(var bA=0,bx=bC.length;bA<bx;bA++){var by=(bA>0?this.clone(true):this).get();b(bC[bA])[bv](by);bz=bz.concat(by)}return this.pushStack(bz,e,bC.selector)}}});function bg(e){if(typeof e.getElementsByTagName!=="undefined"){return e.getElementsByTagName("*")}else{if(typeof e.querySelectorAll!=="undefined"){return e.querySelectorAll("*")}else{return[]}}}function az(e){if(e.type==="checkbox"||e.type==="radio"){e.defaultChecked=e.checked}}function E(e){var bv=(e.nodeName||"").toLowerCase();if(bv==="input"){az(e)}else{if(bv!=="script"&&typeof e.getElementsByTagName!=="undefined"){b.grep(e.getElementsByTagName("input"),az)}}}function al(e){var bv=av.createElement("div");ac.appendChild(bv);bv.innerHTML=e.outerHTML;return bv.firstChild}b.extend({clone:function(by,bA,bw){var e,bv,bx,bz=b.support.html5Clone||!ah.test("<"+by.nodeName)?by.cloneNode(true):al(by);if((!b.support.noCloneEvent||!b.support.noCloneChecked)&&(by.nodeType===1||by.nodeType===11)&&!b.isXMLDoc(by)){ai(by,bz);e=bg(by);bv=bg(bz);for(bx=0;e[bx];++bx){if(bv[bx]){ai(e[bx],bv[bx])}}}if(bA){t(by,bz);if(bw){e=bg(by);bv=bg(bz);for(bx=0;e[bx];++bx){t(e[bx],bv[bx])}}}e=bv=null;return bz},clean:function(bw,by,bH,bA){var bF;by=by||av;if(typeof by.createElement==="undefined"){by=by.ownerDocument||by[0]&&by[0].ownerDocument||av}var bI=[],bB;for(var bE=0,bz;(bz=bw[bE])!=null;bE++){if(typeof bz==="number"){bz+=""}if(!bz){continue}if(typeof bz==="string"){if(!W.test(bz)){bz=by.createTextNode(bz)}else{bz=bz.replace(R,"<$1></$2>");var bK=(d.exec(bz)||["",""])[1].toLowerCase(),bx=ax[bK]||ax._default,bD=bx[0],bv=by.createElement("div");if(by===av){ac.appendChild(bv)}else{a(by).appendChild(bv)}bv.innerHTML=bx[1]+bz+bx[2];while(bD--){bv=bv.lastChild}if(!b.support.tbody){var e=w.test(bz),bC=bK==="table"&&!e?bv.firstChild&&bv.firstChild.childNodes:bx[1]==="<table>"&&!e?bv.childNodes:[];for(bB=bC.length-1;bB>=0;--bB){if(b.nodeName(bC[bB],"tbody")&&!bC[bB].childNodes.length){bC[bB].parentNode.removeChild(bC[bB])}}}if(!b.support.leadingWhitespace&&ar.test(bz)){bv.insertBefore(by.createTextNode(ar.exec(bz)[0]),bv.firstChild)}bz=bv.childNodes}}var bG;if(!b.support.appendChecked){if(bz[0]&&typeof(bG=bz.length)==="number"){for(bB=0;bB<bG;bB++){E(bz[bB])}}else{E(bz)}}if(bz.nodeType){bI.push(bz)}else{bI=b.merge(bI,bz)}}if(bH){bF=function(bL){return !bL.type||bm.test(bL.type)};for(bE=0;bI[bE];bE++){if(bA&&b.nodeName(bI[bE],"script")&&(!bI[bE].type||bI[bE].type.toLowerCase()==="text/javascript")){bA.push(bI[bE].parentNode?bI[bE].parentNode.removeChild(bI[bE]):bI[bE])}else{if(bI[bE].nodeType===1){var bJ=b.grep(bI[bE].getElementsByTagName("script"),bF);bI.splice.apply(bI,[bE+1,0].concat(bJ))}bH.appendChild(bI[bE])}}}return bI},cleanData:function(bv){var by,bw,e=b.cache,bB=b.event.special,bA=b.support.deleteExpando;for(var bz=0,bx;(bx=bv[bz])!=null;bz++){if(bx.nodeName&&b.noData[bx.nodeName.toLowerCase()]){continue}bw=bx[b.expando];if(bw){by=e[bw];if(by&&by.events){for(var bC in by.events){if(bB[bC]){b.event.remove(bx,bC)}else{b.removeEvent(bx,bC,by.handle)}}if(by.handle){by.handle.elem=null}}if(bA){delete bx[b.expando]}else{if(bx.removeAttribute){bx.removeAttribute(b.expando)}}delete e[bw]}}}});function bo(e,bv){if(bv.src){b.ajax({url:bv.src,async:false,dataType:"script"})}else{b.globalEval((bv.text||bv.textContent||bv.innerHTML||"").replace(aN,"/*$0*/"))}if(bv.parentNode){bv.parentNode.removeChild(bv)}}var ak=/alpha\([^)]*\)/i,au=/opacity=([^)]*)/,z=/([A-Z]|^ms)/g,bc=/^-?\d+(?:px)?$/i,bn=/^-?\d/,I=/^([\-+])=([\-+.\de]+)/,a7={position:"absolute",visibility:"hidden",display:"block"},an=["Left","Right"],a1=["Top","Bottom"],Z,aI,aX;b.fn.css=function(e,bv){if(arguments.length===2&&bv===L){return this}return b.access(this,e,bv,true,function(bx,bw,by){return by!==L?b.style(bx,bw,by):b.css(bx,bw)})};b.extend({cssHooks:{opacity:{get:function(bw,bv){if(bv){var e=Z(bw,"opacity","opacity");return e===""?"1":e}else{return bw.style.opacity}}}},cssNumber:{fillOpacity:true,fontWeight:true,lineHeight:true,opacity:true,orphans:true,widows:true,zIndex:true,zoom:true},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(bx,bw,bD,by){if(!bx||bx.nodeType===3||bx.nodeType===8||!bx.style){return}var bB,bC,bz=b.camelCase(bw),bv=bx.style,bE=b.cssHooks[bz];bw=b.cssProps[bz]||bz;if(bD!==L){bC=typeof bD;if(bC==="string"&&(bB=I.exec(bD))){bD=(+(bB[1]+1)*+bB[2])+parseFloat(b.css(bx,bw));bC="number"}if(bD==null||bC==="number"&&isNaN(bD)){return}if(bC==="number"&&!b.cssNumber[bz]){bD+="px"}if(!bE||!("set" in bE)||(bD=bE.set(bx,bD))!==L){try{bv[bw]=bD}catch(bA){}}}else{if(bE&&"get" in bE&&(bB=bE.get(bx,false,by))!==L){return bB}return bv[bw]}},css:function(by,bx,bv){var bw,e;bx=b.camelCase(bx);e=b.cssHooks[bx];bx=b.cssProps[bx]||bx;if(bx==="cssFloat"){bx="float"}if(e&&"get" in e&&(bw=e.get(by,true,bv))!==L){return bw}else{if(Z){return Z(by,bx)}}},swap:function(bx,bw,by){var e={};for(var bv in bw){e[bv]=bx.style[bv];bx.style[bv]=bw[bv]}by.call(bx);for(bv in bw){bx.style[bv]=e[bv]}}});b.curCSS=b.css;b.each(["height","width"],function(bv,e){b.cssHooks[e]={get:function(by,bx,bw){var bz;if(bx){if(by.offsetWidth!==0){return p(by,e,bw)}else{b.swap(by,a7,function(){bz=p(by,e,bw)})}return bz}},set:function(bw,bx){if(bc.test(bx)){bx=parseFloat(bx);if(bx>=0){return bx+"px"}}else{return bx}}}});if(!b.support.opacity){b.cssHooks.opacity={get:function(bv,e){return au.test((e&&bv.currentStyle?bv.currentStyle.filter:bv.style.filter)||"")?(parseFloat(RegExp.$1)/100)+"":e?"1":""},set:function(by,bz){var bx=by.style,bv=by.currentStyle,e=b.isNumeric(bz)?"alpha(opacity="+bz*100+")":"",bw=bv&&bv.filter||bx.filter||"";bx.zoom=1;if(bz>=1&&b.trim(bw.replace(ak,""))===""){bx.removeAttribute("filter");if(bv&&!bv.filter){return}}bx.filter=ak.test(bw)?bw.replace(ak,e):bw+" "+e}}}b(function(){if(!b.support.reliableMarginRight){b.cssHooks.marginRight={get:function(bw,bv){var e;b.swap(bw,{display:"inline-block"},function(){if(bv){e=Z(bw,"margin-right","marginRight")}else{e=bw.style.marginRight}});return e}}}});if(av.defaultView&&av.defaultView.getComputedStyle){aI=function(by,bw){var bv,bx,e;bw=bw.replace(z,"-$1").toLowerCase();if((bx=by.ownerDocument.defaultView)&&(e=bx.getComputedStyle(by,null))){bv=e.getPropertyValue(bw);if(bv===""&&!b.contains(by.ownerDocument.documentElement,by)){bv=b.style(by,bw)}}return bv}}if(av.documentElement.currentStyle){aX=function(bz,bw){var bA,e,by,bv=bz.currentStyle&&bz.currentStyle[bw],bx=bz.style;if(bv===null&&bx&&(by=bx[bw])){bv=by}if(!bc.test(bv)&&bn.test(bv)){bA=bx.left;e=bz.runtimeStyle&&bz.runtimeStyle.left;if(e){bz.runtimeStyle.left=bz.currentStyle.left}bx.left=bw==="fontSize"?"1em":(bv||0);bv=bx.pixelLeft+"px";bx.left=bA;if(e){bz.runtimeStyle.left=e}}return bv===""?"auto":bv}}Z=aI||aX;function p(by,bw,bv){var bA=bw==="width"?by.offsetWidth:by.offsetHeight,bz=bw==="width"?an:a1,bx=0,e=bz.length;
-if(bA>0){if(bv!=="border"){for(;bx<e;bx++){if(!bv){bA-=parseFloat(b.css(by,"padding"+bz[bx]))||0}if(bv==="margin"){bA+=parseFloat(b.css(by,bv+bz[bx]))||0}else{bA-=parseFloat(b.css(by,"border"+bz[bx]+"Width"))||0}}}return bA+"px"}bA=Z(by,bw,bw);if(bA<0||bA==null){bA=by.style[bw]||0}bA=parseFloat(bA)||0;if(bv){for(;bx<e;bx++){bA+=parseFloat(b.css(by,"padding"+bz[bx]))||0;if(bv!=="padding"){bA+=parseFloat(b.css(by,"border"+bz[bx]+"Width"))||0}if(bv==="margin"){bA+=parseFloat(b.css(by,bv+bz[bx]))||0}}}return bA+"px"}if(b.expr&&b.expr.filters){b.expr.filters.hidden=function(bw){var bv=bw.offsetWidth,e=bw.offsetHeight;return(bv===0&&e===0)||(!b.support.reliableHiddenOffsets&&((bw.style&&bw.style.display)||b.css(bw,"display"))==="none")};b.expr.filters.visible=function(e){return !b.expr.filters.hidden(e)}}var k=/%20/g,ap=/\[\]$/,bs=/\r?\n/g,bq=/#.*$/,aD=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,aZ=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,aM=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,aQ=/^(?:GET|HEAD)$/,c=/^\/\//,M=/\?/,a6=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,q=/^(?:select|textarea)/i,h=/\s+/,br=/([?&])_=[^&]*/,K=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,A=b.fn.load,aa={},r={},aE,s,aV=["*/"]+["*"];try{aE=bl.href}catch(aw){aE=av.createElement("a");aE.href="";aE=aE.href}s=K.exec(aE.toLowerCase())||[];function f(e){return function(by,bA){if(typeof by!=="string"){bA=by;by="*"}if(b.isFunction(bA)){var bx=by.toLowerCase().split(h),bw=0,bz=bx.length,bv,bB,bC;for(;bw<bz;bw++){bv=bx[bw];bC=/^\+/.test(bv);if(bC){bv=bv.substr(1)||"*"}bB=e[bv]=e[bv]||[];bB[bC?"unshift":"push"](bA)}}}}function aW(bv,bE,bz,bD,bB,bx){bB=bB||bE.dataTypes[0];bx=bx||{};bx[bB]=true;var bA=bv[bB],bw=0,e=bA?bA.length:0,by=(bv===aa),bC;for(;bw<e&&(by||!bC);bw++){bC=bA[bw](bE,bz,bD);if(typeof bC==="string"){if(!by||bx[bC]){bC=L}else{bE.dataTypes.unshift(bC);bC=aW(bv,bE,bz,bD,bC,bx)}}}if((by||!bC)&&!bx["*"]){bC=aW(bv,bE,bz,bD,"*",bx)}return bC}function am(bw,bx){var bv,e,by=b.ajaxSettings.flatOptions||{};for(bv in bx){if(bx[bv]!==L){(by[bv]?bw:(e||(e={})))[bv]=bx[bv]}}if(e){b.extend(true,bw,e)}}b.fn.extend({load:function(bw,bz,bA){if(typeof bw!=="string"&&A){return A.apply(this,arguments)}else{if(!this.length){return this}}var by=bw.indexOf(" ");if(by>=0){var e=bw.slice(by,bw.length);bw=bw.slice(0,by)}var bx="GET";if(bz){if(b.isFunction(bz)){bA=bz;bz=L}else{if(typeof bz==="object"){bz=b.param(bz,b.ajaxSettings.traditional);bx="POST"}}}var bv=this;b.ajax({url:bw,type:bx,dataType:"html",data:bz,complete:function(bC,bB,bD){bD=bC.responseText;if(bC.isResolved()){bC.done(function(bE){bD=bE});bv.html(e?b("<div>").append(bD.replace(a6,"")).find(e):bD)}if(bA){bv.each(bA,[bD,bB,bC])}}});return this},serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?b.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||q.test(this.nodeName)||aZ.test(this.type))}).map(function(e,bv){var bw=b(this).val();return bw==null?null:b.isArray(bw)?b.map(bw,function(by,bx){return{name:bv.name,value:by.replace(bs,"\r\n")}}):{name:bv.name,value:bw.replace(bs,"\r\n")}}).get()}});b.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,bv){b.fn[bv]=function(bw){return this.on(bv,bw)}});b.each(["get","post"],function(e,bv){b[bv]=function(bw,by,bz,bx){if(b.isFunction(by)){bx=bx||bz;bz=by;by=L}return b.ajax({type:bv,url:bw,data:by,success:bz,dataType:bx})}});b.extend({getScript:function(e,bv){return b.get(e,L,bv,"script")},getJSON:function(e,bv,bw){return b.get(e,bv,bw,"json")},ajaxSetup:function(bv,e){if(e){am(bv,b.ajaxSettings)}else{e=bv;bv=b.ajaxSettings}am(bv,e);return bv},ajaxSettings:{url:aE,isLocal:aM.test(s[1]),global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":aV},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":bb.String,"text html":true,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{context:true,url:true}},ajaxPrefilter:f(aa),ajaxTransport:f(r),ajax:function(bz,bx){if(typeof bz==="object"){bx=bz;bz=L}bx=bx||{};var bD=b.ajaxSetup({},bx),bS=bD.context||bD,bG=bS!==bD&&(bS.nodeType||bS instanceof b)?b(bS):b.event,bR=b.Deferred(),bN=b.Callbacks("once memory"),bB=bD.statusCode||{},bC,bH={},bO={},bQ,by,bL,bE,bI,bA=0,bw,bK,bJ={readyState:0,setRequestHeader:function(bT,bU){if(!bA){var e=bT.toLowerCase();bT=bO[e]=bO[e]||bT;bH[bT]=bU}return this},getAllResponseHeaders:function(){return bA===2?bQ:null},getResponseHeader:function(bT){var e;if(bA===2){if(!by){by={};while((e=aD.exec(bQ))){by[e[1].toLowerCase()]=e[2]}}e=by[bT.toLowerCase()]}return e===L?null:e},overrideMimeType:function(e){if(!bA){bD.mimeType=e}return this},abort:function(e){e=e||"abort";if(bL){bL.abort(e)}bF(0,e);return this}};function bF(bZ,bU,b0,bW){if(bA===2){return}bA=2;if(bE){clearTimeout(bE)}bL=L;bQ=bW||"";bJ.readyState=bZ>0?4:0;var bT,b4,b3,bX=bU,bY=b0?bj(bD,bJ,b0):L,bV,b2;if(bZ>=200&&bZ<300||bZ===304){if(bD.ifModified){if((bV=bJ.getResponseHeader("Last-Modified"))){b.lastModified[bC]=bV}if((b2=bJ.getResponseHeader("Etag"))){b.etag[bC]=b2}}if(bZ===304){bX="notmodified";bT=true}else{try{b4=G(bD,bY);bX="success";bT=true}catch(b1){bX="parsererror";b3=b1}}}else{b3=bX;if(!bX||bZ){bX="error";if(bZ<0){bZ=0}}}bJ.status=bZ;bJ.statusText=""+(bU||bX);if(bT){bR.resolveWith(bS,[b4,bX,bJ])}else{bR.rejectWith(bS,[bJ,bX,b3])}bJ.statusCode(bB);bB=L;if(bw){bG.trigger("ajax"+(bT?"Success":"Error"),[bJ,bD,bT?b4:b3])}bN.fireWith(bS,[bJ,bX]);if(bw){bG.trigger("ajaxComplete",[bJ,bD]);if(!(--b.active)){b.event.trigger("ajaxStop")}}}bR.promise(bJ);bJ.success=bJ.done;bJ.error=bJ.fail;bJ.complete=bN.add;bJ.statusCode=function(bT){if(bT){var e;if(bA<2){for(e in bT){bB[e]=[bB[e],bT[e]]}}else{e=bT[bJ.status];bJ.then(e,e)}}return this};bD.url=((bz||bD.url)+"").replace(bq,"").replace(c,s[1]+"//");bD.dataTypes=b.trim(bD.dataType||"*").toLowerCase().split(h);if(bD.crossDomain==null){bI=K.exec(bD.url.toLowerCase());bD.crossDomain=!!(bI&&(bI[1]!=s[1]||bI[2]!=s[2]||(bI[3]||(bI[1]==="http:"?80:443))!=(s[3]||(s[1]==="http:"?80:443))))}if(bD.data&&bD.processData&&typeof bD.data!=="string"){bD.data=b.param(bD.data,bD.traditional)}aW(aa,bD,bx,bJ);if(bA===2){return false}bw=bD.global;bD.type=bD.type.toUpperCase();bD.hasContent=!aQ.test(bD.type);if(bw&&b.active++===0){b.event.trigger("ajaxStart")}if(!bD.hasContent){if(bD.data){bD.url+=(M.test(bD.url)?"&":"?")+bD.data;delete bD.data}bC=bD.url;if(bD.cache===false){var bv=b.now(),bP=bD.url.replace(br,"$1_="+bv);bD.url=bP+((bP===bD.url)?(M.test(bD.url)?"&":"?")+"_="+bv:"")}}if(bD.data&&bD.hasContent&&bD.contentType!==false||bx.contentType){bJ.setRequestHeader("Content-Type",bD.contentType)}if(bD.ifModified){bC=bC||bD.url;if(b.lastModified[bC]){bJ.setRequestHeader("If-Modified-Since",b.lastModified[bC])}if(b.etag[bC]){bJ.setRequestHeader("If-None-Match",b.etag[bC])}}bJ.setRequestHeader("Accept",bD.dataTypes[0]&&bD.accepts[bD.dataTypes[0]]?bD.accepts[bD.dataTypes[0]]+(bD.dataTypes[0]!=="*"?", "+aV+"; q=0.01":""):bD.accepts["*"]);for(bK in bD.headers){bJ.setRequestHeader(bK,bD.headers[bK])}if(bD.beforeSend&&(bD.beforeSend.call(bS,bJ,bD)===false||bA===2)){bJ.abort();return false}for(bK in {success:1,error:1,complete:1}){bJ[bK](bD[bK])}bL=aW(r,bD,bx,bJ);if(!bL){bF(-1,"No Transport")}else{bJ.readyState=1;if(bw){bG.trigger("ajaxSend",[bJ,bD])}if(bD.async&&bD.timeout>0){bE=setTimeout(function(){bJ.abort("timeout")},bD.timeout)}try{bA=1;bL.send(bH,bF)}catch(bM){if(bA<2){bF(-1,bM)}else{throw bM}}}return bJ},param:function(e,bw){var bv=[],by=function(bz,bA){bA=b.isFunction(bA)?bA():bA;bv[bv.length]=encodeURIComponent(bz)+"="+encodeURIComponent(bA)};if(bw===L){bw=b.ajaxSettings.traditional}if(b.isArray(e)||(e.jquery&&!b.isPlainObject(e))){b.each(e,function(){by(this.name,this.value)})}else{for(var bx in e){v(bx,e[bx],bw,by)}}return bv.join("&").replace(k,"+")}});function v(bw,by,bv,bx){if(b.isArray(by)){b.each(by,function(bA,bz){if(bv||ap.test(bw)){bx(bw,bz)}else{v(bw+"["+(typeof bz==="object"||b.isArray(bz)?bA:"")+"]",bz,bv,bx)}})}else{if(!bv&&by!=null&&typeof by==="object"){for(var e in by){v(bw+"["+e+"]",by[e],bv,bx)}}else{bx(bw,by)}}}b.extend({active:0,lastModified:{},etag:{}});function bj(bD,bC,bz){var bv=bD.contents,bB=bD.dataTypes,bw=bD.responseFields,by,bA,bx,e;for(bA in bw){if(bA in bz){bC[bw[bA]]=bz[bA]}}while(bB[0]==="*"){bB.shift();if(by===L){by=bD.mimeType||bC.getResponseHeader("content-type")}}if(by){for(bA in bv){if(bv[bA]&&bv[bA].test(by)){bB.unshift(bA);break}}}if(bB[0] in bz){bx=bB[0]}else{for(bA in bz){if(!bB[0]||bD.converters[bA+" "+bB[0]]){bx=bA;break}if(!e){e=bA}}bx=bx||e}if(bx){if(bx!==bB[0]){bB.unshift(bx)}return bz[bx]}}function G(bH,bz){if(bH.dataFilter){bz=bH.dataFilter(bz,bH.dataType)}var bD=bH.dataTypes,bG={},bA,bE,bw=bD.length,bB,bC=bD[0],bx,by,bF,bv,e;for(bA=1;bA<bw;bA++){if(bA===1){for(bE in bH.converters){if(typeof bE==="string"){bG[bE.toLowerCase()]=bH.converters[bE]}}}bx=bC;bC=bD[bA];if(bC==="*"){bC=bx}else{if(bx!=="*"&&bx!==bC){by=bx+" "+bC;bF=bG[by]||bG["* "+bC];if(!bF){e=L;for(bv in bG){bB=bv.split(" ");if(bB[0]===bx||bB[0]==="*"){e=bG[bB[1]+" "+bC];if(e){bv=bG[bv];if(bv===true){bF=e}else{if(e===true){bF=bv}}break}}}}if(!(bF||e)){b.error("No conversion from "+by.replace(" "," to "))}if(bF!==true){bz=bF?bF(bz):e(bv(bz))}}}}return bz}var aC=b.now(),u=/(\=)\?(&|$)|\?\?/i;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return b.expando+"_"+(aC++)}});b.ajaxPrefilter("json jsonp",function(bD,bA,bC){var bx=bD.contentType==="application/x-www-form-urlencoded"&&(typeof bD.data==="string");if(bD.dataTypes[0]==="jsonp"||bD.jsonp!==false&&(u.test(bD.url)||bx&&u.test(bD.data))){var bB,bw=bD.jsonpCallback=b.isFunction(bD.jsonpCallback)?bD.jsonpCallback():bD.jsonpCallback,bz=bb[bw],e=bD.url,by=bD.data,bv="$1"+bw+"$2";if(bD.jsonp!==false){e=e.replace(u,bv);if(bD.url===e){if(bx){by=by.replace(u,bv)}if(bD.data===by){e+=(/\?/.test(e)?"&":"?")+bD.jsonp+"="+bw}}}bD.url=e;bD.data=by;bb[bw]=function(bE){bB=[bE]};bC.always(function(){bb[bw]=bz;if(bB&&b.isFunction(bz)){bb[bw](bB[0])}});bD.converters["script json"]=function(){if(!bB){b.error(bw+" was not called")}return bB[0]};bD.dataTypes[0]="json";return"script"}});b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){b.globalEval(e);return e}}});b.ajaxPrefilter("script",function(e){if(e.cache===L){e.cache=false}if(e.crossDomain){e.type="GET";e.global=false}});b.ajaxTransport("script",function(bw){if(bw.crossDomain){var e,bv=av.head||av.getElementsByTagName("head")[0]||av.documentElement;return{send:function(bx,by){e=av.createElement("script");e.async="async";if(bw.scriptCharset){e.charset=bw.scriptCharset}e.src=bw.url;e.onload=e.onreadystatechange=function(bA,bz){if(bz||!e.readyState||/loaded|complete/.test(e.readyState)){e.onload=e.onreadystatechange=null;if(bv&&e.parentNode){bv.removeChild(e)}e=L;if(!bz){by(200,"success")}}};bv.insertBefore(e,bv.firstChild)},abort:function(){if(e){e.onload(0,1)}}}}});var B=bb.ActiveXObject?function(){for(var e in N){N[e](0,1)}}:false,y=0,N;function aL(){try{return new bb.XMLHttpRequest()}catch(bv){}}function aj(){try{return new bb.ActiveXObject("Microsoft.XMLHTTP")}catch(bv){}}b.ajaxSettings.xhr=bb.ActiveXObject?function(){return !this.isLocal&&aL()||aj()}:aL;(function(e){b.extend(b.support,{ajax:!!e,cors:!!e&&("withCredentials" in e)})})(b.ajaxSettings.xhr());if(b.support.ajax){b.ajaxTransport(function(e){if(!e.crossDomain||b.support.cors){var bv;return{send:function(bB,bw){var bA=e.xhr(),bz,by;if(e.username){bA.open(e.type,e.url,e.async,e.username,e.password)}else{bA.open(e.type,e.url,e.async)}if(e.xhrFields){for(by in e.xhrFields){bA[by]=e.xhrFields[by]}}if(e.mimeType&&bA.overrideMimeType){bA.overrideMimeType(e.mimeType)}if(!e.crossDomain&&!bB["X-Requested-With"]){bB["X-Requested-With"]="XMLHttpRequest"}try{for(by in bB){bA.setRequestHeader(by,bB[by])}}catch(bx){}bA.send((e.hasContent&&e.data)||null);bv=function(bK,bE){var bF,bD,bC,bI,bH;try{if(bv&&(bE||bA.readyState===4)){bv=L;if(bz){bA.onreadystatechange=b.noop;if(B){delete N[bz]}}if(bE){if(bA.readyState!==4){bA.abort()}}else{bF=bA.status;bC=bA.getAllResponseHeaders();bI={};bH=bA.responseXML;if(bH&&bH.documentElement){bI.xml=bH}bI.text=bA.responseText;try{bD=bA.statusText}catch(bJ){bD=""}if(!bF&&e.isLocal&&!e.crossDomain){bF=bI.text?200:404}else{if(bF===1223){bF=204}}}}}catch(bG){if(!bE){bw(-1,bG)}}if(bI){bw(bF,bD,bI,bC)}};if(!e.async||bA.readyState===4){bv()}else{bz=++y;if(B){if(!N){N={};b(bb).unload(B)}N[bz]=bv}bA.onreadystatechange=bv}},abort:function(){if(bv){bv(0,1)
-}}}}})}var Q={},a8,m,aB=/^(?:toggle|show|hide)$/,aT=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,a3,aH=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],a4;b.fn.extend({show:function(bx,bA,bz){var bw,by;if(bx||bx===0){return this.animate(a0("show",3),bx,bA,bz)}else{for(var bv=0,e=this.length;bv<e;bv++){bw=this[bv];if(bw.style){by=bw.style.display;if(!b._data(bw,"olddisplay")&&by==="none"){by=bw.style.display=""}if(by===""&&b.css(bw,"display")==="none"){b._data(bw,"olddisplay",x(bw.nodeName))}}}for(bv=0;bv<e;bv++){bw=this[bv];if(bw.style){by=bw.style.display;if(by===""||by==="none"){bw.style.display=b._data(bw,"olddisplay")||""}}}return this}},hide:function(bx,bA,bz){if(bx||bx===0){return this.animate(a0("hide",3),bx,bA,bz)}else{var bw,by,bv=0,e=this.length;for(;bv<e;bv++){bw=this[bv];if(bw.style){by=b.css(bw,"display");if(by!=="none"&&!b._data(bw,"olddisplay")){b._data(bw,"olddisplay",by)}}}for(bv=0;bv<e;bv++){if(this[bv].style){this[bv].style.display="none"}}return this}},_toggle:b.fn.toggle,toggle:function(bw,bv,bx){var e=typeof bw==="boolean";if(b.isFunction(bw)&&b.isFunction(bv)){this._toggle.apply(this,arguments)}else{if(bw==null||e){this.each(function(){var by=e?bw:b(this).is(":hidden");b(this)[by?"show":"hide"]()})}else{this.animate(a0("toggle",3),bw,bv,bx)}}return this},fadeTo:function(e,bx,bw,bv){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:bx},e,bw,bv)},animate:function(bz,bw,by,bx){var e=b.speed(bw,by,bx);if(b.isEmptyObject(bz)){return this.each(e.complete,[false])}bz=b.extend({},bz);function bv(){if(e.queue===false){b._mark(this)}var bE=b.extend({},e),bK=this.nodeType===1,bI=bK&&b(this).is(":hidden"),bB,bF,bD,bJ,bH,bC,bG,bL,bA;bE.animatedProperties={};for(bD in bz){bB=b.camelCase(bD);if(bD!==bB){bz[bB]=bz[bD];delete bz[bD]}bF=bz[bB];if(b.isArray(bF)){bE.animatedProperties[bB]=bF[1];bF=bz[bB]=bF[0]}else{bE.animatedProperties[bB]=bE.specialEasing&&bE.specialEasing[bB]||bE.easing||"swing"}if(bF==="hide"&&bI||bF==="show"&&!bI){return bE.complete.call(this)}if(bK&&(bB==="height"||bB==="width")){bE.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(b.css(this,"display")==="inline"&&b.css(this,"float")==="none"){if(!b.support.inlineBlockNeedsLayout||x(this.nodeName)==="inline"){this.style.display="inline-block"}else{this.style.zoom=1}}}}if(bE.overflow!=null){this.style.overflow="hidden"}for(bD in bz){bJ=new b.fx(this,bE,bD);bF=bz[bD];if(aB.test(bF)){bA=b._data(this,"toggle"+bD)||(bF==="toggle"?bI?"show":"hide":0);if(bA){b._data(this,"toggle"+bD,bA==="show"?"hide":"show");bJ[bA]()}else{bJ[bF]()}}else{bH=aT.exec(bF);bC=bJ.cur();if(bH){bG=parseFloat(bH[2]);bL=bH[3]||(b.cssNumber[bD]?"":"px");if(bL!=="px"){b.style(this,bD,(bG||1)+bL);bC=((bG||1)/bJ.cur())*bC;b.style(this,bD,bC+bL)}if(bH[1]){bG=((bH[1]==="-="?-1:1)*bG)+bC}bJ.custom(bC,bG,bL)}else{bJ.custom(bC,bF,"")}}}return true}return e.queue===false?this.each(bv):this.queue(e.queue,bv)},stop:function(bw,bv,e){if(typeof bw!=="string"){e=bv;bv=bw;bw=L}if(bv&&bw!==false){this.queue(bw||"fx",[])}return this.each(function(){var bx,by=false,bA=b.timers,bz=b._data(this);if(!e){b._unmark(true,this)}function bB(bE,bF,bD){var bC=bF[bD];b.removeData(bE,bD,true);bC.stop(e)}if(bw==null){for(bx in bz){if(bz[bx]&&bz[bx].stop&&bx.indexOf(".run")===bx.length-4){bB(this,bz,bx)}}}else{if(bz[bx=bw+".run"]&&bz[bx].stop){bB(this,bz,bx)}}for(bx=bA.length;bx--;){if(bA[bx].elem===this&&(bw==null||bA[bx].queue===bw)){if(e){bA[bx](true)}else{bA[bx].saveState()}by=true;bA.splice(bx,1)}}if(!(e&&by)){b.dequeue(this,bw)}})}});function bh(){setTimeout(at,0);return(a4=b.now())}function at(){a4=L}function a0(bv,e){var bw={};b.each(aH.concat.apply([],aH.slice(0,e)),function(){bw[this]=bv});return bw}b.each({slideDown:a0("show",1),slideUp:a0("hide",1),slideToggle:a0("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,bv){b.fn[e]=function(bw,by,bx){return this.animate(bv,bw,by,bx)}});b.extend({speed:function(bw,bx,bv){var e=bw&&typeof bw==="object"?b.extend({},bw):{complete:bv||!bv&&bx||b.isFunction(bw)&&bw,duration:bw,easing:bv&&bx||bx&&!b.isFunction(bx)&&bx};e.duration=b.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in b.fx.speeds?b.fx.speeds[e.duration]:b.fx.speeds._default;if(e.queue==null||e.queue===true){e.queue="fx"}e.old=e.complete;e.complete=function(by){if(b.isFunction(e.old)){e.old.call(this)}if(e.queue){b.dequeue(this,e.queue)}else{if(by!==false){b._unmark(this)}}};return e},easing:{linear:function(bw,bx,e,bv){return e+bv*bw},swing:function(bw,bx,e,bv){return((-Math.cos(bw*Math.PI)/2)+0.5)*bv+e}},timers:[],fx:function(bv,e,bw){this.options=e;this.elem=bv;this.prop=bw;e.orig=e.orig||{}}});b.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(b.fx.step[this.prop]||b.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var e,bv=b.css(this.elem,this.prop);return isNaN(e=parseFloat(bv))?!bv||bv==="auto"?0:bv:e},custom:function(bz,by,bx){var e=this,bw=b.fx;this.startTime=a4||bh();this.end=by;this.now=this.start=bz;this.pos=this.state=0;this.unit=bx||this.unit||(b.cssNumber[this.prop]?"":"px");function bv(bA){return e.step(bA)}bv.queue=this.options.queue;bv.elem=this.elem;bv.saveState=function(){if(e.options.hide&&b._data(e.elem,"fxshow"+e.prop)===L){b._data(e.elem,"fxshow"+e.prop,e.start)}};if(bv()&&b.timers.push(bv)&&!a3){a3=setInterval(bw.tick,bw.interval)}},show:function(){var e=b._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=e||b.style(this.elem,this.prop);this.options.show=true;if(e!==L){this.custom(this.cur(),e)}else{this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur())}b(this.elem).show()},hide:function(){this.options.orig[this.prop]=b._data(this.elem,"fxshow"+this.prop)||b.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(by){var bA,bB,bv,bx=a4||bh(),e=true,bz=this.elem,bw=this.options;if(by||bx>=bw.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();bw.animatedProperties[this.prop]=true;for(bA in bw.animatedProperties){if(bw.animatedProperties[bA]!==true){e=false}}if(e){if(bw.overflow!=null&&!b.support.shrinkWrapBlocks){b.each(["","X","Y"],function(bC,bD){bz.style["overflow"+bD]=bw.overflow[bC]})}if(bw.hide){b(bz).hide()}if(bw.hide||bw.show){for(bA in bw.animatedProperties){b.style(bz,bA,bw.orig[bA]);b.removeData(bz,"fxshow"+bA,true);b.removeData(bz,"toggle"+bA,true)}}bv=bw.complete;if(bv){bw.complete=false;bv.call(bz)}}return false}else{if(bw.duration==Infinity){this.now=bx}else{bB=bx-this.startTime;this.state=bB/bw.duration;this.pos=b.easing[bw.animatedProperties[this.prop]](this.state,bB,0,1,bw.duration);this.now=this.start+((this.end-this.start)*this.pos)}this.update()}return true}};b.extend(b.fx,{tick:function(){var bw,bv=b.timers,e=0;for(;e<bv.length;e++){bw=bv[e];if(!bw()&&bv[e]===bw){bv.splice(e--,1)}}if(!bv.length){b.fx.stop()}},interval:13,stop:function(){clearInterval(a3);a3=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(e){b.style(e.elem,"opacity",e.now)},_default:function(e){if(e.elem.style&&e.elem.style[e.prop]!=null){e.elem.style[e.prop]=e.now+e.unit}else{e.elem[e.prop]=e.now}}}});b.each(["width","height"],function(e,bv){b.fx.step[bv]=function(bw){b.style(bw.elem,bv,Math.max(0,bw.now)+bw.unit)}});if(b.expr&&b.expr.filters){b.expr.filters.animated=function(e){return b.grep(b.timers,function(bv){return e===bv.elem}).length}}function x(bx){if(!Q[bx]){var e=av.body,bv=b("<"+bx+">").appendTo(e),bw=bv.css("display");bv.remove();if(bw==="none"||bw===""){if(!a8){a8=av.createElement("iframe");a8.frameBorder=a8.width=a8.height=0}e.appendChild(a8);if(!m||!a8.createElement){m=(a8.contentWindow||a8.contentDocument).document;m.write((av.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>");m.close()}bv=m.createElement(bx);m.body.appendChild(bv);bw=b.css(bv,"display");e.removeChild(a8)}Q[bx]=bw}return Q[bx]}var V=/^t(?:able|d|h)$/i,ad=/^(?:body|html)$/i;if("getBoundingClientRect" in av.documentElement){b.fn.offset=function(bI){var by=this[0],bB;if(bI){return this.each(function(e){b.offset.setOffset(this,bI,e)})}if(!by||!by.ownerDocument){return null}if(by===by.ownerDocument.body){return b.offset.bodyOffset(by)}try{bB=by.getBoundingClientRect()}catch(bF){}var bH=by.ownerDocument,bw=bH.documentElement;if(!bB||!b.contains(bw,by)){return bB?{top:bB.top,left:bB.left}:{top:0,left:0}}var bC=bH.body,bD=aK(bH),bA=bw.clientTop||bC.clientTop||0,bE=bw.clientLeft||bC.clientLeft||0,bv=bD.pageYOffset||b.support.boxModel&&bw.scrollTop||bC.scrollTop,bz=bD.pageXOffset||b.support.boxModel&&bw.scrollLeft||bC.scrollLeft,bG=bB.top+bv-bA,bx=bB.left+bz-bE;return{top:bG,left:bx}}}else{b.fn.offset=function(bF){var bz=this[0];if(bF){return this.each(function(bG){b.offset.setOffset(this,bF,bG)})}if(!bz||!bz.ownerDocument){return null}if(bz===bz.ownerDocument.body){return b.offset.bodyOffset(bz)}var bC,bw=bz.offsetParent,bv=bz,bE=bz.ownerDocument,bx=bE.documentElement,bA=bE.body,bB=bE.defaultView,e=bB?bB.getComputedStyle(bz,null):bz.currentStyle,bD=bz.offsetTop,by=bz.offsetLeft;while((bz=bz.parentNode)&&bz!==bA&&bz!==bx){if(b.support.fixedPosition&&e.position==="fixed"){break}bC=bB?bB.getComputedStyle(bz,null):bz.currentStyle;bD-=bz.scrollTop;by-=bz.scrollLeft;if(bz===bw){bD+=bz.offsetTop;by+=bz.offsetLeft;if(b.support.doesNotAddBorder&&!(b.support.doesAddBorderForTableAndCells&&V.test(bz.nodeName))){bD+=parseFloat(bC.borderTopWidth)||0;by+=parseFloat(bC.borderLeftWidth)||0}bv=bw;bw=bz.offsetParent}if(b.support.subtractsBorderForOverflowNotVisible&&bC.overflow!=="visible"){bD+=parseFloat(bC.borderTopWidth)||0;by+=parseFloat(bC.borderLeftWidth)||0}e=bC}if(e.position==="relative"||e.position==="static"){bD+=bA.offsetTop;by+=bA.offsetLeft}if(b.support.fixedPosition&&e.position==="fixed"){bD+=Math.max(bx.scrollTop,bA.scrollTop);by+=Math.max(bx.scrollLeft,bA.scrollLeft)}return{top:bD,left:by}}}b.offset={bodyOffset:function(e){var bw=e.offsetTop,bv=e.offsetLeft;if(b.support.doesNotIncludeMarginInBodyOffset){bw+=parseFloat(b.css(e,"marginTop"))||0;bv+=parseFloat(b.css(e,"marginLeft"))||0}return{top:bw,left:bv}},setOffset:function(bx,bG,bA){var bB=b.css(bx,"position");if(bB==="static"){bx.style.position="relative"}var bz=b(bx),bv=bz.offset(),e=b.css(bx,"top"),bE=b.css(bx,"left"),bF=(bB==="absolute"||bB==="fixed")&&b.inArray("auto",[e,bE])>-1,bD={},bC={},bw,by;if(bF){bC=bz.position();bw=bC.top;by=bC.left}else{bw=parseFloat(e)||0;by=parseFloat(bE)||0}if(b.isFunction(bG)){bG=bG.call(bx,bA,bv)}if(bG.top!=null){bD.top=(bG.top-bv.top)+bw}if(bG.left!=null){bD.left=(bG.left-bv.left)+by}if("using" in bG){bG.using.call(bx,bD)}else{bz.css(bD)}}};b.fn.extend({position:function(){if(!this[0]){return null}var bw=this[0],bv=this.offsetParent(),bx=this.offset(),e=ad.test(bv[0].nodeName)?{top:0,left:0}:bv.offset();bx.top-=parseFloat(b.css(bw,"marginTop"))||0;bx.left-=parseFloat(b.css(bw,"marginLeft"))||0;e.top+=parseFloat(b.css(bv[0],"borderTopWidth"))||0;e.left+=parseFloat(b.css(bv[0],"borderLeftWidth"))||0;return{top:bx.top-e.top,left:bx.left-e.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||av.body;while(e&&(!ad.test(e.nodeName)&&b.css(e,"position")==="static")){e=e.offsetParent}return e})}});b.each(["Left","Top"],function(bv,e){var bw="scroll"+e;b.fn[bw]=function(bz){var bx,by;if(bz===L){bx=this[0];if(!bx){return null}by=aK(bx);return by?("pageXOffset" in by)?by[bv?"pageYOffset":"pageXOffset"]:b.support.boxModel&&by.document.documentElement[bw]||by.document.body[bw]:bx[bw]}return this.each(function(){by=aK(this);if(by){by.scrollTo(!bv?bz:b(by).scrollLeft(),bv?bz:b(by).scrollTop())}else{this[bw]=bz}})}});function aK(e){return b.isWindow(e)?e:e.nodeType===9?e.defaultView||e.parentWindow:false}b.each(["Height","Width"],function(bv,e){var bw=e.toLowerCase();b.fn["inner"+e]=function(){var bx=this[0];return bx?bx.style?parseFloat(b.css(bx,bw,"padding")):this[bw]():null};b.fn["outer"+e]=function(by){var bx=this[0];return bx?bx.style?parseFloat(b.css(bx,bw,by?"margin":"border")):this[bw]():null};b.fn[bw]=function(bz){var bA=this[0];if(!bA){return bz==null?null:this}if(b.isFunction(bz)){return this.each(function(bE){var bD=b(this);bD[bw](bz.call(this,bE,bD[bw]()))})}if(b.isWindow(bA)){var bB=bA.document.documentElement["client"+e],bx=bA.document.body;return bA.document.compatMode==="CSS1Compat"&&bB||bx&&bx["client"+e]||bB}else{if(bA.nodeType===9){return Math.max(bA.documentElement["client"+e],bA.body["scroll"+e],bA.documentElement["scroll"+e],bA.body["offset"+e],bA.documentElement["offset"+e])}else{if(bz===L){var bC=b.css(bA,bw),by=parseFloat(bC);return b.isNumeric(by)?by:bC}else{return this.css(bw,typeof bz==="string"?bz:bz+"px")}}}}});bb.jQuery=bb.$=b;if(typeof define==="function"&&define.amd&&define.amd.jQuery){define("jquery",[],function(){return b
-})}})(window);
-/*!
- * jQuery UI 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */
-(function(a,d){a.ui=a.ui||{};if(a.ui.version){return}a.extend(a.ui,{version:"1.8.18",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus:a.fn.focus,focus:function(e,f){return typeof e==="number"?this.each(function(){var g=this;setTimeout(function(){a(g).focus();if(f){f.call(g)}},e)}):this._focus.apply(this,arguments)},scrollParent:function(){var e;if((a.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){e=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(a.curCSS(this,"position",1))&&(/(auto|scroll)/).test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0)}else{e=this.parents().filter(function(){return(/(auto|scroll)/).test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!e.length?a(document):e},zIndex:function(h){if(h!==d){return this.css("zIndex",h)}if(this.length){var f=a(this[0]),e,g;while(f.length&&f[0]!==document){e=f.css("position");if(e==="absolute"||e==="relative"||e==="fixed"){g=parseInt(f.css("zIndex"),10);if(!isNaN(g)&&g!==0){return g}}f=f.parent()}}return 0},disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(e){e.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});a.each(["Width","Height"],function(g,e){var f=e==="Width"?["Left","Right"]:["Top","Bottom"],h=e.toLowerCase(),k={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};function j(m,l,i,n){a.each(f,function(){l-=parseFloat(a.curCSS(m,"padding"+this,true))||0;if(i){l-=parseFloat(a.curCSS(m,"border"+this+"Width",true))||0}if(n){l-=parseFloat(a.curCSS(m,"margin"+this,true))||0}});return l}a.fn["inner"+e]=function(i){if(i===d){return k["inner"+e].call(this)}return this.each(function(){a(this).css(h,j(this,i)+"px")})};a.fn["outer"+e]=function(i,l){if(typeof i!=="number"){return k["outer"+e].call(this,i)}return this.each(function(){a(this).css(h,j(this,i,true,l)+"px")})}});function c(g,e){var j=g.nodeName.toLowerCase();if("area"===j){var i=g.parentNode,h=i.name,f;if(!g.href||!h||i.nodeName.toLowerCase()!=="map"){return false}f=a("img[usemap=#"+h+"]")[0];return !!f&&b(f)}return(/input|select|textarea|button|object/.test(j)?!g.disabled:"a"==j?g.href||e:e)&&b(g)}function b(e){return !a(e).parents().andSelf().filter(function(){return a.curCSS(this,"visibility")==="hidden"||a.expr.filters.hidden(this)}).length}a.extend(a.expr[":"],{data:function(g,f,e){return !!a.data(g,e[3])},focusable:function(e){return c(e,!isNaN(a.attr(e,"tabindex")))},tabbable:function(g){var e=a.attr(g,"tabindex"),f=isNaN(e);return(f||e>=0)&&c(g,!f)}});a(function(){var e=document.body,f=e.appendChild(f=document.createElement("div"));f.offsetHeight;a.extend(f.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});a.support.minHeight=f.offsetHeight===100;a.support.selectstart="onselectstart" in f;e.removeChild(f).style.display="none"});a.extend(a.ui,{plugin:{add:function(f,g,j){var h=a.ui[f].prototype;for(var e in j){h.plugins[e]=h.plugins[e]||[];h.plugins[e].push([g,j[e]])}},call:function(e,g,f){var j=e.plugins[g];if(!j||!e.element[0].parentNode){return}for(var h=0;h<j.length;h++){if(e.options[j[h][0]]){j[h][1].apply(e.element,f)}}}},contains:function(f,e){return document.compareDocumentPosition?f.compareDocumentPosition(e)&16:f!==e&&f.contains(e)},hasScroll:function(h,f){if(a(h).css("overflow")==="hidden"){return false}var e=(f&&f==="left")?"scrollLeft":"scrollTop",g=false;if(h[e]>0){return true}h[e]=1;g=(h[e]>0);h[e]=0;return g},isOverAxis:function(f,e,g){return(f>e)&&(f<(e+g))},isOver:function(j,f,i,h,e,g){return a.ui.isOverAxis(j,i,e)&&a.ui.isOverAxis(f,h,g)}})})(jQuery);/*!
- * jQuery UI Widget 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Widget
- */
-(function(b,d){if(b.cleanData){var c=b.cleanData;b.cleanData=function(f){for(var g=0,h;(h=f[g])!=null;g++){try{b(h).triggerHandler("remove")}catch(j){}}c(f)}}else{var a=b.fn.remove;b.fn.remove=function(e,f){return this.each(function(){if(!f){if(!e||b.filter(e,[this]).length){b("*",this).add([this]).each(function(){try{b(this).triggerHandler("remove")}catch(g){}})}}return a.call(b(this),e,f)})}}b.widget=function(f,h,e){var g=f.split(".")[0],j;f=f.split(".")[1];j=g+"-"+f;if(!e){e=h;h=b.Widget}b.expr[":"][j]=function(k){return !!b.data(k,f)};b[g]=b[g]||{};b[g][f]=function(k,l){if(arguments.length){this._createWidget(k,l)}};var i=new h();i.options=b.extend(true,{},i.options);b[g][f].prototype=b.extend(true,i,{namespace:g,widgetName:f,widgetEventPrefix:b[g][f].prototype.widgetEventPrefix||f,widgetBaseClass:j},e);b.widget.bridge(f,b[g][f])};b.widget.bridge=function(f,e){b.fn[f]=function(i){var g=typeof i==="string",h=Array.prototype.slice.call(arguments,1),j=this;i=!g&&h.length?b.extend.apply(null,[true,i].concat(h)):i;if(g&&i.charAt(0)==="_"){return j}if(g){this.each(function(){var k=b.data(this,f),l=k&&b.isFunction(k[i])?k[i].apply(k,h):k;if(l!==k&&l!==d){j=l;return false}})}else{this.each(function(){var k=b.data(this,f);if(k){k.option(i||{})._init()}else{b.data(this,f,new e(i,this))}})}return j}};b.Widget=function(e,f){if(arguments.length){this._createWidget(e,f)}};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(f,g){b.data(g,this.widgetName,this);this.element=b(g);this.options=b.extend(true,{},this.options,this._getCreateOptions(),f);var e=this;this.element.bind("remove."+this.widgetName,function(){e.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(f,g){var e=f;if(arguments.length===0){return b.extend({},this.options)}if(typeof f==="string"){if(g===d){return this.options[f]}e={};e[f]=g}this._setOptions(e);return this},_setOptions:function(f){var e=this;b.each(f,function(g,h){e._setOption(g,h)});return this},_setOption:function(e,f){this.options[e]=f;if(e==="disabled"){this.widget()[f?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",f)}return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(e,f,g){var j,i,h=this.options[e];g=g||{};f=b.Event(f);f.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase();f.target=this.element[0];i=f.originalEvent;if(i){for(j in i){if(!(j in f)){f[j]=i[j]}}}this.element.trigger(f,g);return !(b.isFunction(h)&&h.call(this.element[0],f,g)===false||f.isDefaultPrevented())}}})(jQuery);/*!
- * jQuery UI Mouse 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Mouse
- *
- * Depends:
- *	jquery.ui.widget.js
- */
-(function(b,c){var a=false;b(document).mouseup(function(d){a=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var d=this;this.element.bind("mousedown."+this.widgetName,function(e){return d._mouseDown(e)}).bind("click."+this.widgetName,function(e){if(true===b.data(e.target,d.widgetName+".preventClickEvent")){b.removeData(e.target,d.widgetName+".preventClickEvent");e.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(f){if(a){return}(this._mouseStarted&&this._mouseUp(f));this._mouseDownEvent=f;var e=this,g=(f.which==1),d=(typeof this.options.cancel=="string"&&f.target.nodeName?b(f.target).closest(this.options.cancel).length:false);if(!g||d||!this._mouseCapture(f)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){e.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(f)&&this._mouseDelayMet(f)){this._mouseStarted=(this._mouseStart(f)!==false);if(!this._mouseStarted){f.preventDefault();return true}}if(true===b.data(f.target,this.widgetName+".preventClickEvent")){b.removeData(f.target,this.widgetName+".preventClickEvent")}this._mouseMoveDelegate=function(h){return e._mouseMove(h)};this._mouseUpDelegate=function(h){return e._mouseUp(h)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);f.preventDefault();a=true;return true},_mouseMove:function(d){if(b.browser.msie&&!(document.documentMode>=9)&&!d.button){return this._mouseUp(d)}if(this._mouseStarted){this._mouseDrag(d);return d.preventDefault()}if(this._mouseDistanceMet(d)&&this._mouseDelayMet(d)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,d)!==false);(this._mouseStarted?this._mouseDrag(d):this._mouseUp(d))}return !this._mouseStarted},_mouseUp:function(d){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;if(d.target==this._mouseDownEvent.target){b.data(d.target,this.widgetName+".preventClickEvent",true)}this._mouseStop(d)}return false},_mouseDistanceMet:function(d){return(Math.max(Math.abs(this._mouseDownEvent.pageX-d.pageX),Math.abs(this._mouseDownEvent.pageY-d.pageY))>=this.options.distance)},_mouseDelayMet:function(d){return this.mouseDelayMet},_mouseStart:function(d){},_mouseDrag:function(d){},_mouseStop:function(d){},_mouseCapture:function(d){return true}})})(jQuery);(function(c,d){c.widget("ui.resizable",c.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1000},_create:function(){var f=this,k=this.options;this.element.addClass("ui-resizable");c.extend(this,{_aspectRatio:!!(k.aspectRatio),aspectRatio:k.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:k.helper||k.ghost||k.animate?k.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){this.element.wrap(c('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=k.handles||(!c(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all"){this.handles="n,e,s,w,se,sw,ne,nw"}var l=this.handles.split(",");this.handles={};for(var g=0;g<l.length;g++){var j=c.trim(l[g]),e="ui-resizable-"+j;var h=c('<div class="ui-resizable-handle '+e+'"></div>');if(/sw|se|ne|nw/.test(j)){h.css({zIndex:++k.zIndex})}if("se"==j){h.addClass("ui-icon ui-icon-gripsmall-diagonal-se")}this.handles[j]=".ui-resizable-"+j;this.element.append(h)}}this._renderAxis=function(q){q=q||this.element;for(var n in this.handles){if(this.handles[n].constructor==String){this.handles[n]=c(this.handles[n],this.element).show()}if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var o=c(this.handles[n],this.element),p=0;p=/sw|ne|nw|se|n|s/.test(n)?o.outerHeight():o.outerWidth();var m=["padding",/ne|nw|n/.test(n)?"Top":/se|sw|s/.test(n)?"Bottom":/^e$/.test(n)?"Right":"Left"].join("");q.css(m,p);this._proportionallyResize()}if(!c(this.handles[n]).length){continue}}};this._renderAxis(this.element);this._handles=c(".ui-resizable-handle",this.element).disableSelection();this._handles.mouseover(function(){if(!f.resizing){if(this.className){var i=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)}f.axis=i&&i[1]?i[1]:"se"}});if(k.autoHide){this._handles.hide();c(this.element).addClass("ui-resizable-autohide").hover(function(){if(k.disabled){return}c(this).removeClass("ui-resizable-autohide");f._handles.show()},function(){if(k.disabled){return}if(!f.resizing){c(this).addClass("ui-resizable-autohide");f._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var e=function(g){c(g).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){e(this.element);var f=this.element;f.after(this.originalElement.css({position:f.css("position"),width:f.outerWidth(),height:f.outerHeight(),top:f.css("top"),left:f.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);e(this.originalElement);return this},_mouseCapture:function(f){var g=false;for(var e in this.handles){if(c(this.handles[e])[0]==f.target){g=true}}return !this.options.disabled&&g},_mouseStart:function(g){var j=this.options,f=this.element.position(),e=this.element;this.resizing=true;this.documentScroll={top:c(document).scrollTop(),left:c(document).scrollLeft()};if(e.is(".ui-draggable")||(/absolute/).test(e.css("position"))){e.css({position:"absolute",top:f.top,left:f.left})}this._renderProxy();var k=b(this.helper.css("left")),h=b(this.helper.css("top"));if(j.containment){k+=c(j.containment).scrollLeft()||0;h+=c(j.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:k,top:h};this.size=this._helper?{width:e.outerWidth(),height:e.outerHeight()}:{width:e.width(),height:e.height()};this.originalSize=this._helper?{width:e.outerWidth(),height:e.outerHeight()}:{width:e.width(),height:e.height()};this.originalPosition={left:k,top:h};this.sizeDiff={width:e.outerWidth()-e.width(),height:e.outerHeight()-e.height()};this.originalMousePosition={left:g.pageX,top:g.pageY};this.aspectRatio=(typeof j.aspectRatio=="number")?j.aspectRatio:((this.originalSize.width/this.originalSize.height)||1);var i=c(".ui-resizable-"+this.axis).css("cursor");c("body").css("cursor",i=="auto"?this.axis+"-resize":i);e.addClass("ui-resizable-resizing");this._propagate("start",g);return true},_mouseDrag:function(e){var h=this.helper,g=this.options,m={},q=this,j=this.originalMousePosition,n=this.axis;var r=(e.pageX-j.left)||0,p=(e.pageY-j.top)||0;var i=this._change[n];if(!i){return false}var l=i.apply(this,[e,r,p]),k=c.browser.msie&&c.browser.version<7,f=this.sizeDiff;this._updateVirtualBoundaries(e.shiftKey);if(this._aspectRatio||e.shiftKey){l=this._updateRatio(l,e)}l=this._respectSize(l,e);this._propagate("resize",e);h.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});if(!this._helper&&this._proportionallyResizeElements.length){this._proportionallyResize()}this._updateCache(l);this._trigger("resize",e,this.ui());return false},_mouseStop:function(h){this.resizing=false;var i=this.options,m=this;if(this._helper){var g=this._proportionallyResizeElements,e=g.length&&(/textarea/i).test(g[0].nodeName),f=e&&c.ui.hasScroll(g[0],"left")?0:m.sizeDiff.height,k=e?0:m.sizeDiff.width;var n={width:(m.helper.width()-k),height:(m.helper.height()-f)},j=(parseInt(m.element.css("left"),10)+(m.position.left-m.originalPosition.left))||null,l=(parseInt(m.element.css("top"),10)+(m.position.top-m.originalPosition.top))||null;if(!i.animate){this.element.css(c.extend(n,{top:l,left:j}))}m.helper.height(m.size.height);m.helper.width(m.size.width);if(this._helper&&!i.animate){this._proportionallyResize()}}c("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",h);if(this._helper){this.helper.remove()}return false},_updateVirtualBoundaries:function(g){var j=this.options,i,h,f,k,e;e={minWidth:a(j.minWidth)?j.minWidth:0,maxWidth:a(j.maxWidth)?j.maxWidth:Infinity,minHeight:a(j.minHeight)?j.minHeight:0,maxHeight:a(j.maxHeight)?j.maxHeight:Infinity};if(this._aspectRatio||g){i=e.minHeight*this.aspectRatio;f=e.minWidth/this.aspectRatio;h=e.maxHeight*this.aspectRatio;k=e.maxWidth/this.aspectRatio;if(i>e.minWidth){e.minWidth=i}if(f>e.minHeight){e.minHeight=f}if(h<e.maxWidth){e.maxWidth=h}if(k<e.maxHeight){e.maxHeight=k}}this._vBoundaries=e},_updateCache:function(e){var f=this.options;this.offset=this.helper.offset();if(a(e.left)){this.position.left=e.left}if(a(e.top)){this.position.top=e.top}if(a(e.height)){this.size.height=e.height}if(a(e.width)){this.size.width=e.width}},_updateRatio:function(h,g){var i=this.options,j=this.position,f=this.size,e=this.axis;if(a(h.height)){h.width=(h.height*this.aspectRatio)}else{if(a(h.width)){h.height=(h.width/this.aspectRatio)}}if(e=="sw"){h.left=j.left+(f.width-h.width);h.top=null}if(e=="nw"){h.top=j.top+(f.height-h.height);h.left=j.left+(f.width-h.width)}return h},_respectSize:function(l,g){var j=this.helper,i=this._vBoundaries,r=this._aspectRatio||g.shiftKey,q=this.axis,t=a(l.width)&&i.maxWidth&&(i.maxWidth<l.width),m=a(l.height)&&i.maxHeight&&(i.maxHeight<l.height),h=a(l.width)&&i.minWidth&&(i.minWidth>l.width),s=a(l.height)&&i.minHeight&&(i.minHeight>l.height);if(h){l.width=i.minWidth}if(s){l.height=i.minHeight}if(t){l.width=i.maxWidth}if(m){l.height=i.maxHeight}var f=this.originalPosition.left+this.originalSize.width,p=this.position.top+this.size.height;var k=/sw|nw|w/.test(q),e=/nw|ne|n/.test(q);if(h&&k){l.left=f-i.minWidth}if(t&&k){l.left=f-i.maxWidth}if(s&&e){l.top=p-i.minHeight}if(m&&e){l.top=p-i.maxHeight}var n=!l.width&&!l.height;if(n&&!l.left&&l.top){l.top=null}else{if(n&&!l.top&&l.left){l.left=null}}return l},_proportionallyResize:function(){var k=this.options;if(!this._proportionallyResizeElements.length){return}var g=this.helper||this.element;for(var f=0;f<this._proportionallyResizeElements.length;f++){var h=this._proportionallyResizeElements[f];if(!this.borderDif){var e=[h.css("borderTopWidth"),h.css("borderRightWidth"),h.css("borderBottomWidth"),h.css("borderLeftWidth")],j=[h.css("paddingTop"),h.css("paddingRight"),h.css("paddingBottom"),h.css("paddingLeft")];this.borderDif=c.map(e,function(l,n){var m=parseInt(l,10)||0,o=parseInt(j[n],10)||0;return m+o})}if(c.browser.msie&&!(!(c(g).is(":hidden")||c(g).parents(":hidden").length))){continue}h.css({height:(g.height()-this.borderDif[0]-this.borderDif[2])||0,width:(g.width()-this.borderDif[1]-this.borderDif[3])||0})}},_renderProxy:function(){var f=this.element,i=this.options;this.elementOffset=f.offset();if(this._helper){this.helper=this.helper||c('<div style="overflow:hidden;"></div>');var e=c.browser.msie&&c.browser.version<7,g=(e?1:0),h=(e?2:-1);this.helper.addClass(this._helper).css({width:this.element.outerWidth()+h,height:this.element.outerHeight()+h,position:"absolute",left:this.elementOffset.left-g+"px",top:this.elementOffset.top-g+"px",zIndex:++i.zIndex});this.helper.appendTo("body").disableSelection()}else{this.helper=this.element}},_change:{e:function(g,f,e){return{width:this.originalSize.width+f}},w:function(h,f,e){var j=this.options,g=this.originalSize,i=this.originalPosition;return{left:i.left+f,width:g.width-f}},n:function(h,f,e){var j=this.options,g=this.originalSize,i=this.originalPosition;return{top:i.top+e,height:g.height-e}},s:function(g,f,e){return{height:this.originalSize.height+e}},se:function(g,f,e){return c.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[g,f,e]))},sw:function(g,f,e){return c.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[g,f,e]))},ne:function(g,f,e){return c.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[g,f,e]))},nw:function(g,f,e){return c.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[g,f,e]))}},_propagate:function(f,e){c.ui.plugin.call(this,f,[e,this.ui()]);(f!="resize"&&this._trigger(f,e,this.ui()))},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});c.extend(c.ui.resizable,{version:"1.8.18"});c.ui.plugin.add("resizable","alsoResize",{start:function(f,g){var e=c(this).data("resizable"),i=e.options;var h=function(j){c(j).each(function(){var k=c(this);k.data("resizable-alsoresize",{width:parseInt(k.width(),10),height:parseInt(k.height(),10),left:parseInt(k.css("left"),10),top:parseInt(k.css("top"),10)})})};if(typeof(i.alsoResize)=="object"&&!i.alsoResize.parentNode){if(i.alsoResize.length){i.alsoResize=i.alsoResize[0];h(i.alsoResize)}else{c.each(i.alsoResize,function(j){h(j)})}}else{h(i.alsoResize)}},resize:function(g,i){var f=c(this).data("resizable"),j=f.options,h=f.originalSize,l=f.originalPosition;var k={height:(f.size.height-h.height)||0,width:(f.size.width-h.width)||0,top:(f.position.top-l.top)||0,left:(f.position.left-l.left)||0},e=function(m,n){c(m).each(function(){var q=c(this),r=c(this).data("resizable-alsoresize"),p={},o=n&&n.length?n:q.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];c.each(o,function(s,u){var t=(r[u]||0)+(k[u]||0);if(t&&t>=0){p[u]=t||null}});q.css(p)})};if(typeof(j.alsoResize)=="object"&&!j.alsoResize.nodeType){c.each(j.alsoResize,function(m,n){e(m,n)})}else{e(j.alsoResize)}},stop:function(e,f){c(this).removeData("resizable-alsoresize")}});c.ui.plugin.add("resizable","animate",{stop:function(i,n){var p=c(this).data("resizable"),j=p.options;var h=p._proportionallyResizeElements,e=h.length&&(/textarea/i).test(h[0].nodeName),f=e&&c.ui.hasScroll(h[0],"left")?0:p.sizeDiff.height,l=e?0:p.sizeDiff.width;var g={width:(p.size.width-l),height:(p.size.height-f)},k=(parseInt(p.element.css("left"),10)+(p.position.left-p.originalPosition.left))||null,m=(parseInt(p.element.css("top"),10)+(p.position.top-p.originalPosition.top))||null;
-p.element.animate(c.extend(g,m&&k?{top:m,left:k}:{}),{duration:j.animateDuration,easing:j.animateEasing,step:function(){var o={width:parseInt(p.element.css("width"),10),height:parseInt(p.element.css("height"),10),top:parseInt(p.element.css("top"),10),left:parseInt(p.element.css("left"),10)};if(h&&h.length){c(h[0]).css({width:o.width,height:o.height})}p._updateCache(o);p._propagate("resize",i)}})}});c.ui.plugin.add("resizable","containment",{start:function(f,r){var t=c(this).data("resizable"),j=t.options,l=t.element;var g=j.containment,k=(g instanceof c)?g.get(0):(/parent/.test(g))?l.parent().get(0):g;if(!k){return}t.containerElement=c(k);if(/document/.test(g)||g==document){t.containerOffset={left:0,top:0};t.containerPosition={left:0,top:0};t.parentData={element:c(document),left:0,top:0,width:c(document).width(),height:c(document).height()||document.body.parentNode.scrollHeight}}else{var n=c(k),i=[];c(["Top","Right","Left","Bottom"]).each(function(p,o){i[p]=b(n.css("padding"+o))});t.containerOffset=n.offset();t.containerPosition=n.position();t.containerSize={height:(n.innerHeight()-i[3]),width:(n.innerWidth()-i[1])};var q=t.containerOffset,e=t.containerSize.height,m=t.containerSize.width,h=(c.ui.hasScroll(k,"left")?k.scrollWidth:m),s=(c.ui.hasScroll(k)?k.scrollHeight:e);t.parentData={element:k,left:q.left,top:q.top,width:h,height:s}}},resize:function(g,q){var t=c(this).data("resizable"),i=t.options,f=t.containerSize,p=t.containerOffset,m=t.size,n=t.position,r=t._aspectRatio||g.shiftKey,e={top:0,left:0},h=t.containerElement;if(h[0]!=document&&(/static/).test(h.css("position"))){e=p}if(n.left<(t._helper?p.left:0)){t.size.width=t.size.width+(t._helper?(t.position.left-p.left):(t.position.left-e.left));if(r){t.size.height=t.size.width/i.aspectRatio}t.position.left=i.helper?p.left:0}if(n.top<(t._helper?p.top:0)){t.size.height=t.size.height+(t._helper?(t.position.top-p.top):t.position.top);if(r){t.size.width=t.size.height*i.aspectRatio}t.position.top=t._helper?p.top:0}t.offset.left=t.parentData.left+t.position.left;t.offset.top=t.parentData.top+t.position.top;var l=Math.abs((t._helper?t.offset.left-e.left:(t.offset.left-e.left))+t.sizeDiff.width),s=Math.abs((t._helper?t.offset.top-e.top:(t.offset.top-p.top))+t.sizeDiff.height);var k=t.containerElement.get(0)==t.element.parent().get(0),j=/relative|absolute/.test(t.containerElement.css("position"));if(k&&j){l-=t.parentData.left}if(l+t.size.width>=t.parentData.width){t.size.width=t.parentData.width-l;if(r){t.size.height=t.size.width/t.aspectRatio}}if(s+t.size.height>=t.parentData.height){t.size.height=t.parentData.height-s;if(r){t.size.width=t.size.height*t.aspectRatio}}},stop:function(f,n){var q=c(this).data("resizable"),g=q.options,l=q.position,m=q.containerOffset,e=q.containerPosition,i=q.containerElement;var j=c(q.helper),r=j.offset(),p=j.outerWidth()-q.sizeDiff.width,k=j.outerHeight()-q.sizeDiff.height;if(q._helper&&!g.animate&&(/relative/).test(i.css("position"))){c(this).css({left:r.left-e.left-m.left,width:p,height:k})}if(q._helper&&!g.animate&&(/static/).test(i.css("position"))){c(this).css({left:r.left-e.left-m.left,width:p,height:k})}}});c.ui.plugin.add("resizable","ghost",{start:function(g,h){var e=c(this).data("resizable"),i=e.options,f=e.size;e.ghost=e.originalElement.clone();e.ghost.css({opacity:0.25,display:"block",position:"relative",height:f.height,width:f.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof i.ghost=="string"?i.ghost:"");e.ghost.appendTo(e.helper)},resize:function(f,g){var e=c(this).data("resizable"),h=e.options;if(e.ghost){e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})}},stop:function(f,g){var e=c(this).data("resizable"),h=e.options;if(e.ghost&&e.helper){e.helper.get(0).removeChild(e.ghost.get(0))}}});c.ui.plugin.add("resizable","grid",{resize:function(e,m){var p=c(this).data("resizable"),h=p.options,k=p.size,i=p.originalSize,j=p.originalPosition,n=p.axis,l=h._aspectRatio||e.shiftKey;h.grid=typeof h.grid=="number"?[h.grid,h.grid]:h.grid;var g=Math.round((k.width-i.width)/(h.grid[0]||1))*(h.grid[0]||1),f=Math.round((k.height-i.height)/(h.grid[1]||1))*(h.grid[1]||1);if(/^(se|s|e)$/.test(n)){p.size.width=i.width+g;p.size.height=i.height+f}else{if(/^(ne)$/.test(n)){p.size.width=i.width+g;p.size.height=i.height+f;p.position.top=j.top-f}else{if(/^(sw)$/.test(n)){p.size.width=i.width+g;p.size.height=i.height+f;p.position.left=j.left-g}else{p.size.width=i.width+g;p.size.height=i.height+f;p.position.top=j.top-f;p.position.left=j.left-g}}}}});var b=function(e){return parseInt(e,10)||0};var a=function(e){return !isNaN(parseInt(e,10))}})(jQuery);/*!
- * jQuery hashchange event - v1.3 - 7/21/2010
- * http://benalman.com/projects/jquery-hashchange-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,e,b){var c="hashchange",h=document,f,g=$.event.special,i=h.documentMode,d="on"+c in e&&(i===b||i>7);function a(j){j=j||location.href;return"#"+j.replace(/^[^#]*#?(.*)$/,"$1")}$.fn[c]=function(j){return j?this.bind(c,j):this.trigger(c)};$.fn[c].delay=50;g[c]=$.extend(g[c],{setup:function(){if(d){return false}$(f.start)},teardown:function(){if(d){return false}$(f.stop)}});f=(function(){var j={},p,m=a(),k=function(q){return q},l=k,o=k;j.start=function(){p||n()};j.stop=function(){p&&clearTimeout(p);p=b};function n(){var r=a(),q=o(m);if(r!==m){l(m=r,q);$(e).trigger(c)}else{if(q!==m){location.href=location.href.replace(/#.*/,"")+q}}p=setTimeout(n,$.fn[c].delay)}$.browser.msie&&!d&&(function(){var q,r;j.start=function(){if(!q){r=$.fn[c].src;r=r&&r+a();q=$('<iframe tabindex="-1" title="empty"/>').hide().one("load",function(){r||l(a());n()}).attr("src",r||"javascript:0").insertAfter("body")[0].contentWindow;h.onpropertychange=function(){try{if(event.propertyName==="title"){q.document.title=h.title}}catch(s){}}}};j.stop=k;o=function(){return a(q.location.href)};l=function(v,s){var u=q.document,t=$.fn[c].domain;if(v!==s){u.title=h.title;u.open();t&&u.write('<script>document.domain="'+t+'"<\/script>');u.close();q.location.hash=v}}})();return j})()})(jQuery,this);
-(function(c){var a=c.scrollTo=function(f,e,d){c(window).scrollTo(f,e,d)};a.defaults={axis:"xy",duration:parseFloat(c.fn.jquery)>=1.3?0:1};a.window=function(d){return c(window)._scrollable()};c.fn._scrollable=function(){return this.map(function(){var e=this,d=!e.nodeName||c.inArray(e.nodeName.toLowerCase(),["iframe","#document","html","body"])!=-1;if(!d){return e}var f=(e.contentWindow||e).document||e.ownerDocument||e;return c.browser.safari||f.compatMode=="BackCompat"?f.body:f.documentElement})};c.fn.scrollTo=function(f,e,d){if(typeof e=="object"){d=e;e=0}if(typeof d=="function"){d={onAfter:d}}if(f=="max"){f=9000000000}d=c.extend({},a.defaults,d);e=e||d.speed||d.duration;d.queue=d.queue&&d.axis.length>1;if(d.queue){e/=2}d.offset=b(d.offset);d.over=b(d.over);return this._scrollable().each(function(){var l=this,j=c(l),k=f,i,g={},m=j.is("html,body");switch(typeof k){case"number":case"string":if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(k)){k=b(k);break}k=c(k,this);case"object":if(k.is||k.style){i=(k=c(k)).offset()}}c.each(d.axis.split(""),function(q,r){var s=r=="x"?"Left":"Top",u=s.toLowerCase(),p="scroll"+s,o=l[p],n=a.max(l,r);if(i){g[p]=i[u]+(m?0:o-j.offset()[u]);if(d.margin){g[p]-=parseInt(k.css("margin"+s))||0;g[p]-=parseInt(k.css("border"+s+"Width"))||0}g[p]+=d.offset[u]||0;if(d.over[u]){g[p]+=k[r=="x"?"width":"height"]()*d.over[u]}}else{var t=k[u];g[p]=t.slice&&t.slice(-1)=="%"?parseFloat(t)/100*n:t}if(/^\d+$/.test(g[p])){g[p]=g[p]<=0?0:Math.min(g[p],n)}if(!q&&d.queue){if(o!=g[p]){h(d.onAfterFirst)}delete g[p]}});h(d.onAfter);function h(n){j.animate(g,e,d.easing,n&&function(){n.call(this,f,d)})}}).end()};a.max=function(j,i){var h=i=="x"?"Width":"Height",e="scroll"+h;if(!c(j).is("html,body")){return j[e]-c(j)[h.toLowerCase()]()}var g="client"+h,f=j.ownerDocument.documentElement,d=j.ownerDocument.body;return Math.max(f[e],d[e])-Math.min(f[g],d[g])};function b(d){return typeof d=="object"?d:{top:d,left:d}}})(jQuery);
diff --git a/docs/html/md__benchmarks.html b/docs/html/md__benchmarks.html
deleted file mode 100644
index 840b81f1f..000000000
--- a/docs/html/md__benchmarks.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Benchmarks</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__benchmarks.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">Benchmarks </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>Comparing against other serialization solutions, running on Windows 7 64bit. We use the LITE runtime for Protocol Buffers (less code / lower overhead), Rapid JSON (one of the fastest C++ JSON parsers around), and pugixml, also one of the fastest XML parsers.</p>
-<p>We also compare against code that doesn't use a serialization library at all (the column "Raw structs"), which is what you get if you write hardcoded code that just writes structs. This is the fastest possible, but of course is not cross platform nor has any kind of forwards / backwards compatibility.</p>
-<p>We compare against Flatbuffers with the binary wire format (as intended), and also with JSON as the wire format with the optional JSON parser (which, using a schema, parses JSON into a binary buffer that can then be accessed as before).</p>
-<p>The benchmark object is a set of about 10 objects containing an array, 4 strings, and a large variety of int/float scalar values of all sizes, meant to be representative of game data, e.g. a scene format.</p>
-<table class="doxtable">
-<tr>
-<th></th><th>FlatBuffers (binary) </th><th>Protocol Buffers LITE </th><th>Rapid JSON </th><th>FlatBuffers (JSON) </th><th>pugixml </th><th>Raw structs  </th></tr>
-<tr>
-<td>Decode + Traverse + Dealloc (1 million times, seconds) </td><td>0.08 </td><td>302 </td><td>583 </td><td>105 </td><td>196 </td><td>0.02 </td></tr>
-<tr>
-<td>Decode / Traverse / Dealloc (breakdown) </td><td>0 / 0.08 / 0 </td><td>220 / 0.15 / 81 </td><td>294 / 0.9 / 287 </td><td>70 / 0.08 / 35 </td><td>41 / 3.9 / 150 </td><td>0 / 0.02 / 0 </td></tr>
-<tr>
-<td>Encode (1 million times, seconds) </td><td>3.2 </td><td>185 </td><td>650 </td><td>169 </td><td>273 </td><td>0.15 </td></tr>
-<tr>
-<td>Wire format size (normal / zlib, bytes) </td><td>344 / 220 </td><td>228 / 174 </td><td>1475 / 322 </td><td>1029 / 298 </td><td>1137 / 341 </td><td>312 / 187 </td></tr>
-<tr>
-<td>Memory needed to store decoded wire (bytes / blocks) </td><td>0 / 0 </td><td>760 / 20 </td><td>65689 / 4 </td><td>328 / 1 </td><td>34194 / 3 </td><td>0 / 0 </td></tr>
-<tr>
-<td>Transient memory allocated during decode (KB) </td><td>0 </td><td>1 </td><td>131 </td><td>4 </td><td>34 </td><td>0 </td></tr>
-<tr>
-<td>Generated source code size (KB) </td><td>4 </td><td>61 </td><td>0 </td><td>4 </td><td>0 </td><td>0 </td></tr>
-<tr>
-<td>Field access in handwritten traversal code </td><td>typed accessors </td><td>typed accessors </td><td>manual error checking </td><td>typed accessors </td><td>manual error checking </td><td>typed but no safety </td></tr>
-<tr>
-<td>Library source code (KB) </td><td>15 </td><td>some subset of 3800 </td><td>87 </td><td>43 </td><td>327 </td><td>0 </td></tr>
-</table>
-<h3>Some other serialization systems we compared against but did not benchmark (yet), in rough order of applicability:</h3>
-<ul>
-<li>Cap'n'Proto promises to reduce Protocol Buffers much like FlatBuffers does, though with a more complicated binary encoding and less flexibility (no optional fields to allow deprecating fields or serializing with missing fields for which defaults exist). It currently also isn't fully cross-platform portable (lack of VS support).</li>
-<li>msgpack: has very minimal forwards/backwards compatibility support when used with the typed C++ interface. Also lacks VS2010 support.</li>
-<li>Thrift: very similar to Protocol Buffers, but appears to be less efficient, and have more dependencies.</li>
-<li>YAML: a superset of JSON and otherwise very similar. Used by e.g. Unity.</li>
-<li>C# comes with built-in serialization functionality, as used by Unity also. Being tied to the language, and having no automatic versioning support limits its applicability.</li>
-<li>Project Anarchy (the free mobile engine by Havok) comes with a serialization system, that however does no automatic versioning (have to code around new fields manually), is very much tied to the rest of the engine, and works without a schema to generate code (tied to your C++ class definition).</li>
-</ul>
-<h3>Code for benchmarks</h3>
-<p>Code for these benchmarks sits in <code>benchmarks/</code> in git branch <code>benchmarks</code>. It sits in its own branch because it has submodule dependencies that the main project doesn't need, and the code standards do not meet those of the main project. Please read <code>benchmarks/cpp/README.txt</code> before working with the code. </p>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/md__building.html b/docs/html/md__building.html
deleted file mode 100644
index 8494f5d56..000000000
--- a/docs/html/md__building.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Building</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__building.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">Building </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>There are project files for Visual Studio and Xcode that should allow you to build the compiler <code>flatc</code>, the samples and the tests out of the box.</p>
-<p>Alternatively, the distribution comes with a <code>cmake</code> file that should allow you to build project/make files for any platform. For details on <code>cmake</code>, see <a href="http://www.cmake.org">http://www.cmake.org</a>. In brief, depending on your platform, use one of e.g.: </p><pre class="fragment">cmake -G "Unix Makefiles"
-cmake -G "Visual Studio 10"
-cmake -G "Xcode"
-</pre><p>Then, build as normal for your platform. This should result in a <code>flatc</code> executable, essential for the next steps. Note that to use clang instead of gcc, you may need to set up your environment variables, e.g. <code>CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake -G "Unix Makefiles"</code>.</p>
-<p>Optionally, run the <code>flattests</code> executable to ensure everything is working correctly on your system. If this fails, please contact us!</p>
-<p>Note that you MUST be in the root of the FlatBuffers distribution when you run 'flattests' (and the samples), or it will fail to load its files.</p>
-<p>Building should also produce two sample executables, <code>sample_binary</code> and <code>sample_text</code>, see the corresponding <code>.cpp</code> file in the samples directory.</p>
-<p>There is an <code>android</code> directory that contains all you need to build the test executable on android (use the included <code>build_apk.sh</code> script, or use <code>ndk_build</code> / <code>adb</code> etc. as usual). Upon running, it will output to the log if tests succeeded or not.</p>
-<p>There is usually no runtime to compile, as the code consists of a single header, <code>include/flatbuffers/flatbuffers.h</code>. You should add the <code>include</code> folder to your include paths. If you wish to be able to load schemas and/or parse text into binary buffers at runtime, you additionally need the other headers in <code>include/flatbuffers</code>. You must also compile/link <code>src/idl_parser.cpp</code> (and <code>src/idl_gen_text.cpp</code> if you also want to be able convert binary to text).</p>
-<p>For applications on Google Play that integrate this library, usage is tracked. This tracking is done automatically using the embedded version string (flatbuffer_version_string), and helps us continue to optimize it. Aside from consuming a few extra bytes in your application binary, it shouldn't affect your application at all. We use this information to let us know if FlatBuffers is useful and if we should continue to invest in it. Since this is open source, you are free to remove the version string but we would appreciate if you would leave it in. </p>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/md__compiler.html b/docs/html/md__compiler.html
deleted file mode 100644
index d82b5b475..000000000
--- a/docs/html/md__compiler.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Using the schema compiler</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__compiler.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">Using the schema compiler </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>Usage: </p><pre class="fragment">flatc [ GENERATOR OPTIONS ] [ -o PATH ] [ -I PATH ] [ -S ] FILES...
-      [ -- FILES...]
-</pre><p>The files are read and parsed in order, and can contain either schemas or data (see below). Data files are processed according to the definitions of the most recent schema specified.</p>
-<p><code>--</code> indicates that the following files are binary files in FlatBuffer format conforming to the schema indicated before it.</p>
-<p>Depending on the flags passed, additional files may be generated for each file processed:</p>
-<p>For any schema input files, one or more generators can be specified:</p>
-<ul>
-<li><code>--cpp</code>, <code>-c</code> : Generate a C++ header for all definitions in this file (as <code>filename_generated.h</code>).</li>
-<li><code>--java</code>, <code>-j</code> : Generate Java code.</li>
-<li><code>--csharp</code>, <code>-n</code> : Generate C# code.</li>
-<li><code>--go</code>, <code>-g</code> : Generate Go code.</li>
-<li><code>--python</code>, <code>-p</code>: Generate Python code.</li>
-<li><code>--javascript</code>, <code>-s</code>: Generate JavaScript code.</li>
-<li><code>--php</code>: Generate PHP code.</li>
-</ul>
-<p>For any data input files:</p>
-<ul>
-<li><code>--binary</code>, <code>-b</code> : If data is contained in this file, generate a <code>filename.bin</code> containing the binary flatbuffer (or a different extension if one is specified in the schema).</li>
-<li><code>--json</code>, <code>-t</code> : If data is contained in this file, generate a <code>filename.json</code> representing the data in the flatbuffer.</li>
-</ul>
-<p>Additional options:</p>
-<ul>
-<li><code>-o PATH</code> : Output all generated files to PATH (either absolute, or relative to the current directory). If omitted, PATH will be the current directory. PATH should end in your systems path separator, e.g. <code>/</code> or <code>\</code>.</li>
-<li><code>-I PATH</code> : when encountering <code>include</code> statements, attempt to load the files from this path. Paths will be tried in the order given, and if all fail (or none are specified) it will try to load relative to the path of the schema file being parsed.</li>
-<li><code>-M</code> : Print make rules for generated files.</li>
-<li><code>--strict-json</code> : Require &amp; generate strict JSON (field names are enclosed in quotes, no trailing commas in tables/vectors). By default, no quotes are required/generated, and trailing commas are allowed.</li>
-<li><code>--defaults-json</code> : Output fields whose value is equal to the default value when writing JSON text.</li>
-<li><code>--no-prefix</code> : Don't prefix enum values in generated C++ by their enum type.</li>
-<li><code>--scoped-enums</code> : Use C++11 style scoped and strongly typed enums in generated C++. This also implies <code>--no-prefix</code>.</li>
-<li><code>--gen-includes</code> : (deprecated), this is the default behavior. If the original behavior is required (no include statements) use <code>--no-includes.</code></li>
-<li><code>--no-includes</code> : Don't generate include statements for included schemas the generated file depends on (C++).</li>
-<li><code>--gen-mutable</code> : Generate additional non-const accessors for mutating FlatBuffers in-place.</li>
-<li><code>--gen-onefile</code> : Generate single output file (useful for C#)</li>
-<li><code>--gen-all</code>: Generate not just code for the current schema files, but for all files it includes as well. If the language uses a single file for output (by default the case for C++ and JS), all code will end up in this one file.</li>
-<li><code>--raw-binary</code> : Allow binaries without a file_indentifier to be read. This may crash flatc given a mismatched schema.</li>
-<li><code>--proto</code>: Expect input files to be .proto files (protocol buffers). Output the corresponding .fbs file. Currently supports: <code>package</code>, <code>message</code>, <code>enum</code>, nested declarations, <code>import</code> (use <code>-I</code> for paths), <code>extend</code>, <code>oneof</code>, <code>group</code>. Does not support, but will skip without error: <code>option</code>, <code>service</code>, <code>extensions</code>, and most everything else.</li>
-<li><code>--schema</code>: Serialize schemas instead of JSON (use with -b). This will output a binary version of the specified schema that itself corresponds to the reflection/reflection.fbs schema. Loading this binary file is the basis for reflection functionality.</li>
-</ul>
-<p>NOTE: short-form options for generators are deprecated, use the long form whenever possible. </p>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/md__cpp_usage.html b/docs/html/md__cpp_usage.html
deleted file mode 100644
index e22feedfc..000000000
--- a/docs/html/md__cpp_usage.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Use in C++</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__cpp_usage.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">Use in C++ </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>Assuming you have written a schema using the above language in say <code>mygame.fbs</code> (FlatBuffer Schema, though the extension doesn't matter), you've generated a C++ header called <code>mygame_generated.h</code> using the compiler (e.g. <code>flatc -c mygame.fbs</code>), you can now start using this in your program by including the header. As noted, this header relies on <code>flatbuffers/flatbuffers.h</code>, which should be in your include path.</p>
-<h3>Writing in C++</h3>
-<p>To start creating a buffer, create an instance of <code>FlatBufferBuilder</code> which will contain the buffer as it grows:</p>
-<div class="fragment"><div class="line">FlatBufferBuilder fbb;</div>
-</div><!-- fragment --><p>Before we serialize a Monster, we need to first serialize any objects that are contained there-in, i.e. we serialize the data tree using depth first, pre-order traversal. This is generally easy to do on any tree structures. For example:</p>
-<div class="fragment"><div class="line"><span class="keyword">auto</span> name = fbb.CreateString(<span class="stringliteral">&quot;MyMonster&quot;</span>);</div>
-<div class="line"></div>
-<div class="line"><span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> inv[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };</div>
-<div class="line"><span class="keyword">auto</span> inventory = fbb.CreateVector(inv, 10);</div>
-</div><!-- fragment --><p><code>CreateString</code> and <code>CreateVector</code> serialize these two built-in datatypes, and return offsets into the serialized data indicating where they are stored, such that <code>Monster</code> below can refer to them.</p>
-<p><code>CreateString</code> can also take an <code>std::string</code>, or a <code>const char *</code> with an explicit length, and is suitable for holding UTF-8 and binary data if needed.</p>
-<p><code>CreateVector</code> can also take an <code>std::vector</code>. The offset it returns is typed, i.e. can only be used to set fields of the correct type below. To create a vector of struct objects (which will be stored as contiguous memory in the buffer, use <code>CreateVectorOfStructs</code> instead.</p>
-<p>To create a vector of nested objects (e.g. tables, strings or other vectors) collect their offsets in a temporary array/vector, then call <code>CreateVector</code> on that (see e.g. the array of strings example in <code>test.cpp</code> <code>CreateFlatBufferTest</code>).</p>
-<div class="fragment"><div class="line">Vec3 vec(1, 2, 3);</div>
-</div><!-- fragment --><p><code>Vec3</code> is the first example of code from our generated header. Structs (unlike tables) translate to simple structs in C++, so we can construct them in a familiar way.</p>
-<p>We have now serialized the non-scalar components of of the monster example, so we could create the monster something like this:</p>
-<div class="fragment"><div class="line"><span class="keyword">auto</span> mloc = CreateMonster(fbb, &amp;vec, 150, 80, name, inventory, Color_Red, 0, Any_NONE);</div>
-</div><!-- fragment --><p>Note that we're passing <code>150</code> for the <code>mana</code> field, which happens to be the default value: this means the field will not actually be written to the buffer, since we'll get that value anyway when we query it. This is a nice space savings, since it is very common for fields to be at their default. It means we also don't need to be scared to add fields only used in a minority of cases, since they won't bloat up the buffer sizes if they're not actually used.</p>
-<p>We do something similarly for the union field <code>test</code> by specifying a <code>0</code> offset and the <code>NONE</code> enum value (part of every union) to indicate we don't actually want to write this field. You can use <code>0</code> also as a default for other non-scalar types, such as strings, vectors and tables. To pass an actual table, pass a preconstructed table as <code>mytable.Union()</code> that corresponds to union enum you're passing.</p>
-<p>Tables (like <code>Monster</code>) give you full flexibility on what fields you write (unlike <code>Vec3</code>, which always has all fields set because it is a <code>struct</code>). If you want even more control over this (i.e. skip fields even when they are not default), instead of the convenient <code>CreateMonster</code> call we can also build the object field-by-field manually:</p>
-<div class="fragment"><div class="line">MonsterBuilder mb(fbb);</div>
-<div class="line">mb.add_pos(&amp;vec);</div>
-<div class="line">mb.add_hp(80);</div>
-<div class="line">mb.add_name(name);</div>
-<div class="line">mb.add_inventory(inventory);</div>
-<div class="line"><span class="keyword">auto</span> mloc = mb.Finish();</div>
-</div><!-- fragment --><p>We start with a temporary helper class <code>MonsterBuilder</code> (which is defined in our generated code also), then call the various <code>add_</code> methods to set fields, and <code>Finish</code> to complete the object. This is pretty much the same code as you find inside <code>CreateMonster</code>, except we're leaving out a few fields. Fields may also be added in any order, though orderings with fields of the same size adjacent to each other most efficient in size, due to alignment. You should not nest these Builder classes (serialize your data in pre-order).</p>
-<p>Regardless of whether you used <code>CreateMonster</code> or <code>MonsterBuilder</code>, you now have an offset to the root of your data, and you can finish the buffer using:</p>
-<div class="fragment"><div class="line">FinishMonsterBuffer(fbb, mloc);</div>
-</div><!-- fragment --><p>The buffer is now ready to be stored somewhere, sent over the network, be compressed, or whatever you'd like to do with it. You can access the start of the buffer with <code>fbb.GetBufferPointer()</code>, and it's size from <code>fbb.GetSize()</code>.</p>
-<p>Calling code may take ownership of the buffer with <code>fbb.ReleaseBufferPointer()</code>. Should you do it, the <code>FlatBufferBuilder</code> will be in an invalid state, and <em>must</em> be cleared before it can be used again. However, it also means you are able to destroy the builder while keeping the buffer in your application.</p>
-<p><code>samples/sample_binary.cpp</code> is a complete code sample similar to the code above, that also includes the reading code below.</p>
-<h3>Reading in C++</h3>
-<p>If you've received a buffer from somewhere (disk, network, etc.) you can directly start traversing it using:</p>
-<div class="fragment"><div class="line"><span class="keyword">auto</span> monster = GetMonster(buffer_pointer);</div>
-</div><!-- fragment --><p><code>monster</code> is of type <code>Monster *</code>, and points to somewhere <em>inside</em> your buffer (root object pointers are not the same as <code>buffer_pointer</code> !). If you look in your generated header, you'll see it has convenient accessors for all fields, e.g.</p>
-<div class="fragment"><div class="line">assert(monster-&gt;hp() == 80);</div>
-<div class="line">assert(monster-&gt;mana() == 150);  <span class="comment">// default</span></div>
-<div class="line">assert(strcmp(monster-&gt;name()-&gt;c_str(), <span class="stringliteral">&quot;MyMonster&quot;</span>) == 0);</div>
-</div><!-- fragment --><p>These should all be true. Note that we never stored a <code>mana</code> value, so it will return the default.</p>
-<p>To access sub-objects, in this case the <code>Vec3</code>:</p>
-<div class="fragment"><div class="line"><span class="keyword">auto</span> pos = monster-&gt;pos();</div>
-<div class="line">assert(pos);</div>
-<div class="line">assert(pos-&gt;z() == 3);</div>
-</div><!-- fragment --><p>If we had not set the <code>pos</code> field during serialization, it would be <code>NULL</code>.</p>
-<p>Similarly, we can access elements of the inventory array:</p>
-<div class="fragment"><div class="line"><span class="keyword">auto</span> inv = monster-&gt;inventory();</div>
-<div class="line">assert(inv);</div>
-<div class="line">assert(inv-&gt;Get(9) == 9);</div>
-</div><!-- fragment --><h3>Mutating FlatBuffers</h3>
-<p>As you saw above, typically once you have created a FlatBuffer, it is read-only from that moment on. There are however cases where you have just received a FlatBuffer, and you'd like to modify something about it before sending it on to another recipient. With the above functionality, you'd have to generate an entirely new FlatBuffer, while tracking what you modify in your own data structures. This is inconvenient.</p>
-<p>For this reason FlatBuffers can also be mutated in-place. While this is great for making small fixes to an existing buffer, you generally want to create buffers from scratch whenever possible, since it is much more efficient and the API is much more general purpose.</p>
-<p>To get non-const accessors, invoke <code>flatc</code> with <code>--gen-mutable</code>.</p>
-<p>Similar to the reading API above, you now can:</p>
-<div class="fragment"><div class="line"><span class="keyword">auto</span> monster = GetMutableMonster(buffer_pointer);  <span class="comment">// non-const</span></div>
-<div class="line">monster-&gt;mutate_hp(10);                      <span class="comment">// Set table field.</span></div>
-<div class="line">monster-&gt;mutable_pos()-&gt;mutate_z(4);         <span class="comment">// Set struct field.</span></div>
-<div class="line">monster-&gt;mutable_inventory()-&gt;Mutate(0, 1);  <span class="comment">// Set vector element.</span></div>
-</div><!-- fragment --><p>We use the somewhat verbose term <code>mutate</code> instead of <code>set</code> to indicate that this is a special use case, not to be confused with the default way of constructing FlatBuffer data.</p>
-<p>After the above mutations, you can send on the FlatBuffer to a new recipient without any further work!</p>
-<p>Note that any <code>mutate_</code> functions on tables return a bool, which is false if the field we're trying to set isn't present in the buffer. Fields are not present if they weren't set, or even if they happen to be equal to the default value. For example, in the creation code above we set the <code>mana</code> field to <code>150</code>, which is the default value, so it was never stored in the buffer. Trying to call mutate_mana() on such data will return false, and the value won't actually be modified!</p>
-<p>One way to solve this is to call <code>ForceDefaults()</code> on a <code>FlatBufferBuilder</code> to force all fields you set to actually be written. This of course increases the size of the buffer somewhat, but this may be acceptable for a mutable buffer.</p>
-<p>Alternatively, you can use the more powerful reflection functionality:</p>
-<h3>Reflection (&amp; Resizing)</h3>
-<p>If the above ways of accessing a buffer are still too static for you, there is experimental support for reflection in FlatBuffers, allowing you to read and write data even if you don't know the exact format of a buffer, and even allows you to change sizes of strings and vectors in-place.</p>
-<p>The way this works is very elegant, there is actually a FlatBuffer schema that describes schemas (!) which you can find in <code>reflection/reflection.fbs</code>. The compiler <code>flatc</code> can write out any schemas it has just parsed as a binary FlatBuffer, corresponding to this meta-schema.</p>
-<p>Loading in one of these binary schemas at runtime allows you traverse any FlatBuffer data that corresponds to it without knowing the exact format. You can query what fields are present, and then read/write them after.</p>
-<p>For convenient field manipulation, you can include the header <code>flatbuffers/reflection.h</code> which includes both the generated code from the meta schema, as well as a lot of helper functions.</p>
-<p>And example of usage for the moment you can find in <code>test.cpp/ReflectionTest()</code>.</p>
-<h3>Storing maps / dictionaries in a FlatBuffer</h3>
-<p>FlatBuffers doesn't support maps natively, but there is support to emulate their behavior with vectors and binary search, which means you can have fast lookups directly from a FlatBuffer without having to unpack your data into a <code>std::map</code> or similar.</p>
-<p>To use it:</p><ul>
-<li>Designate one of the fields in a table as they "key" field. You do this by setting the <code>key</code> attribute on this field, e.g. <code>name:string (key)</code>. You may only have one key field, and it must be of string or scalar type.</li>
-<li>Write out tables of this type as usual, collect their offsets in an array or vector.</li>
-<li>Instead of <code>CreateVector</code>, call <code>CreateVectorOfSortedTables</code>, which will first sort all offsets such that the tables they refer to are sorted by the key field, then serialize it.</li>
-<li>Now when you're accessing the FlatBuffer, you can use <code>Vector::LookupByKey</code> instead of just <code>Vector::Get</code> to access elements of the vector, e.g.: <code>myvector-&gt;LookupByKey("Fred")</code>, which returns a pointer to the corresponding table type, or <code>nullptr</code> if not found. <code>LookupByKey</code> performs a binary search, so should have a similar speed to <code>std::map</code>, though may be faster because of better caching. <code>LookupByKey</code> only works if the vector has been sorted, it will likely not find elements if it hasn't been sorted.</li>
-</ul>
-<h3>Direct memory access</h3>
-<p>As you can see from the above examples, all elements in a buffer are accessed through generated accessors. This is because everything is stored in little endian format on all platforms (the accessor performs a swap operation on big endian machines), and also because the layout of things is generally not known to the user.</p>
-<p>For structs, layout is deterministic and guaranteed to be the same accross platforms (scalars are aligned to their own size, and structs themselves to their largest member), and you are allowed to access this memory directly by using <code>sizeof()</code> and <code>memcpy</code> on the pointer to a struct, or even an array of structs.</p>
-<p>To compute offsets to sub-elements of a struct, make sure they are a structs themselves, as then you can use the pointers to figure out the offset without having to hardcode it. This is handy for use of arrays of structs with calls like <code>glVertexAttribPointer</code> in OpenGL or similar APIs.</p>
-<p>It is important to note is that structs are still little endian on all machines, so only use tricks like this if you can guarantee you're not shipping on a big endian machine (an <code>assert(FLATBUFFERS_LITTLEENDIAN)</code> would be wise).</p>
-<h3>Access of untrusted buffers</h3>
-<p>The generated accessor functions access fields over offsets, which is very quick. These offsets are not verified at run-time, so a malformed buffer could cause a program to crash by accessing random memory.</p>
-<p>When you're processing large amounts of data from a source you know (e.g. your own generated data on disk), this is acceptable, but when reading data from the network that can potentially have been modified by an attacker, this is undesirable.</p>
-<p>For this reason, you can optionally use a buffer verifier before you access the data. This verifier will check all offsets, all sizes of fields, and null termination of strings to ensure that when a buffer is accessed, all reads will end up inside the buffer.</p>
-<p>Each root type will have a verification function generated for it, e.g. for <code>Monster</code>, you can call:</p>
-<div class="fragment"><div class="line"><span class="keywordtype">bool</span> ok = VerifyMonsterBuffer(Verifier(buf, len));</div>
-</div><!-- fragment --><p>if <code>ok</code> is true, the buffer is safe to read.</p>
-<p>Besides untrusted data, this function may be useful to call in debug mode, as extra insurance against data being corrupted somewhere along the way.</p>
-<p>While verifying a buffer isn't "free", it is typically faster than a full traversal (since any scalar data is not actually touched), and since it may cause the buffer to be brought into cache before reading, the actual overhead may be even lower than expected.</p>
-<p>In specialized cases where a denial of service attack is possible, the verifier has two additional constructor arguments that allow you to limit the nesting depth and total amount of tables the verifier may encounter before declaring the buffer malformed. The default is <code>Verifier(buf, len, 64 /* max depth */, 1000000, /* max tables */)</code> which should be sufficient for most uses.</p>
-<h2>Text &amp; schema parsing</h2>
-<p>Using binary buffers with the generated header provides a super low overhead use of FlatBuffer data. There are, however, times when you want to use text formats, for example because it interacts better with source control, or you want to give your users easy access to data.</p>
-<p>Another reason might be that you already have a lot of data in JSON format, or a tool that generates JSON, and if you can write a schema for it, this will provide you an easy way to use that data directly.</p>
-<p>(see the schema documentation for some specifics on the JSON format accepted).</p>
-<p>There are two ways to use text formats:</p>
-<h3>Using the compiler as a conversion tool</h3>
-<p>This is the preferred path, as it doesn't require you to add any new code to your program, and is maximally efficient since you can ship with binary data. The disadvantage is that it is an extra step for your users/developers to perform, though you might be able to automate it. </p><pre class="fragment">flatc -b myschema.fbs mydata.json
-</pre><p>This will generate the binary file <code>mydata_wire.bin</code> which can be loaded as before.</p>
-<h3>Making your program capable of loading text directly</h3>
-<p>This gives you maximum flexibility. You could even opt to support both, i.e. check for both files, and regenerate the binary from text when required, otherwise just load the binary.</p>
-<p>This option is currently only available for C++, or Java through JNI.</p>
-<p>As mentioned in the section "Building" above, this technique requires you to link a few more files into your program, and you'll want to include <code>flatbuffers/idl.h</code>.</p>
-<p>Load text (either a schema or json) into an in-memory buffer (there is a convenient <code>LoadFile()</code> utility function in <code>flatbuffers/util.h</code> if you wish). Construct a parser:</p>
-<div class="fragment"><div class="line">flatbuffers::Parser parser;</div>
-</div><!-- fragment --><p>Now you can parse any number of text files in sequence:</p>
-<div class="fragment"><div class="line">parser.Parse(text_file.c_str());</div>
-</div><!-- fragment --><p>This works similarly to how the command-line compiler works: a sequence of files parsed by the same <code>Parser</code> object allow later files to reference definitions in earlier files. Typically this means you first load a schema file (which populates <code>Parser</code> with definitions), followed by one or more JSON files.</p>
-<p>As optional argument to <code>Parse</code>, you may specify a null-terminated list of include paths. If not specified, any include statements try to resolve from the current directory.</p>
-<p>If there were any parsing errors, <code>Parse</code> will return <code>false</code>, and <code>Parser::err</code> contains a human readable error string with a line number etc, which you should present to the creator of that file.</p>
-<p>After each JSON file, the <code>Parser::fbb</code> member variable is the <code>FlatBufferBuilder</code> that contains the binary buffer version of that file, that you can access as described above.</p>
-<p><code>samples/sample_text.cpp</code> is a code sample showing the above operations.</p>
-<h3>Threading</h3>
-<p>Reading a FlatBuffer does not touch any memory outside the original buffer, and is entirely read-only (all const), so is safe to access from multiple threads even without synchronisation primitives.</p>
-<p>Creating a FlatBuffer is not thread safe. All state related to building a FlatBuffer is contained in a FlatBufferBuilder instance, and no memory outside of it is touched. To make this thread safe, either do not share instances of FlatBufferBuilder between threads (recommended), or manually wrap it in synchronisation primites. There's no automatic way to accomplish this, by design, as we feel multithreaded construction of a single buffer will be rare, and synchronisation overhead would be costly. </p>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/md__go_usage.html b/docs/html/md__go_usage.html
deleted file mode 100644
index 7dab4e911..000000000
--- a/docs/html/md__go_usage.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Use in Go</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__go_usage.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">Use in Go </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>There's experimental support for reading FlatBuffers in Go. Generate code for Go with the <code>-g</code> option to <code>flatc</code>.</p>
-<p>See <code>go_test.go</code> for an example. You import the generated code, read a FlatBuffer binary file into a <code>[]byte</code>, which you pass to the <code>GetRootAsMonster</code> function:</p>
-<div class="fragment"><div class="line"><span class="keyword">import</span> (</div>
-<div class="line">   example <span class="stringliteral">&quot;MyGame/Example&quot;</span></div>
-<div class="line">   flatbuffers <span class="stringliteral">&quot;github.com/google/flatbuffers/go&quot;</span></div>
-<div class="line"></div>
-<div class="line">   io/ioutil</div>
-<div class="line">)</div>
-<div class="line"></div>
-<div class="line">buf, err := ioutil.ReadFile(<span class="stringliteral">&quot;monster.dat&quot;</span>)</div>
-<div class="line"><span class="comment">// handle err</span></div>
-<div class="line">monster := example.GetRootAsMonster(buf, 0)</div>
-</div><!-- fragment --><p>Now you can access values like this:</p>
-<div class="fragment"><div class="line">hp := monster.Hp()</div>
-<div class="line">pos := monster.Pos(nil)</div>
-</div><!-- fragment --><p>Note that whenever you access a new object like in the <code>Pos</code> example above, a new temporary accessor object gets created. If your code is very performance sensitive (you iterate through a lot of objects), you can replace nil with a pointer to a <code>Vec3</code> object you've already created. This allows you to reuse it across many calls and reduce the amount of object allocation (and thus garbage collection) your program does.</p>
-<p>To access vectors you pass an extra index to the vector field accessor. Then a second method with the same name suffixed by <code>Length</code> let's you know the number of elements you can access:</p>
-<div class="fragment"><div class="line"><span class="keywordflow">for</span> i := 0; i &lt; monster.InventoryLength(); i++ {</div>
-<div class="line">    monster.Inventory(i) <span class="comment">// do something here</span></div>
-<div class="line">}</div>
-</div><!-- fragment --><p>You can also construct these buffers in Go using the functions found in the generated code, and the FlatBufferBuilder class:</p>
-<div class="fragment"><div class="line">builder := flatbuffers.NewBuilder(0)</div>
-</div><!-- fragment --><p>Create strings:</p>
-<div class="fragment"><div class="line">str := builder.CreateString(<span class="stringliteral">&quot;MyMonster&quot;</span>)</div>
-</div><!-- fragment --><p>Create a table with a struct contained therein:</p>
-<div class="fragment"><div class="line">example.MonsterStart(builder)</div>
-<div class="line">example.MonsterAddPos(builder, example.CreateVec3(builder, 1.0, 2.0, 3.0, 3.0, 4, 5, 6))</div>
-<div class="line">example.MonsterAddHp(builder, 80)</div>
-<div class="line">example.MonsterAddName(builder, str)</div>
-<div class="line">example.MonsterAddInventory(builder, inv)</div>
-<div class="line">example.MonsterAddTest_Type(builder, 1)</div>
-<div class="line">example.MonsterAddTest(builder, mon2)</div>
-<div class="line">example.MonsterAddTest4(builder, test4s)</div>
-<div class="line">mon := example.MonsterEnd(builder)</div>
-</div><!-- fragment --><p>Unlike C++, Go does not support table creation functions like 'createMonster()'. This is to create the buffer without using temporary object allocation (since the <code>Vec3</code> is an inline component of <code>Monster</code>, it has to be created right where it is added, whereas the name and the inventory are not inline, and <b>must</b> be created outside of the table creation sequence). Structs do have convenient methods that allow you to construct them in one call. These also have arguments for nested structs, e.g. if a struct has a field <code>a</code> and a nested struct field <code>b</code> (which has fields <code>c</code> and <code>d</code>), then the arguments will be <code>a</code>, <code>c</code> and <code>d</code>.</p>
-<p>Vectors also use this start/end pattern to allow vectors of both scalar types and structs:</p>
-<div class="fragment"><div class="line">example.MonsterStartInventoryVector(builder, 5)</div>
-<div class="line"><span class="keywordflow">for</span> i := 4; i &gt;= 0; i-- {</div>
-<div class="line">    builder.PrependByte(byte(i))</div>
-<div class="line">}</div>
-<div class="line">inv := builder.EndVector(5)</div>
-</div><!-- fragment --><p>The generated method 'StartInventoryVector' is provided as a convenience function which calls 'StartVector' with the correct element size of the vector type which in this case is 'ubyte' or 1 byte per vector element. You pass the number of elements you want to write. You write the elements backwards since the buffer is being constructed back to front. Use the correct <code>Prepend</code> call for the type, or <code>PrependUOffsetT</code> for offsets. You then pass <code>inv</code> to the corresponding <code>Add</code> call when you construct the table containing it afterwards.</p>
-<p>There are <code>Prepend</code> functions for all the scalar types. You use <code>PrependUOffset</code> for any previously constructed objects (such as other tables, strings, vectors). For structs, you use the appropriate <code>create</code> function in-line, as shown above in the <code>Monster</code> example.</p>
-<p>Once you're done constructing a buffer, you call <code>Finish</code> with the root object offset (<code>mon</code> in the example above). Your data now resides in Builder.Bytes. Important to note is that the real data starts at the index indicated by Head(), for Offset() bytes (this is because the buffer is constructed backwards). If you wanted to read the buffer right after creating it (using <code>GetRootAsMonster</code> above), the second argument, instead of <code>0</code> would thus also be <code>Head()</code>.</p>
-<h2>Text Parsing</h2>
-<p>There currently is no support for parsing text (Schema's and JSON) directly from Go, though you could use the C++ parser through cgo. Please see the C++ documentation for more on text parsing. </p>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/md__grammar.html b/docs/html/md__grammar.html
deleted file mode 100644
index 557a95009..000000000
--- a/docs/html/md__grammar.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Grammar of the schema language</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__grammar.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">Grammar of the schema language </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>schema = include* ( namespace_decl | type_decl | enum_decl | root_decl | file_extension_decl | file_identifier_decl | attribute_decl | object )*</p>
-<p>include = <code>include</code> string_constant <code>;</code></p>
-<p>namespace_decl = <code>namespace</code> ident ( <code>.</code> ident )* <code>;</code></p>
-<p>attribute_decl = <code>attribute</code> string_constant <code>;</code></p>
-<p>type_decl = ( <code>table</code> | <code>struct</code> ) ident metadata <code>{</code> field_decl+ <code>}</code></p>
-<p>enum_decl = ( <code>enum</code> | <code>union</code> ) ident [ <code>:</code> type ] metadata <code>{</code> commasep( enumval_decl ) <code>}</code></p>
-<p>root_decl = <code>root_type</code> ident <code>;</code></p>
-<p>field_decl = ident <code>:</code> type [ <code>=</code> scalar ] metadata <code>;</code></p>
-<p>type = <code>bool</code> | <code>byte</code> | <code>ubyte</code> | <code>short</code> | <code>ushort</code> | <code>int</code> | <code>uint</code> | <code>float</code> | <code>long</code> | <code>ulong</code> | <code>double</code> | <code>string</code> | <code>[</code> type <code>]</code> | ident</p>
-<p>enumval_decl = ident [ <code>=</code> integer_constant ]</p>
-<p>metadata = [ <code>(</code> commasep( ident [ <code>:</code> single_value ] ) <code>)</code> ]</p>
-<p>scalar = integer_constant | float_constant</p>
-<p>object = { commasep( ident <code>:</code> value ) }</p>
-<p>single_value = scalar | string_constant</p>
-<p>value = single_value | object | <code>[</code> commasep( value ) <code>]</code></p>
-<p>commasep(x) = [ x ( <code>,</code> x )* ]</p>
-<p>file_extension_decl = <code>file_extension</code> string_constant <code>;</code></p>
-<p>file_identifier_decl = <code>file_identifier</code> string_constant <code>;</code></p>
-<p>integer_constant = -?[0-9]+ | <code>true</code> | <code>false</code></p>
-<p>float_constant = -?[0-9]+.[0-9]+((e|E)(+|-)?[0-9]+)? </p>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/md__internals.html b/docs/html/md__internals.html
deleted file mode 100644
index 34168da03..000000000
--- a/docs/html/md__internals.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: FlatBuffer Internals</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__internals.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">FlatBuffer Internals </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>This section is entirely optional for the use of FlatBuffers. In normal usage, you should never need the information contained herein. If you're interested however, it should give you more of an appreciation of why FlatBuffers is both efficient and convenient.</p>
-<h3>Format components</h3>
-<p>A FlatBuffer is a binary file and in-memory format consisting mostly of scalars of various sizes, all aligned to their own size. Each scalar is also always represented in little-endian format, as this corresponds to all commonly used CPUs today. FlatBuffers will also work on big-endian machines, but will be slightly slower because of additional byte-swap intrinsics.</p>
-<p>On purpose, the format leaves a lot of details about where exactly things live in memory undefined, e.g. fields in a table can have any order, and objects to some extend can be stored in many orders. This is because the format doesn't need this information to be efficient, and it leaves room for optimization and extension (for example, fields can be packed in a way that is most compact). Instead, the format is defined in terms of offsets and adjacency only. This may mean two different implementations may produce different binaries given the same input values, and this is perfectly valid.</p>
-<h3>Format identification</h3>
-<p>The format also doesn't contain information for format identification and versioning, which is also by design. FlatBuffers is a statically typed system, meaning the user of a buffer needs to know what kind of buffer it is. FlatBuffers can of course be wrapped inside other containers where needed, or you can use its union feature to dynamically identify multiple possible sub-objects stored. Additionally, it can be used together with the schema parser if full reflective capabilities are desired.</p>
-<p>Versioning is something that is intrinsically part of the format (the optionality / extensibility of fields), so the format itself does not need a version number (it's a meta-format, in a sense). We're hoping that this format can accommodate all data needed. If format breaking changes are ever necessary, it would become a new kind of format rather than just a variation.</p>
-<h3>Offsets</h3>
-<p>The most important and generic offset type (see <code>flatbuffers.h</code>) is <code>uoffset_t</code>, which is currently always a <code>uint32_t</code>, and is used to refer to all tables/unions/strings/vectors (these are never stored in-line). 32bit is intentional, since we want to keep the format binary compatible between 32 and 64bit systems, and a 64bit offset would bloat the size for almost all uses. A version of this format with 64bit (or 16bit) offsets is easy to set when needed. Unsigned means they can only point in one direction, which typically is forward (towards a higher memory location). Any backwards offsets will be explicitly marked as such.</p>
-<p>The format starts with an <code>uoffset_t</code> to the root object in the buffer.</p>
-<p>We have two kinds of objects, structs and tables.</p>
-<h3>Structs</h3>
-<p>These are the simplest, and as mentioned, intended for simple data that benefits from being extra efficient and doesn't need versioning / extensibility. They are always stored inline in their parent (a struct, table, or vector) for maximum compactness. Structs define a consistent memory layout where all components are aligned to their size, and structs aligned to their largest scalar member. This is done independent of the alignment rules of the underlying compiler to guarantee a cross platform compatible layout. This layout is then enforced in the generated code.</p>
-<h3>Tables</h3>
-<p>Unlike structs, these are not stored in inline in their parent, but are referred to by offset.</p>
-<p>They start with an <code>soffset_t</code> to a vtable. This is a signed version of <code>uoffset_t</code>, since vtables may be stored anywhere relative to the object. This offset is substracted (not added) from the object start to arrive at the vtable start. This offset is followed by all the fields as aligned scalars (or offsets). Unlike structs, not all fields need to be present. There is no set order and layout.</p>
-<p>To be able to access fields regardless of these uncertainties, we go through a vtable of offsets. Vtables are shared between any objects that happen to have the same vtable values.</p>
-<p>The elements of a vtable are all of type <code>voffset_t</code>, which is a <code>uint16_t</code>. The first element is the size of the vtable in bytes, including the size element. The second one is the size of the object, in bytes (including the vtable offset). This size could be used for streaming, to know how many bytes to read to be able to access all <em>inline</em> fields of the object. The remaining elements are the N offsets, where N is the amount of fields declared in the schema when the code that constructed this buffer was compiled (thus, the size of the table is N + 2).</p>
-<p>All accessor functions in the generated code for tables contain the offset into this table as a constant. This offset is checked against the first field (the number of elements), to protect against newer code reading older data. If this offset is out of range, or the vtable entry is 0, that means the field is not present in this object, and the default value is return. Otherwise, the entry is used as offset to the field to be read.</p>
-<h3>Strings and Vectors</h3>
-<p>Strings are simply a vector of bytes, and are always null-terminated. Vectors are stored as contiguous aligned scalar elements prefixed by a 32bit element count (not including any null termination). Neither is stored inline in their parent, but are referred to by offset.</p>
-<h3>Construction</h3>
-<p>The current implementation constructs these buffers backwards (starting at the highest memory address of the buffer), since that significantly reduces the amount of bookkeeping and simplifies the construction API.</p>
-<h3>Code example</h3>
-<p>Here's an example of the code that gets generated for the <code>samples/monster.fbs</code>. What follows is the entire file, broken up by comments: </p><pre class="fragment">// automatically generated, do not modify
-
-#include "flatbuffers/flatbuffers.h"
-
-namespace MyGame {
-namespace Sample {
-</pre><p>Nested namespace support. </p><pre class="fragment">enum {
-  Color_Red = 0,
-  Color_Green = 1,
-  Color_Blue = 2,
-};
-
-inline const char **EnumNamesColor() {
-  static const char *names[] = { "Red", "Green", "Blue", nullptr };
-  return names;
-}
-
-inline const char *EnumNameColor(int e) { return EnumNamesColor()[e]; }
-</pre><p>Enums and convenient reverse lookup. </p><pre class="fragment">enum {
-  Any_NONE = 0,
-  Any_Monster = 1,
-};
-
-inline const char **EnumNamesAny() {
-  static const char *names[] = { "NONE", "Monster", nullptr };
-  return names;
-}
-
-inline const char *EnumNameAny(int e) { return EnumNamesAny()[e]; }
-</pre><p>Unions share a lot with enums. </p><pre class="fragment">struct Vec3;
-struct Monster;
-</pre><p>Predeclare all data types since circular references between types are allowed (circular references between object are not, though). </p><pre class="fragment">MANUALLY_ALIGNED_STRUCT(4) Vec3 {
- private:
-  float x_;
-  float y_;
-  float z_;
-
- public:
-  Vec3(float x, float y, float z)
-    : x_(flatbuffers::EndianScalar(x)), y_(flatbuffers::EndianScalar(y)), z_(flatbuffers::EndianScalar(z)) {}
-
-  float x() const { return flatbuffers::EndianScalar(x_); }
-  float y() const { return flatbuffers::EndianScalar(y_); }
-  float z() const { return flatbuffers::EndianScalar(z_); }
-};
-STRUCT_END(Vec3, 12);
-</pre><p>These ugly macros do a couple of things: they turn off any padding the compiler might normally do, since we add padding manually (though none in this example), and they enforce alignment chosen by FlatBuffers. This ensures the layout of this struct will look the same regardless of compiler and platform. Note that the fields are private: this is because these store little endian scalars regardless of platform (since this is part of the serialized data). <code>EndianScalar</code> then converts back and forth, which is a no-op on all current mobile and desktop platforms, and a single machine instruction on the few remaining big endian platforms. </p><pre class="fragment">struct Monster : private flatbuffers::Table {
-  const Vec3 *pos() const { return GetStruct&lt;const Vec3 *&gt;(4); }
-  int16_t mana() const { return GetField&lt;int16_t&gt;(6, 150); }
-  int16_t hp() const { return GetField&lt;int16_t&gt;(8, 100); }
-  const flatbuffers::String *name() const { return GetPointer&lt;const flatbuffers::String *&gt;(10); }
-  const flatbuffers::Vector&lt;uint8_t&gt; *inventory() const { return GetPointer&lt;const flatbuffers::Vector&lt;uint8_t&gt; *&gt;(14); }
-  int8_t color() const { return GetField&lt;int8_t&gt;(16, 2); }
-};
-</pre><p>Tables are a bit more complicated. A table accessor struct is used to point at the serialized data for a table, which always starts with an offset to its vtable. It derives from <code>Table</code>, which contains the <code>GetField</code> helper functions. GetField takes a vtable offset, and a default value. It will look in the vtable at that offset. If the offset is out of bounds (data from an older version) or the vtable entry is 0, the field is not present and the default is returned. Otherwise, it uses the entry as an offset into the table to locate the field. </p><pre class="fragment">struct MonsterBuilder {
-  flatbuffers::FlatBufferBuilder &amp;fbb_;
-  flatbuffers::uoffset_t start_;
-  void add_pos(const Vec3 *pos) { fbb_.AddStruct(4, pos); }
-  void add_mana(int16_t mana) { fbb_.AddElement&lt;int16_t&gt;(6, mana, 150); }
-  void add_hp(int16_t hp) { fbb_.AddElement&lt;int16_t&gt;(8, hp, 100); }
-  void add_name(flatbuffers::Offset&lt;flatbuffers::String&gt; name) { fbb_.AddOffset(10, name); }
-  void add_inventory(flatbuffers::Offset&lt;flatbuffers::Vector&lt;uint8_t&gt;&gt; inventory) { fbb_.AddOffset(14, inventory); }
-  void add_color(int8_t color) { fbb_.AddElement&lt;int8_t&gt;(16, color, 2); }
-  MonsterBuilder(flatbuffers::FlatBufferBuilder &amp;_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
-  flatbuffers::Offset&lt;Monster&gt; Finish() { return flatbuffers::Offset&lt;Monster&gt;(fbb_.EndTable(start_, 7)); }
-};
-</pre><p><code>MonsterBuilder</code> is the base helper struct to construct a table using a <code>FlatBufferBuilder</code>. You can add the fields in any order, and the <code>Finish</code> call will ensure the correct vtable gets generated. </p><pre class="fragment">inline flatbuffers::Offset&lt;Monster&gt; CreateMonster(flatbuffers::FlatBufferBuilder &amp;_fbb, const Vec3 *pos, int16_t mana, int16_t hp, flatbuffers::Offset&lt;flatbuffers::String&gt; name, flatbuffers::Offset&lt;flatbuffers::Vector&lt;uint8_t&gt;&gt; inventory, int8_t color) {
-  MonsterBuilder builder_(_fbb);
-  builder_.add_inventory(inventory);
-  builder_.add_name(name);
-  builder_.add_pos(pos);
-  builder_.add_hp(hp);
-  builder_.add_mana(mana);
-  builder_.add_color(color);
-  return builder_.Finish();
-}
-</pre><p><code>CreateMonster</code> is a convenience function that calls all functions in <code>MonsterBuilder</code> above for you. Note that if you pass values which are defaults as arguments, it will not actually construct that field, so you can probably use this function instead of the builder class in almost all cases. </p><pre class="fragment">inline const Monster *GetMonster(const void *buf) { return flatbuffers::GetRoot&lt;Monster&gt;(buf); }
-</pre><p>This function is only generated for the root table type, to be able to start traversing a FlatBuffer from a raw buffer pointer. </p><pre class="fragment">}; // namespace MyGame
-}; // namespace Sample
-</pre><h3>Encoding example.</h3>
-<p>Below is a sample encoding for the following JSON corresponding to the above schema: </p><pre class="fragment">{ pos: { x: 1, y: 2, z: 3 }, name: "fred", hp: 50 }
-</pre><p>Resulting in this binary buffer: </p><pre class="fragment">// Start of the buffer:
-uint32_t 20  // Offset to the root table.
-
-// Start of the vtable. Not shared in this example, but could be:
-uint16_t 16 // Size of table, starting from here.
-uint16_t 22 // Size of object inline data.
-uint16_t 4, 0, 20, 16, 0, 0  // Offsets to fields from start of (root) table, 0 for not present.
-
-// Start of the root table:
-int32_t 16     // Offset to vtable used (default negative direction)
-float 1, 2, 3  // the Vec3 struct, inline.
-uint32_t 8     // Offset to the name string.
-int16_t 50     // hp field.
-int16_t 0      // Padding for alignment.
-
-// Start of name string:
-uint32_t 4  // Length of string.
-int8_t 'f', 'r', 'e', 'd', 0, 0, 0, 0  // Text + 0 termination + padding.
-</pre><p>Note that this not the only possible encoding, since the writer has some flexibility in which of the children of root object to write first (though in this case there's only one string), and what order to write the fields in. Different orders may also cause different alignments to happen. </p>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/md__java_usage.html b/docs/html/md__java_usage.html
deleted file mode 100644
index 96904fc25..000000000
--- a/docs/html/md__java_usage.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Use in Java/C-sharp</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__java_usage.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">Use in Java/C-sharp </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>FlatBuffers supports reading and writing binary FlatBuffers in Java and C#. Generate code for Java with the <code>-j</code> option to <code>flatc</code>, or for C# with <code>-n</code> (think .Net).</p>
-<p>Note that this document is from the perspective of Java. Code for both languages is generated in the same way, with only minor differences. These differences are <a href="#differences-in-c-sharp">explained in a section below</a>.</p>
-<p>See <code>javaTest.java</code> for an example. Essentially, you read a FlatBuffer binary file into a <code>byte[]</code>, which you then turn into a <code>ByteBuffer</code>, which you pass to the <code>getRootAsMyRootType</code> function:</p>
-<div class="fragment"><div class="line">ByteBuffer bb = ByteBuffer.wrap(data);</div>
-<div class="line">Monster monster = Monster.getRootAsMonster(bb);</div>
-</div><!-- fragment --><p>Now you can access values much like C++:</p>
-<div class="fragment"><div class="line"><span class="keywordtype">short</span> hp = monster.hp();</div>
-<div class="line">Vec3 pos = monster.pos();</div>
-</div><!-- fragment --><p>Note that whenever you access a new object like in the <code>pos</code> example above, a new temporary accessor object gets created. If your code is very performance sensitive (you iterate through a lot of objects), there's a second <code>pos()</code> method to which you can pass a <code>Vec3</code> object you've already created. This allows you to reuse it across many calls and reduce the amount of object allocation (and thus garbage collection) your program does.</p>
-<p>Java does not support unsigned scalars. This means that any unsigned types you use in your schema will actually be represented as a signed value. This means all bits are still present, but may represent a negative value when used. For example, to read a <code>byte b</code> as an unsigned number, you can do: <code>(short)(b &amp; 0xFF)</code></p>
-<p>The default string accessor (e.g. <code>monster.name()</code>) currently always create a new Java <code>String</code> when accessed, since FlatBuffer's UTF-8 strings can't be used in-place by <code>String</code>. Alternatively, use <code>monster.nameAsByteBuffer()</code> which returns a <code>ByteBuffer</code> referring to the UTF-8 data in the original <code>ByteBuffer</code>, which is much more efficient. The <code>ByteBuffer</code>'s <code>position</code> points to the first character, and its <code>limit</code> to just after the last.</p>
-<p>Vector access is also a bit different from C++: you pass an extra index to the vector field accessor. Then a second method with the same name suffixed by <code>Length</code> let's you know the number of elements you can access:</p>
-<div class="fragment"><div class="line"><span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; monster.inventoryLength(); i++)</div>
-<div class="line">    monster.inventory(i); <span class="comment">// do something here</span></div>
-</div><!-- fragment --><p>Alternatively, much like strings, you can use <code>monster.inventoryAsByteBuffer()</code> to get a <code>ByteBuffer</code> referring to the whole vector. Use <code>ByteBuffer</code> methods like <code>asFloatBuffer</code> to get specific views if needed.</p>
-<p>If you specified a file_indentifier in the schema, you can query if the buffer is of the desired type before accessing it using:</p>
-<div class="fragment"><div class="line"><span class="keywordflow">if</span> (Monster.MonsterBufferHasIdentifier(bb)) ...</div>
-</div><!-- fragment --><h2>Buffer construction in Java</h2>
-<p>You can also construct these buffers in Java using the static methods found in the generated code, and the FlatBufferBuilder class:</p>
-<div class="fragment"><div class="line">FlatBufferBuilder fbb = <span class="keyword">new</span> FlatBufferBuilder();</div>
-</div><!-- fragment --><p>Create strings:</p>
-<div class="fragment"><div class="line"><span class="keywordtype">int</span> str = fbb.createString(<span class="stringliteral">&quot;MyMonster&quot;</span>);</div>
-</div><!-- fragment --><p>Create a table with a struct contained therein:</p>
-<div class="fragment"><div class="line">Monster.startMonster(fbb);</div>
-<div class="line">Monster.addPos(fbb, Vec3.createVec3(fbb, 1.0f, 2.0f, 3.0f, 3.0, (byte)4, (<span class="keywordtype">short</span>)5, (byte)6));</div>
-<div class="line">Monster.addHp(fbb, (short)80);</div>
-<div class="line">Monster.addName(fbb, str);</div>
-<div class="line">Monster.addInventory(fbb, inv);</div>
-<div class="line">Monster.addTest_type(fbb, (byte)1);</div>
-<div class="line">Monster.addTest(fbb, mon2);</div>
-<div class="line">Monster.addTest4(fbb, test4s);</div>
-<div class="line"><span class="keywordtype">int</span> mon = Monster.endMonster(fbb);</div>
-</div><!-- fragment --><p>For some simpler types, you can use a convenient <code>create</code> function call that allows you to construct tables in one function call. This example definition however contains an inline struct field, so we have to create the table manually. This is to create the buffer without using temporary object allocation.</p>
-<p>It's important to understand that fields that are structs are inline (like <code>Vec3</code> above), and MUST thus be created between the start and end calls of a table. Everything else (other tables, strings, vectors) MUST be created before the start of the table they are referenced in.</p>
-<p>Structs do have convenient methods that even have arguments for nested structs.</p>
-<p>As you can see, references to other objects (e.g. the string above) are simple ints, and thus do not have the type-safety of the Offset type in C++. Extra care must thus be taken that you set the right offset on the right field.</p>
-<p>Vectors can be created from the corresponding Java array like so:</p>
-<div class="fragment"><div class="line"><span class="keywordtype">int</span> inv = Monster.createInventoryVector(fbb, <span class="keyword">new</span> byte[] { 0, 1, 2, 3, 4 });</div>
-</div><!-- fragment --><p>This works for arrays of scalars and (int) offsets to strings/tables, but not structs. If you want to write structs, or what you want to write does not sit in an array, you can also use the start/end pattern:</p>
-<div class="fragment"><div class="line">Monster.startInventoryVector(fbb, 5);</div>
-<div class="line"><span class="keywordflow">for</span> (byte i = 4; i &gt;=0; i--) fbb.addByte(i);</div>
-<div class="line"><span class="keywordtype">int</span> inv = fbb.endVector();</div>
-</div><!-- fragment --><p>You can use the generated method <code>startInventoryVector</code> to conveniently call <code>startVector</code> with the right element size. You pass the number of elements you want to write. Note how you write the elements backwards since the buffer is being constructed back to front. You then pass <code>inv</code> to the corresponding <code>Add</code> call when you construct the table containing it afterwards.</p>
-<p>There are <code>add</code> functions for all the scalar types. You use <code>addOffset</code> for any previously constructed objects (such as other tables, strings, vectors). For structs, you use the appropriate <code>create</code> function in-line, as shown above in the <code>Monster</code> example.</p>
-<p>To finish the buffer, call:</p>
-<div class="fragment"><div class="line">Monster.finishMonsterBuffer(fbb, mon);</div>
-</div><!-- fragment --><p>The buffer is now ready to be transmitted. It is contained in the <code>ByteBuffer</code> which you can obtain from <code>fbb.dataBuffer()</code>. Importantly, the valid data does not start from offset 0 in this buffer, but from <code>fbb.dataBuffer().position()</code> (this is because the data was built backwards in memory). It ends at <code>fbb.capacity()</code>.</p>
-<h2>Differences in C-sharp</h2>
-<p>C# code works almost identically to Java, with only a few minor differences. You can see an example of C# code in <code>tests/FlatBuffers.Test/FlatBuffersExampleTests.cs</code>.</p>
-<p>First of all, naming follows standard C# style with <code>PascalCasing</code> identifiers, e.g. <code>GetRootAsMyRootType</code>. Also, values (except vectors and unions) are available as properties instead of parameterless accessor methods as in Java. The performance-enhancing methods to which you can pass an already created object are prefixed with <code>Get</code>, e.g.:</p>
-<div class="fragment"><div class="line"><span class="comment">// property</span></div>
-<div class="line">var pos = monster.Pos;</div>
-<div class="line"><span class="comment">// method filling a preconstructed object</span></div>
-<div class="line">var preconstructedPos = <span class="keyword">new</span> Vec3();</div>
-<div class="line">monster.GetPos(preconstructedPos);</div>
-</div><!-- fragment --><h2>Text parsing</h2>
-<p>There currently is no support for parsing text (Schema's and JSON) directly from Java or C#, though you could use the C++ parser through native call interfaces available to each language. Please see the C++ documentation for more on text parsing.</p>
-<h3>Mutating FlatBuffers</h3>
-<p>As you saw above, typically once you have created a FlatBuffer, it is read-only from that moment on. There are however cases where you have just received a FlatBuffer, and you'd like to modify something about it before sending it on to another recipient. With the above functionality, you'd have to generate an entirely new FlatBuffer, while tracking what you modify in your own data structures. This is inconvenient.</p>
-<p>For this reason FlatBuffers can also be mutated in-place. While this is great for making small fixes to an existing buffer, you generally want to create buffers from scratch whenever possible, since it is much more efficient and the API is much more general purpose.</p>
-<p>To get non-const accessors, invoke <code>flatc</code> with <code>--gen-mutable</code>.</p>
-<p>You now can:</p>
-<div class="fragment"><div class="line">Monster monster = Monster.getRootAsMonster(bb);</div>
-<div class="line">monster.mutateHp(10);            <span class="comment">// Set table field.</span></div>
-<div class="line">monster.pos().mutateZ(4);        <span class="comment">// Set struct field.</span></div>
-<div class="line">monster.mutateInventory(0, 1);   <span class="comment">// Set vector element.</span></div>
-</div><!-- fragment --><p>We use the somewhat verbose term <code>mutate</code> instead of <code>set</code> to indicate that this is a special use case, not to be confused with the default way of constructing FlatBuffer data.</p>
-<p>After the above mutations, you can send on the FlatBuffer to a new recipient without any further work!</p>
-<p>Note that any <code>mutate</code> functions on tables return a boolean, which is false if the field we're trying to set isn't present in the buffer. Fields are not present if they weren't set, or even if they happen to be equal to the default value. For example, in the creation code above we set the <code>mana</code> field to <code>150</code>, which is the default value, so it was never stored in the buffer. Trying to call mutateMana() on such data will return false, and the value won't actually be modified!</p>
-<p>One way to solve this is to call <code>forceDefaults()</code> on a <code>FlatBufferBuilder</code> to force all fields you set to actually be written. This of course increases the size of the buffer somewhat, but this may be acceptable for a mutable buffer. </p>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/md__python_usage.html b/docs/html/md__python_usage.html
deleted file mode 100644
index 7ac66252a..000000000
--- a/docs/html/md__python_usage.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Use in Python</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__python_usage.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">Use in Python </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>There's experimental support for reading FlatBuffers in Python. Generate code for Python with the <code>-p</code> option to <code>flatc</code>.</p>
-<p>See <code>py_test.py</code> for an example. You import the generated code, read a FlatBuffer binary file into a <code>bytearray</code>, which you pass to the <code>GetRootAsMonster</code> function:</p>
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;import MyGame.Example <span class="keyword">as</span> example</div>
-<div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="keyword">import</span> flatbuffers</div>
-<div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;</div>
-<div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;buf = open(<span class="stringliteral">&#39;monster.dat&#39;</span>, <span class="stringliteral">&#39;rb&#39;</span>).read()</div>
-<div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;buf = bytearray(buf)</div>
-<div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;monster = example.GetRootAsMonster(buf, 0)</div>
-</div><!-- fragment --><p>Now you can access values like this:</p>
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;hp = monster.Hp()</div>
-<div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;pos = monster.Pos()</div>
-</div><!-- fragment --><p>To access vectors you pass an extra index to the vector field accessor. Then a second method with the same name suffixed by <code>Length</code> let's you know the number of elements you can access:</p>
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="keywordflow">for</span> i <span class="keywordflow">in</span> xrange(monster.InventoryLength()):</div>
-<div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;    monster.Inventory(i) <span class="comment"># do something here</span></div>
-</div><!-- fragment --><p>You can also construct these buffers in Python using the functions found in the generated code, and the FlatBufferBuilder class:</p>
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;builder = flatbuffers.Builder(0)</div>
-</div><!-- fragment --><p>Create strings:</p>
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;s = builder.CreateString(<span class="stringliteral">&quot;MyMonster&quot;</span>)</div>
-</div><!-- fragment --><p>Create a table with a struct contained therein:</p>
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;example.MonsterStart(builder)</div>
-<div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;example.MonsterAddPos(builder, example.CreateVec3(builder, 1.0, 2.0, 3.0, 3.0, 4, 5, 6))</div>
-<div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;example.MonsterAddHp(builder, 80)</div>
-<div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;example.MonsterAddName(builder, str)</div>
-<div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;example.MonsterAddInventory(builder, inv)</div>
-<div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;example.MonsterAddTest_Type(builder, 1)</div>
-<div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;example.MonsterAddTest(builder, mon2)</div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;example.MonsterAddTest4(builder, test4s)</div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;mon = example.MonsterEnd(builder)</div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;</div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;final_flatbuffer = builder.Output()</div>
-</div><!-- fragment --><p>Unlike C++, Python does not support table creation functions like 'createMonster()'. This is to create the buffer without using temporary object allocation (since the <code>Vec3</code> is an inline component of <code>Monster</code>, it has to be created right where it is added, whereas the name and the inventory are not inline, and <b>must</b> be created outside of the table creation sequence). Structs do have convenient methods that allow you to construct them in one call. These also have arguments for nested structs, e.g. if a struct has a field <code>a</code> and a nested struct field <code>b</code> (which has fields <code>c</code> and <code>d</code>), then the arguments will be <code>a</code>, <code>c</code> and <code>d</code>.</p>
-<p>Vectors also use this start/end pattern to allow vectors of both scalar types and structs:</p>
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;example.MonsterStartInventoryVector(builder, 5)</div>
-<div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;i = 4</div>
-<div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="keywordflow">while</span> i &gt;= 0:</div>
-<div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;    builder.PrependByte(byte(i))</div>
-<div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;    i -= 1</div>
-<div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;</div>
-<div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;inv = builder.EndVector(5)</div>
-</div><!-- fragment --><p>The generated method 'StartInventoryVector' is provided as a convenience function which calls 'StartVector' with the correct element size of the vector type which in this case is 'ubyte' or 1 byte per vector element. You pass the number of elements you want to write. You write the elements backwards since the buffer is being constructed back to front. Use the correct <code>Prepend</code> call for the type, or <code>PrependUOffsetT</code> for offsets. You then pass <code>inv</code> to the corresponding <code>Add</code> call when you construct the table containing it afterwards.</p>
-<p>There are <code>Prepend</code> functions for all the scalar types. You use <code>PrependUOffset</code> for any previously constructed objects (such as other tables, strings, vectors). For structs, you use the appropriate <code>create</code> function in-line, as shown above in the <code>Monster</code> example.</p>
-<p>Once you're done constructing a buffer, you call <code>Finish</code> with the root object offset (<code>mon</code> in the example above). Your data now resides in Builder.Bytes. Important to note is that the real data starts at the index indicated by Head(), for Offset() bytes (this is because the buffer is constructed backwards). If you wanted to read the buffer right after creating it (using <code>GetRootAsMonster</code> above), the second argument, instead of <code>0</code> would thus also be <code>Head()</code>.</p>
-<h2>Text Parsing</h2>
-<p>There currently is no support for parsing text (Schema's and JSON) directly from Python, though you could use the C++ parser through SWIG or ctypes. Please see the C++ documentation for more on text parsing. </p>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/md__schemas.html b/docs/html/md__schemas.html
deleted file mode 100644
index de7969cb4..000000000
--- a/docs/html/md__schemas.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Writing a schema</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__schemas.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">Writing a schema </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>The syntax of the schema language (aka IDL, Interface Definition Language) should look quite familiar to users of any of the C family of languages, and also to users of other IDLs. Let's look at an example first: </p><pre class="fragment">// example IDL file
-
-namespace MyGame;
-
-attribute "priority";
-
-enum Color : byte { Red = 1, Green, Blue }
-
-union Any { Monster, Weapon, Pickup }
-
-struct Vec3 {
-  x:float;
-  y:float;
-  z:float;
-}
-
-table Monster {
-  pos:Vec3;
-  mana:short = 150;
-  hp:short = 100;
-  name:string;
-  friendly:bool = false (deprecated, priority: 1);
-  inventory:[ubyte];
-  color:Color = Blue;
-  test:Any;
-}
-
-root_type Monster;
-</pre><p>(Weapon &amp; Pickup not defined as part of this example).</p>
-<h3>Tables</h3>
-<p>Tables are the main way of defining objects in FlatBuffers, and consist of a name (here <code>Monster</code>) and a list of fields. Each field has a name, a type, and optionally a default value (if omitted, it defaults to 0 / NULL).</p>
-<p>Each field is optional: It does not have to appear in the wire representation, and you can choose to omit fields for each individual object. As a result, you have the flexibility to add fields without fear of bloating your data. This design is also FlatBuffer's mechanism for forward and backwards compatibility. Note that:</p>
-<ul>
-<li>You can add new fields in the schema ONLY at the end of a table definition. Older data will still read correctly, and give you the default value when read. Older code will simply ignore the new field. If you want to have flexibility to use any order for fields in your schema, you can manually assign ids (much like Protocol Buffers), see the <code>id</code> attribute below.</li>
-<li>You cannot delete fields you don't use anymore from the schema, but you can simply stop writing them into your data for almost the same effect. Additionally you can mark them as <code>deprecated</code> as in the example above, which will prevent the generation of accessors in the generated C++, as a way to enforce the field not being used any more. (careful: this may break code!).</li>
-<li>You may change field names and table names, if you're ok with your code breaking until you've renamed them there too.</li>
-</ul>
-<p>See "Schema evolution examples" below for more on this topic.</p>
-<h3>Structs</h3>
-<p>Similar to a table, only now none of the fields are optional (so no defaults either), and fields may not be added or be deprecated. Structs may only contain scalars or other structs. Use this for simple objects where you are very sure no changes will ever be made (as quite clear in the example <code>Vec3</code>). Structs use less memory than tables and are even faster to access (they are always stored in-line in their parent object, and use no virtual table).</p>
-<h3>Types</h3>
-<p>Built-in scalar types are:</p>
-<ul>
-<li>8 bit: <code>byte ubyte bool</code></li>
-<li>16 bit: <code>short ushort</code></li>
-<li>32 bit: <code>int uint float</code></li>
-<li>64 bit: <code>long ulong double</code></li>
-</ul>
-<p>Built-in non-scalar types:</p>
-<ul>
-<li>Vector of any other type (denoted with <code>[type]</code>). Nesting vectors is not supported, instead you can wrap the inner vector in a table.</li>
-<li><code>string</code>, which may only hold UTF-8 or 7-bit ASCII. For other text encodings or general binary data use vectors (<code>[byte]</code> or <code>[ubyte]</code>) instead.</li>
-<li>References to other tables or structs, enums or unions (see below).</li>
-</ul>
-<p>You can't change types of fields once they're used, with the exception of same-size data where a <code>reinterpret_cast</code> would give you a desirable result, e.g. you could change a <code>uint</code> to an <code>int</code> if no values in current data use the high bit yet.</p>
-<h3>(Default) Values</h3>
-<p>Values are a sequence of digits, optionally followed by a <code>.</code> and more digits for float constants, and optionally prefixed by a <code>-</code>. Floats may end with an <code>e</code> or <code>E</code>, followed by a <code>+</code> or <code>-</code> and more digits (scientific notation).</p>
-<p>Only scalar values can have defaults, non-scalar (string/vector/table) fields default to NULL when not present.</p>
-<p>You generally do not want to change default values after they're initially defined. Fields that have the default value are not actually stored in the serialized data but are generated in code, so when you change the default, you'd now get a different value than from code generated from an older version of the schema. There are situations however where this may be desirable, especially if you can ensure a simultaneous rebuild of all code.</p>
-<h3>Enums</h3>
-<p>Define a sequence of named constants, each with a given value, or increasing by one from the previous one. The default first value is <code>0</code>. As you can see in the enum declaration, you specify the underlying integral type of the enum with <code>:</code> (in this case <code>byte</code>), which then determines the type of any fields declared with this enum type.</p>
-<p>Typically, enum values should only ever be added, never removed (there is no deprecation for enums). This requires code to handle forwards compatibility itself, by handling unknown enum values.</p>
-<h3>Unions</h3>
-<p>Unions share a lot of properties with enums, but instead of new names for constants, you use names of tables. You can then declare a union field which can hold a reference to any of those types, and additionally a hidden field with the suffix <code>_type</code> is generated that holds the corresponding enum value, allowing you to know which type to cast to at runtime.</p>
-<p>Unions are a good way to be able to send multiple message types as a FlatBuffer. Note that because a union field is really two fields, it must always be part of a table, it cannot be the root of a FlatBuffer by itself.</p>
-<p>If you have a need to distinguish between different FlatBuffers in a more open-ended way, for example for use as files, see the file identification feature below.</p>
-<h3>Namespaces</h3>
-<p>These will generate the corresponding namespace in C++ for all helper code, and packages in Java. You can use <code>.</code> to specify nested namespaces / packages.</p>
-<h3>Includes</h3>
-<p>You can include other schemas files in your current one, e.g.: </p><pre class="fragment">include "mydefinitions.fbs";
-</pre><p>This makes it easier to refer to types defined elsewhere. <code>include</code> automatically ensures each file is parsed just once, even when referred to more than once.</p>
-<p>When using the <code>flatc</code> compiler to generate code for schema definitions, only definitions in the current file will be generated, not those from the included files (those you still generate separately).</p>
-<h3>Root type</h3>
-<p>This declares what you consider to be the root table (or struct) of the serialized data. This is particular important for parsing JSON data, which doesn't include object type information.</p>
-<h3>File identification and extension</h3>
-<p>Typically, a FlatBuffer binary buffer is not self-describing, i.e. it needs you to know its schema to parse it correctly. But if you want to use a FlatBuffer as a file format, it would be convenient to be able to have a "magic number" in there, like most file formats have, to be able to do a sanity check to see if you're reading the kind of file you're expecting.</p>
-<p>Now, you can always prefix a FlatBuffer with your own file header, but FlatBuffers has a built-in way to add an identifier to a FlatBuffer that takes up minimal space, and keeps the buffer compatible with buffers that don't have such an identifier.</p>
-<p>You can specify in a schema, similar to <code>root_type</code>, that you intend for this type of FlatBuffer to be used as a file format: </p><pre class="fragment">file_identifier "MYFI";
-</pre><p>Identifiers must always be exactly 4 characters long. These 4 characters will end up as bytes at offsets 4-7 (inclusive) in the buffer.</p>
-<p>For any schema that has such an identifier, <code>flatc</code> will automatically add the identifier to any binaries it generates (with <code>-b</code>), and generated calls like <code>FinishMonsterBuffer</code> also add the identifier. If you have specified an identifier and wish to generate a buffer without one, you can always still do so by calling <code>FlatBufferBuilder::Finish</code> explicitly.</p>
-<p>After loading a buffer, you can use a call like <code>MonsterBufferHasIdentifier</code> to check if the identifier is present.</p>
-<p>Note that this is best for open-ended uses such as files. If you simply wanted to send one of a set of possible messages over a network for example, you'd be better off with a union.</p>
-<p>Additionally, by default <code>flatc</code> will output binary files as <code>.bin</code>. This declaration in the schema will change that to whatever you want: </p><pre class="fragment">file_extension "ext";
-</pre><h3>Comments &amp; documentation</h3>
-<p>May be written as in most C-based languages. Additionally, a triple comment (<code>///</code>) on a line by itself signals that a comment is documentation for whatever is declared on the line after it (table/struct/field/enum/union/element), and the comment is output in the corresponding C++ code. Multiple such lines per item are allowed.</p>
-<h3>Attributes</h3>
-<p>Attributes may be attached to a declaration, behind a field, or after the name of a table/struct/enum/union. These may either have a value or not. Some attributes like <code>deprecated</code> are understood by the compiler, user defined ones need to be declared with the attribute declaration (like <code>priority</code> in the example above), and are available to query if you parse the schema at runtime. This is useful if you write your own code generators/editors etc., and you wish to add additional information specific to your tool (such as a help text).</p>
-<p>Current understood attributes:</p>
-<ul>
-<li><code>id: n</code> (on a table field): manually set the field identifier to <code>n</code>. If you use this attribute, you must use it on ALL fields of this table, and the numbers must be a contiguous range from 0 onwards. Additionally, since a union type effectively adds two fields, its id must be that of the second field (the first field is the type field and not explicitly declared in the schema). For example, if the last field before the union field had id 6, the union field should have id 8, and the unions type field will implicitly be 7. IDs allow the fields to be placed in any order in the schema. When a new field is added to the schema is must use the next available ID.</li>
-<li><code>deprecated</code> (on a field): do not generate accessors for this field anymore, code should stop using this data.</li>
-<li><code>required</code> (on a non-scalar table field): this field must always be set. By default, all fields are optional, i.e. may be left out. This is desirable, as it helps with forwards/backwards compatibility, and flexibility of data structures. It is also a burden on the reading code, since for non-scalar fields it requires you to check against NULL and take appropriate action. By specifying this field, you force code that constructs FlatBuffers to ensure this field is initialized, so the reading code may access it directly, without checking for NULL. If the constructing code does not initialize this field, they will get an assert, and also the verifier will fail on buffers that have missing required fields.</li>
-<li><code>original_order</code> (on a table): since elements in a table do not need to be stored in any particular order, they are often optimized for space by sorting them to size. This attribute stops that from happening.</li>
-<li><code>force_align: size</code> (on a struct): force the alignment of this struct to be something higher than what it is naturally aligned to. Causes these structs to be aligned to that amount inside a buffer, IF that buffer is allocated with that alignment (which is not necessarily the case for buffers accessed directly inside a <code>FlatBufferBuilder</code>).</li>
-<li><code>bit_flags</code> (on an enum): the values of this field indicate bits, meaning that any value N specified in the schema will end up representing 1&lt;&lt;N, or if you don't specify values at all, you'll get the sequence 1, 2, 4, 8, ...</li>
-<li><code>nested_flatbuffer: "table_name"</code> (on a field): this indicates that the field (which must be a vector of ubyte) contains flatbuffer data, for which the root type is given by <code>table_name</code>. The generated code will then produce a convenient accessor for the nested FlatBuffer.</li>
-<li><code>key</code> (on a field): this field is meant to be used as a key when sorting a vector of the type of table it sits in. Can be used for in-place binary search.</li>
-</ul>
-<h2>JSON Parsing</h2>
-<p>The same parser that parses the schema declarations above is also able to parse JSON objects that conform to this schema. So, unlike other JSON parsers, this parser is strongly typed, and parses directly into a FlatBuffer (see the compiler documentation on how to do this from the command line, or the C++ documentation on how to do this at runtime).</p>
-<p>Besides needing a schema, there are a few other changes to how it parses JSON:</p>
-<ul>
-<li>It accepts field names with and without quotes, like many JSON parsers already do. It outputs them without quotes as well, though can be made to output them using the <code>strict_json</code> flag.</li>
-<li>If a field has an enum type, the parser will recognize symbolic enum values (with or without quotes) instead of numbers, e.g. <code>field: EnumVal</code>. If a field is of integral type, you can still use symbolic names, but values need to be prefixed with their type and need to be quoted, e.g. <code>field: "Enum.EnumVal"</code>. For enums representing flags, you may place multiple inside a string separated by spaces to OR them, e.g. <code>field: "EnumVal1 EnumVal2"</code> or <code>field: "Enum.EnumVal1 Enum.EnumVal2"</code>.</li>
-<li>Similarly, for unions, these need to specified with two fields much like you do when serializing from code. E.g. for a field <code>foo</code>, you must add a field <code>foo_type: FooOne</code> right before the <code>foo</code> field, where <code>FooOne</code> would be the table out of the union you want to use.</li>
-<li>A field that has the value <code>null</code> (e.g. <code>field: null</code>) is intended to have the default value for that field (thus has the same effect as if that field wasn't specified at all).</li>
-</ul>
-<p>When parsing JSON, it recognizes the following escape codes in strings:</p>
-<ul>
-<li><code>\n</code> - linefeed.</li>
-<li><code>\t</code> - tab.</li>
-<li><code>\r</code> - carriage return.</li>
-<li><code>\b</code> - backspace.</li>
-<li><code>\f</code> - form feed.</li>
-<li><code>\"</code> - double quote.</li>
-<li><code>\\</code> - backslash.</li>
-<li><code>\/</code> - forward slash.</li>
-<li><code>\uXXXX</code> - 16-bit unicode code point, converted to the equivalent UTF-8 representation.</li>
-<li><code>\xXX</code> - 8-bit binary hexadecimal number XX. This is the only one that is not in the JSON spec (see <a href="http://json.org/">http://json.org/</a>), but is needed to be able to encode arbitrary binary in strings to text and back without losing information (e.g. the byte 0xFF can't be represented in standard JSON).</li>
-</ul>
-<p>It also generates these escape codes back again when generating JSON from a binary representation.</p>
-<h2>Gotchas</h2>
-<h3>Schemas and version control</h3>
-<p>FlatBuffers relies on new field declarations being added at the end, and earlier declarations to not be removed, but be marked deprecated when needed. We think this is an improvement over the manual number assignment that happens in Protocol Buffers (and which is still an option using the <code>id</code> attribute mentioned above).</p>
-<p>One place where this is possibly problematic however is source control. If user A adds a field, generates new binary data with this new schema, then tries to commit both to source control after user B already committed a new field also, and just auto-merges the schema, the binary files are now invalid compared to the new schema.</p>
-<p>The solution of course is that you should not be generating binary data before your schema changes have been committed, ensuring consistency with the rest of the world. If this is not practical for you, use explicit field ids, which should always generate a merge conflict if two people try to allocate the same id.</p>
-<h3>Schema evolution examples</h3>
-<p>Some examples to clarify what happens as you change a schema:</p>
-<p>If we have the following original schema: </p><pre class="fragment">table { a:int; b:int; }
-</pre><p>And we extend it: </p><pre class="fragment">table { a:int; b:int; c:int; }
-</pre><p>This is ok. Code compiled with the old schema reading data generated with the new one will simply ignore the presence of the new field. Code compiled with the new schema reading old data will get the default value for <code>c</code> (which is 0 in this case, since it is not specified). </p><pre class="fragment">table { a:int (deprecated); b:int; }
-</pre><p>This is also ok. Code compiled with the old schema reading newer data will now always get the default value for <code>a</code> since it is not present. Code compiled with the new schema now cannot read nor write <code>a</code> anymore (any existing code that tries to do so will result in compile errors), but can still read old data (they will ignore the field). </p><pre class="fragment">table { c:int a:int; b:int; }
-</pre><p>This is NOT ok, as this makes the schemas incompatible. Old code reading newer data will interpret <code>c</code> as if it was <code>a</code>, and new code reading old data accessing <code>a</code> will instead receive <code>b</code>. </p><pre class="fragment">table { c:int (id: 2); a:int (id: 0); b:int (id: 1); }
-</pre><p>This is ok. If your intent was to order/group fields in a way that makes sense semantically, you can do so using explicit id assignment. Now we are compatible with the original schema, and the fields can be ordered in any way, as long as we keep the sequence of ids. </p><pre class="fragment">table { b:int; }
-</pre><p>NOT ok. We can only remove a field by deprecation, regardless of wether we use explicit ids or not. </p><pre class="fragment">table { a:uint; b:uint; }
-</pre><p>This is MAYBE ok, and only in the case where the type change is the same size, like here. If old data never contained any negative numbers, this will be safe to do. </p><pre class="fragment">table { a:int = 1; b:int = 2; }
-</pre><p>Generally NOT ok. Any older data written that had 0 values were not written to the buffer, and rely on the default value to be recreated. These will now have those values appear to <code>1</code> and <code>2</code> instead. There may be cases in which this is ok, but care must be taken. </p><pre class="fragment">table { aa:int; bb:int; }
-</pre><p>Occasionally ok. You've renamed fields, which will break all code (and JSON files!) that use this schema, but as long as the change is obvious, this is not incompatible with the actual binary buffers, since those only ever address fields by id/offset. </p>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/md__support.html b/docs/html/md__support.html
deleted file mode 100644
index 833f03313..000000000
--- a/docs/html/md__support.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Platform / Language / Feature support</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__support.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">Platform / Language / Feature support </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>FlatBuffers is actively being worked on, which means that certain platform / language / feature combinations may not be available yet.</p>
-<p>This page tries to track those issues, to make informed decisions easier. In general:</p>
-<ul>
-<li>Languages: language support beyond the ones created by the original FlatBuffer authors typically depends on community contributions.</li>
-<li>Features: C++ was the first language supported, since our original target was high performance game development. It thus has the richest feature set, and is likely most robust. Other languages are catching up however.</li>
-<li>Platforms: All language implementations are typically portable to most platforms, unless where noted otherwise.</li>
-</ul>
-<p>NOTE: this table is a start, it needs to be extended.</p>
-<table class="doxtable">
-<tr>
-<th>Feature </th><th>C++ </th><th>Java </th><th>C# </th><th>Go </th><th>Python </th><th>JS </th><th>C </th><th>PHP </th><th>Ruby  </th></tr>
-<tr>
-<td>Codegen for all basic features </td><td>Yes </td><td>Yes </td><td>Yes </td><td>Yes </td><td>Yes </td><td>Yes </td><td>WiP </td><td>WiP </td><td>WiP </td></tr>
-<tr>
-<td>JSON parsing </td><td>Yes </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td></tr>
-<tr>
-<td>Simple mutation </td><td>Yes </td><td>WIP </td><td>WIP </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td></tr>
-<tr>
-<td>Reflection </td><td>Yes </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td></tr>
-<tr>
-<td>Buffer verifier </td><td>Yes </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td><td>No </td></tr>
-<tr>
-<td>Testing: basic </td><td>Yes </td><td>Yes </td><td>Yes </td><td>Yes </td><td>Yes </td><td>Yes </td><td>? </td><td>? </td><td>? </td></tr>
-<tr>
-<td>Testing: fuzz </td><td>Yes </td><td>No </td><td>No </td><td>Yes </td><td>Yes </td><td>No </td><td>? </td><td>? </td><td>? </td></tr>
-<tr>
-<td>Performance: </td><td>Superb </td><td>Great </td><td>Great </td><td>Great </td><td>Ok </td><td>? </td><td>Superb</td><td>? </td><td>? </td></tr>
-<tr>
-<td>Platform: Windows </td><td>VS2010 </td><td>Yes </td><td>Yes </td><td>? </td><td>? </td><td>? </td><td>? </td><td>? </td><td>? </td></tr>
-<tr>
-<td>Platform: Linux </td><td>GCC282 </td><td>Yes </td><td>? </td><td>Yes </td><td>Yes </td><td>? </td><td>? </td><td>? </td><td>? </td></tr>
-<tr>
-<td>Platform: OS X </td><td>Xcode4 </td><td>? </td><td>? </td><td>? </td><td>Yes </td><td>? </td><td>? </td><td>? </td><td>? </td></tr>
-<tr>
-<td>Platform: Android </td><td>NDK10d </td><td>Yes </td><td>? </td><td>? </td><td>? </td><td>? </td><td>? </td><td>? </td><td>? </td></tr>
-<tr>
-<td>Platform: iOS </td><td>? </td><td>? </td><td>? </td><td>? </td><td>? </td><td>? </td><td>? </td><td>? </td><td>? </td></tr>
-<tr>
-<td>Engine: Unity </td><td>? </td><td>? </td><td>Yes </td><td>? </td><td>? </td><td>? </td><td>? </td><td>? </td><td>? </td></tr>
-<tr>
-<td>Primary authors (github) </td><td>gwvo </td><td>gwvo </td><td>ev*/js*</td><td>rw </td><td>rw </td><td>evanw/ev* </td><td>mik* </td><td>ch* </td><td>rw </td></tr>
-</table>
-<ul>
-<li>ev = evolutional</li>
-<li>js = jonsimantov</li>
-<li>mik = mikkelfj</li>
-<li>ch = chobie </li>
-</ul>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/md__white_paper.html b/docs/html/md__white_paper.html
deleted file mode 100644
index 88b543800..000000000
--- a/docs/html/md__white_paper.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: FlatBuffers white paper</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__white_paper.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">FlatBuffers white paper </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>This document tries to shed some light on to the "why" of FlatBuffers, a new serialization library.</p>
-<h2>Motivation</h2>
-<p>Back in the good old days, performance was all about instructions and cycles. Nowadays, processing units have run so far ahead of the memory subsystem, that making an efficient application should start and finish with thinking about memory. How much you use of it. How you lay it out and access it. How you allocate it. When you copy it.</p>
-<p>Serialization is a pervasive activity in a lot programs, and a common source of memory inefficiency, with lots of temporary data structures needed to parse and represent data, and inefficient allocation patterns and locality.</p>
-<p>If it would be possible to do serialization with no temporary objects, no additional allocation, no copying, and good locality, this could be of great value. The reason serialization systems usually don't manage this is because it goes counter to forwards/backwards compatability, and platform specifics like endianness and alignment.</p>
-<p>FlatBuffers is what you get if you try anyway.</p>
-<p>In particular, FlatBuffers focus is on mobile hardware (where memory size and memory bandwidth is even more constrained than on desktop hardware), and applications that have the highest performance needs: games.</p>
-<h2>FlatBuffers</h2>
-<p><em>This is a summary of FlatBuffers functionality, with some rationale. A more detailed description can be found in the FlatBuffers documentation.</em></p>
-<h3>Summary</h3>
-<p>A FlatBuffer is a binary buffer containing nested objects (structs, tables, vectors,..) organized using offsets so that the data can be traversed in-place just like any pointer-based data structure. Unlike most in-memory data structures however, it uses strict rules of alignment and endianness (always little) to ensure these buffers are cross platform. Additionally, for objects that are tables, FlatBuffers provides forwards/backwards compatibility and general optionality of fields, to support most forms of format evolution.</p>
-<p>You define your object types in a schema, which can then be compiled to C++ or Java for low to zero overhead reading &amp; writing. Optionally, JSON data can be dynamically parsed into buffers.</p>
-<h3>Tables</h3>
-<p>Tables are the cornerstone of FlatBuffers, since format evolution is essential for most applications of serialization. Typically, dealing with format changes is something that can be done transparently during the parsing process of most serialization solutions out there. But a FlatBuffer isn't parsed before it is accessed.</p>
-<p>Tables get around this by using an extra indirection to access fields, through a <em>vtable</em>. Each table comes with a vtable (which may be shared between multiple tables with the same layout), and contains information where fields for this particular kind of instance of vtable are stored. The vtable may also indicate that the field is not present (because this FlatBuffer was written with an older version of the software, of simply because the information was not necessary for this instance, or deemed deprecated), in which case a default value is returned.</p>
-<p>Tables have a low overhead in memory (since vtables are small and shared) and in access cost (an extra indirection), but provide great flexibility. Tables may even cost less memory than the equivalent struct, since fields do not need to be stored when they are equal to their default.</p>
-<p>FlatBuffers additionally offers "naked" structs, which do not offer forwards/backwards compatibility, but can be even smaller (useful for very small objects that are unlikely to change, like e.g. a coordinate pair or a RGBA color).</p>
-<h3>Schemas</h3>
-<p>While schemas reduce some generality (you can't just read any data without having its schema), they have a lot of upsides:</p>
-<ul>
-<li>Most information about the format can be factored into the generated code, reducing memory needed to store data, and time to access it.</li>
-<li>The strong typing of the data definitions means less error checking/handling at runtime (less can go wrong).</li>
-<li>A schema enables us to access a buffer without parsing.</li>
-</ul>
-<p>FlatBuffer schemas are fairly similar to those of the incumbent, Protocol Buffers, and generally should be readable to those familiar with the C family of languages. We chose to improve upon the features offered by .proto files in the following ways:</p>
-<ul>
-<li>Deprecation of fields instead of manual field id assignment. Extending an object in a .proto means hunting for a free slot among the numbers (preferring lower numbers since they have a more compact representation). Besides being inconvenient, it also makes removing fields problematic: you either have to keep them, not making it obvious that this field shouldn't be read/written anymore, and still generating accessors. Or you remove it, but now you risk that there's still old data around that uses that field by the time someone reuses that field id, with nasty consequences.</li>
-<li>Differentiating between tables and structs (see above). Effectively all table fields are <code>optional</code>, and all struct fields are <code>required</code>.</li>
-<li>Having a native vector type instead of <code>repeated</code>. This gives you a length without having to collect all items, and in the case of scalars provides for a more compact representation, and one that guarantees adjacency.</li>
-<li>Having a native <code>union</code> type instead of using a series of <code>optional</code> fields, all of which must be checked individually.</li>
-<li>Being able to define defaults for all scalars, instead of having to deal with their optionality at each access.</li>
-<li>A parser that can deal with both schemas and data definitions (JSON compatible) uniformly. </li>
-</ul>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/nav_f.png b/docs/html/nav_f.png
deleted file mode 100644
index 72a58a529ed3a9ed6aa0c51a79cf207e026deee2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^j6iI`!2~2XGqLUlQVE_ejv*C{Z|{2ZH7M}7UYxc)
zn!W8uqtnIQ>_<lqdB{jiFDSaaN3W^xbJMH7CDK7=Q3_$6tQ&<~Cp4L6ZEndC`8;cO
zrss?`_g+2sGU&M|cu~La_w1Rnf~7w`e!jQgteDwDLg6kW!`DinT@0SCelF{r5}E+Y
CM>z8U

diff --git a/docs/html/nav_g.png b/docs/html/nav_g.png
deleted file mode 100644
index 2093a237a94f6c83e19ec6e5fd42f7ddabdafa81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^j6lrB!3HFm1ilyoDK$?Q$B+ufw|5PB85lU25BhtE
tr?otc=hd~V+ws&_A@j8Fiv!K<?EJwDd;c`qumW{3c)I$ztaD0e0syCC7$E=v

diff --git a/docs/html/nav_h.png b/docs/html/nav_h.png
deleted file mode 100644
index 33389b101d9cd9b4c98ad286b5d9c46a6671f650..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^j6lr8!2~3AUOE6t22D>F$B+ufw|5=67#uj90@pIL
wZ=Q8~_Ju`#59=RjDrmm`tMD@M=!-l18IR?&v<Kx}xDV3h>FVdQ&MBb@0HFXL<NyEw

diff --git a/docs/html/navtree.css b/docs/html/navtree.css
deleted file mode 100644
index 41a9cb969..000000000
--- a/docs/html/navtree.css
+++ /dev/null
@@ -1,143 +0,0 @@
-#nav-tree .children_ul {
-  margin:0;
-  padding:4px;
-}
-
-#nav-tree ul {
-  list-style:none outside none;
-  margin:0px;
-  padding:0px;
-}
-
-#nav-tree li {
-  white-space:nowrap;
-  margin:0px;
-  padding:0px;
-}
-
-#nav-tree .plus {
-  margin:0px;
-}
-
-#nav-tree .selected {
-  background-image: url('tab_a.png');
-  background-repeat:repeat-x;
-  color: #fff;
-  text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
-}
-
-#nav-tree img {
-  margin:0px;
-  padding:0px;
-  border:0px;
-  vertical-align: middle;
-}
-
-#nav-tree a {
-  text-decoration:none;
-  padding:0px;
-  margin:0px;
-  outline:none;
-}
-
-#nav-tree .label {
-  margin:0px;
-  padding:0px;
-  font: 12px 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
-}
-
-#nav-tree .label a {
-  padding:2px;
-}
-
-#nav-tree .selected a {
-  text-decoration:none;
-  color:#fff;
-}
-
-#nav-tree .children_ul {
-  margin:0px;
-  padding:0px;
-}
-
-#nav-tree .item {
-  margin:0px;
-  padding:0px;
-}
-
-#nav-tree {
-  padding: 0px 0px;
-  background-color: #FAFAFF; 
-  font-size:14px;
-  overflow:auto;
-}
-
-#doc-content {
-  overflow:auto;
-  display:block;
-  padding:0px;
-  margin:0px;
-  -webkit-overflow-scrolling : touch; /* iOS 5+ */
-}
-
-#side-nav {
-  padding:0 6px 0 0;
-  margin: 0px;
-  display:block;
-  position: absolute;
-  left: 0px;
-  width: 250px;
-}
-
-.ui-resizable .ui-resizable-handle {
-  display:block;
-}
-
-.ui-resizable-e {
-  background:url("ftv2splitbar.png") repeat scroll right center transparent;
-  cursor:e-resize;
-  height:100%;
-  right:0;
-  top:0;
-  width:6px;
-}
-
-.ui-resizable-handle {
-  display:none;
-  font-size:0.1px;
-  position:absolute;
-  z-index:1;
-}
-
-#nav-tree-contents {
-  margin: 6px 0px 0px 0px;
-}
-
-#nav-tree {
-  background-image:url('nav_h.png');
-  background-repeat:repeat-x;
-  background-color: #F9FAFC;
-  -webkit-overflow-scrolling : touch; /* iOS 5+ */
-}
-
-#nav-sync {
-  position:absolute;
-  top:5px;
-  right:24px;
-  z-index:0;
-}
-
-#nav-sync img {
-  opacity:0.3;
-}
-
-#nav-sync img:hover {
-  opacity:0.9;
-}
-
-@media print
-{
-  #nav-tree { display: none; }
-  div.ui-resizable-handle { display: none; position: relative; }
-}
-
diff --git a/docs/html/navtree.js b/docs/html/navtree.js
deleted file mode 100644
index 0bbc4dc2a..000000000
--- a/docs/html/navtree.js
+++ /dev/null
@@ -1,552 +0,0 @@
-var NAVTREE =
-[
-  [ "FlatBuffers", "index.html", [
-    [ "Building", "md__building.html", null ],
-    [ "Using the schema compiler", "md__compiler.html", null ],
-    [ "Writing a schema", "md__schemas.html", null ],
-    [ "Use in C++", "md__cpp_usage.html", null ],
-    [ "Use in Go", "md__go_usage.html", null ],
-    [ "Use in Java/C-sharp", "md__java_usage.html", null ],
-    [ "Use in Python", "md__python_usage.html", null ],
-    [ "Platform / Language / Feature support", "md__support.html", null ],
-    [ "Benchmarks", "md__benchmarks.html", null ],
-    [ "FlatBuffers white paper", "md__white_paper.html", null ],
-    [ "FlatBuffer Internals", "md__internals.html", null ],
-    [ "Grammar of the schema language", "md__grammar.html", null ]
-  ] ]
-];
-
-var NAVTREEINDEX =
-[
-"index.html"
-];
-
-var SYNCONMSG = 'click to disable panel synchronisation';
-var SYNCOFFMSG = 'click to enable panel synchronisation';
-var navTreeSubIndices = new Array();
-
-function getData(varName)
-{
-  var i = varName.lastIndexOf('/');
-  var n = i>=0 ? varName.substring(i+1) : varName;
-  return eval(n.replace(/\-/g,'_'));
-}
-
-function stripPath(uri)
-{
-  return uri.substring(uri.lastIndexOf('/')+1);
-}
-
-function stripPath2(uri)
-{
-  var i = uri.lastIndexOf('/');
-  var s = uri.substring(i+1);
-  var m = uri.substring(0,i+1).match(/\/d\w\/d\w\w\/$/);
-  return m ? uri.substring(i-6) : s;
-}
-
-function hashValue()
-{
-  return $(location).attr('hash').substring(1).replace(/[^\w\-]/g,'');
-}
-
-function hashUrl()
-{
-  return '#'+hashValue();
-}
-
-function pathName()
-{
-  return $(location).attr('pathname').replace(/[^-A-Za-z0-9+&@#/%?=~_|!:,.;\(\)]/g, '');
-}
-
-function localStorageSupported()
-{
-  try {
-    return 'localStorage' in window && window['localStorage'] !== null && window.localStorage.getItem;
-  }
-  catch(e) {
-    return false;
-  }
-}
-
-
-function storeLink(link)
-{
-  if (!$("#nav-sync").hasClass('sync') && localStorageSupported()) {
-      window.localStorage.setItem('navpath',link);
-  }
-}
-
-function deleteLink()
-{
-  if (localStorageSupported()) {
-    window.localStorage.setItem('navpath','');
-  }
-}
-
-function cachedLink()
-{
-  if (localStorageSupported()) {
-    return window.localStorage.getItem('navpath');
-  } else {
-    return '';
-  }
-}
-
-function getScript(scriptName,func,show)
-{
-  var head = document.getElementsByTagName("head")[0]; 
-  var script = document.createElement('script');
-  script.id = scriptName;
-  script.type = 'text/javascript';
-  script.onload = func; 
-  script.src = scriptName+'.js'; 
-  if ($.browser.msie && $.browser.version<=8) { 
-    // script.onload does not work with older versions of IE
-    script.onreadystatechange = function() {
-      if (script.readyState=='complete' || script.readyState=='loaded') { 
-        func(); if (show) showRoot(); 
-      }
-    }
-  }
-  head.appendChild(script); 
-}
-
-function createIndent(o,domNode,node,level)
-{
-  var level=-1;
-  var n = node;
-  while (n.parentNode) { level++; n=n.parentNode; }
-  if (node.childrenData) {
-    var imgNode = document.createElement("img");
-    imgNode.style.paddingLeft=(16*level).toString()+'px';
-    imgNode.width  = 16;
-    imgNode.height = 22;
-    imgNode.border = 0;
-    node.plus_img = imgNode;
-    node.expandToggle = document.createElement("a");
-    node.expandToggle.href = "javascript:void(0)";
-    node.expandToggle.onclick = function() {
-      if (node.expanded) {
-        $(node.getChildrenUL()).slideUp("fast");
-        node.plus_img.src = node.relpath+"ftv2pnode.png";
-        node.expanded = false;
-      } else {
-        expandNode(o, node, false, false);
-      }
-    }
-    node.expandToggle.appendChild(imgNode);
-    domNode.appendChild(node.expandToggle);
-    imgNode.src = node.relpath+"ftv2pnode.png";
-  } else {
-    var span = document.createElement("span");
-    span.style.display = 'inline-block';
-    span.style.width   = 16*(level+1)+'px';
-    span.style.height  = '22px';
-    span.innerHTML = '&#160;';
-    domNode.appendChild(span);
-  } 
-}
-
-var animationInProgress = false;
-
-function gotoAnchor(anchor,aname,updateLocation)
-{
-  var pos, docContent = $('#doc-content');
-  var ancParent = $(anchor.parent());
-  if (ancParent.hasClass('memItemLeft') ||
-      ancParent.hasClass('fieldname') ||
-      ancParent.hasClass('fieldtype') ||
-      ancParent.is(':header'))
-  {
-    pos = ancParent.position().top;
-  } else if (anchor.position()) {
-    pos = anchor.position().top;
-  }
-  if (pos) {
-    var dist = Math.abs(Math.min(
-               pos-docContent.offset().top,
-               docContent[0].scrollHeight-
-               docContent.height()-docContent.scrollTop()));
-    animationInProgress=true;
-    docContent.animate({
-      scrollTop: pos + docContent.scrollTop() - docContent.offset().top
-    },Math.max(50,Math.min(500,dist)),function(){
-      if (updateLocation) window.location.href=aname;
-      animationInProgress=false;
-    });
-  }
-}
-
-function newNode(o, po, text, link, childrenData, lastNode)
-{
-  var node = new Object();
-  node.children = Array();
-  node.childrenData = childrenData;
-  node.depth = po.depth + 1;
-  node.relpath = po.relpath;
-  node.isLast = lastNode;
-
-  node.li = document.createElement("li");
-  po.getChildrenUL().appendChild(node.li);
-  node.parentNode = po;
-
-  node.itemDiv = document.createElement("div");
-  node.itemDiv.className = "item";
-
-  node.labelSpan = document.createElement("span");
-  node.labelSpan.className = "label";
-
-  createIndent(o,node.itemDiv,node,0);
-  node.itemDiv.appendChild(node.labelSpan);
-  node.li.appendChild(node.itemDiv);
-
-  var a = document.createElement("a");
-  node.labelSpan.appendChild(a);
-  node.label = document.createTextNode(text);
-  node.expanded = false;
-  a.appendChild(node.label);
-  if (link) {
-    var url;
-    if (link.substring(0,1)=='^') {
-      url = link.substring(1);
-      link = url;
-    } else {
-      url = node.relpath+link;
-    }
-    a.className = stripPath(link.replace('#',':'));
-    if (link.indexOf('#')!=-1) {
-      var aname = '#'+link.split('#')[1];
-      var srcPage = stripPath(pathName());
-      var targetPage = stripPath(link.split('#')[0]);
-      a.href = srcPage!=targetPage ? url : "javascript:void(0)"; 
-      a.onclick = function(){
-        storeLink(link);
-        if (!$(a).parent().parent().hasClass('selected'))
-        {
-          $('.item').removeClass('selected');
-          $('.item').removeAttr('id');
-          $(a).parent().parent().addClass('selected');
-          $(a).parent().parent().attr('id','selected');
-        }
-        var anchor = $(aname);
-        gotoAnchor(anchor,aname,true);
-      };
-    } else {
-      a.href = url;
-      a.onclick = function() { storeLink(link); }
-    }
-  } else {
-    if (childrenData != null) 
-    {
-      a.className = "nolink";
-      a.href = "javascript:void(0)";
-      a.onclick = node.expandToggle.onclick;
-    }
-  }
-
-  node.childrenUL = null;
-  node.getChildrenUL = function() {
-    if (!node.childrenUL) {
-      node.childrenUL = document.createElement("ul");
-      node.childrenUL.className = "children_ul";
-      node.childrenUL.style.display = "none";
-      node.li.appendChild(node.childrenUL);
-    }
-    return node.childrenUL;
-  };
-
-  return node;
-}
-
-function showRoot()
-{
-  var headerHeight = $("#top").height();
-  var footerHeight = $("#nav-path").height();
-  var windowHeight = $(window).height() - headerHeight - footerHeight;
-  (function (){ // retry until we can scroll to the selected item
-    try {
-      var navtree=$('#nav-tree');
-      navtree.scrollTo('#selected',0,{offset:-windowHeight/2});
-    } catch (err) {
-      setTimeout(arguments.callee, 0);
-    }
-  })();
-}
-
-function expandNode(o, node, imm, showRoot)
-{
-  if (node.childrenData && !node.expanded) {
-    if (typeof(node.childrenData)==='string') {
-      var varName    = node.childrenData;
-      getScript(node.relpath+varName,function(){
-        node.childrenData = getData(varName);
-        expandNode(o, node, imm, showRoot);
-      }, showRoot);
-    } else {
-      if (!node.childrenVisited) {
-        getNode(o, node);
-      } if (imm || ($.browser.msie && $.browser.version>8)) { 
-        // somehow slideDown jumps to the start of tree for IE9 :-(
-        $(node.getChildrenUL()).show();
-      } else {
-        $(node.getChildrenUL()).slideDown("fast");
-      }
-      if (node.isLast) {
-        node.plus_img.src = node.relpath+"ftv2mlastnode.png";
-      } else {
-        node.plus_img.src = node.relpath+"ftv2mnode.png";
-      }
-      node.expanded = true;
-    }
-  }
-}
-
-function glowEffect(n,duration)
-{
-  n.addClass('glow').delay(duration).queue(function(next){
-    $(this).removeClass('glow');next();
-  });
-}
-
-function highlightAnchor()
-{
-  var aname = hashUrl();
-  var anchor = $(aname);
-  if (anchor.parent().attr('class')=='memItemLeft'){
-    var rows = $('.memberdecls tr[class$="'+hashValue()+'"]');
-    glowEffect(rows.children(),300); // member without details
-  } else if (anchor.parent().attr('class')=='fieldname'){
-    glowEffect(anchor.parent().parent(),1000); // enum value
-  } else if (anchor.parent().attr('class')=='fieldtype'){
-    glowEffect(anchor.parent().parent(),1000); // struct field
-  } else if (anchor.parent().is(":header")) {
-    glowEffect(anchor.parent(),1000); // section header
-  } else {
-    glowEffect(anchor.next(),1000); // normal member
-  }
-  gotoAnchor(anchor,aname,false);
-}
-
-function selectAndHighlight(hash,n)
-{
-  var a;
-  if (hash) {
-    var link=stripPath(pathName())+':'+hash.substring(1);
-    a=$('.item a[class$="'+link+'"]');
-  }
-  if (a && a.length) {
-    a.parent().parent().addClass('selected');
-    a.parent().parent().attr('id','selected');
-    highlightAnchor();
-  } else if (n) {
-    $(n.itemDiv).addClass('selected');
-    $(n.itemDiv).attr('id','selected');
-  }
-  if ($('#nav-tree-contents .item:first').hasClass('selected')) {
-    $('#nav-sync').css('top','30px');
-  } else {
-    $('#nav-sync').css('top','5px');
-  }
-  showRoot();
-}
-
-function showNode(o, node, index, hash)
-{
-  if (node && node.childrenData) {
-    if (typeof(node.childrenData)==='string') {
-      var varName    = node.childrenData;
-      getScript(node.relpath+varName,function(){
-        node.childrenData = getData(varName);
-        showNode(o,node,index,hash);
-      },true);
-    } else {
-      if (!node.childrenVisited) {
-        getNode(o, node);
-      }
-      $(node.getChildrenUL()).css({'display':'block'});
-      if (node.isLast) {
-        node.plus_img.src = node.relpath+"ftv2mlastnode.png";
-      } else {
-        node.plus_img.src = node.relpath+"ftv2mnode.png";
-      }
-      node.expanded = true;
-      var n = node.children[o.breadcrumbs[index]];
-      if (index+1<o.breadcrumbs.length) {
-        showNode(o,n,index+1,hash);
-      } else {
-        if (typeof(n.childrenData)==='string') {
-          var varName = n.childrenData;
-          getScript(n.relpath+varName,function(){
-            n.childrenData = getData(varName);
-            node.expanded=false;
-            showNode(o,node,index,hash); // retry with child node expanded
-          },true);
-        } else {
-          var rootBase = stripPath(o.toroot.replace(/\..+$/, ''));
-          if (rootBase=="index" || rootBase=="pages" || rootBase=="search") {
-            expandNode(o, n, true, true);
-          }
-          selectAndHighlight(hash,n);
-        }
-      }
-    }
-  } else {
-    selectAndHighlight(hash);
-  }
-}
-
-function removeToInsertLater(element) {
-  var parentNode = element.parentNode;
-  var nextSibling = element.nextSibling;
-  parentNode.removeChild(element);
-  return function() {
-    if (nextSibling) {
-      parentNode.insertBefore(element, nextSibling);
-    } else {
-      parentNode.appendChild(element);
-    }
-  };
-}
-
-function getNode(o, po)
-{
-  var insertFunction = removeToInsertLater(po.li);
-  po.childrenVisited = true;
-  var l = po.childrenData.length-1;
-  for (var i in po.childrenData) {
-    var nodeData = po.childrenData[i];
-    po.children[i] = newNode(o, po, nodeData[0], nodeData[1], nodeData[2],
-      i==l);
-  }
-  insertFunction();
-}
-
-function gotoNode(o,subIndex,root,hash,relpath)
-{
-  var nti = navTreeSubIndices[subIndex][root+hash];
-  o.breadcrumbs = $.extend(true, [], nti ? nti : navTreeSubIndices[subIndex][root]);
-  if (!o.breadcrumbs && root!=NAVTREE[0][1]) { // fallback: show index
-    navTo(o,NAVTREE[0][1],"",relpath);
-    $('.item').removeClass('selected');
-    $('.item').removeAttr('id');
-  }
-  if (o.breadcrumbs) {
-    o.breadcrumbs.unshift(0); // add 0 for root node
-    showNode(o, o.node, 0, hash);
-  }
-}
-
-function navTo(o,root,hash,relpath)
-{
-  var link = cachedLink();
-  if (link) {
-    var parts = link.split('#');
-    root = parts[0];
-    if (parts.length>1) hash = '#'+parts[1].replace(/[^\w\-]/g,'');
-    else hash='';
-  }
-  if (hash.match(/^#l\d+$/)) {
-    var anchor=$('a[name='+hash.substring(1)+']');
-    glowEffect(anchor.parent(),1000); // line number
-    hash=''; // strip line number anchors
-  }
-  var url=root+hash;
-  var i=-1;
-  while (NAVTREEINDEX[i+1]<=url) i++;
-  if (i==-1) { i=0; root=NAVTREE[0][1]; } // fallback: show index
-  if (navTreeSubIndices[i]) {
-    gotoNode(o,i,root,hash,relpath)
-  } else {
-    getScript(relpath+'navtreeindex'+i,function(){
-      navTreeSubIndices[i] = eval('NAVTREEINDEX'+i);
-      if (navTreeSubIndices[i]) {
-        gotoNode(o,i,root,hash,relpath);
-      }
-    },true);
-  }
-}
-
-function showSyncOff(n,relpath)
-{
-    n.html('<img src="'+relpath+'sync_off.png" title="'+SYNCOFFMSG+'"/>');
-}
-
-function showSyncOn(n,relpath)
-{
-    n.html('<img src="'+relpath+'sync_on.png" title="'+SYNCONMSG+'"/>');
-}
-
-function toggleSyncButton(relpath)
-{
-  var navSync = $('#nav-sync');
-  if (navSync.hasClass('sync')) {
-    navSync.removeClass('sync');
-    showSyncOff(navSync,relpath);
-    storeLink(stripPath2(pathName())+hashUrl());
-  } else {
-    navSync.addClass('sync');
-    showSyncOn(navSync,relpath);
-    deleteLink();
-  }
-}
-
-function initNavTree(toroot,relpath)
-{
-  var o = new Object();
-  o.toroot = toroot;
-  o.node = new Object();
-  o.node.li = document.getElementById("nav-tree-contents");
-  o.node.childrenData = NAVTREE;
-  o.node.children = new Array();
-  o.node.childrenUL = document.createElement("ul");
-  o.node.getChildrenUL = function() { return o.node.childrenUL; };
-  o.node.li.appendChild(o.node.childrenUL);
-  o.node.depth = 0;
-  o.node.relpath = relpath;
-  o.node.expanded = false;
-  o.node.isLast = true;
-  o.node.plus_img = document.createElement("img");
-  o.node.plus_img.src = relpath+"ftv2pnode.png";
-  o.node.plus_img.width = 16;
-  o.node.plus_img.height = 22;
-
-  if (localStorageSupported()) {
-    var navSync = $('#nav-sync');
-    if (cachedLink()) {
-      showSyncOff(navSync,relpath);
-      navSync.removeClass('sync');
-    } else {
-      showSyncOn(navSync,relpath);
-    }
-    navSync.click(function(){ toggleSyncButton(relpath); });
-  }
-
-  $(window).load(function(){
-    navTo(o,toroot,hashUrl(),relpath);
-    showRoot();
-  });
-
-  $(window).bind('hashchange', function(){
-     if (window.location.hash && window.location.hash.length>1){
-       var a;
-       if ($(location).attr('hash')){
-         var clslink=stripPath(pathName())+':'+hashValue();
-         a=$('.item a[class$="'+clslink.replace(/</g,'\\3c ')+'"]');
-       }
-       if (a==null || !$(a).parent().parent().hasClass('selected')){
-         $('.item').removeClass('selected');
-         $('.item').removeAttr('id');
-       }
-       var link=stripPath2(pathName());
-       navTo(o,link,hashUrl(),relpath);
-     } else if (!animationInProgress) {
-       $('#doc-content').scrollTop(0);
-       $('.item').removeClass('selected');
-       $('.item').removeAttr('id');
-       navTo(o,toroot,hashUrl(),relpath);
-     }
-  })
-}
-
diff --git a/docs/html/navtreeindex0.js b/docs/html/navtreeindex0.js
deleted file mode 100644
index 912552ff2..000000000
--- a/docs/html/navtreeindex0.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var NAVTREEINDEX0 =
-{
-"index.html":[],
-"md__benchmarks.html":[8],
-"md__building.html":[0],
-"md__compiler.html":[1],
-"md__cpp_usage.html":[3],
-"md__go_usage.html":[4],
-"md__grammar.html":[11],
-"md__internals.html":[10],
-"md__java_usage.html":[5],
-"md__python_usage.html":[6],
-"md__schemas.html":[2],
-"md__support.html":[7],
-"md__white_paper.html":[9],
-"pages.html":[]
-};
diff --git a/docs/html/open.png b/docs/html/open.png
deleted file mode 100644
index 30f75c7efe2dd0c9e956e35b69777a02751f048b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 123
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VPM$7~Ar*{o?;hlAFyLXmaDC0y
znK1_#cQqJWPES%4Uujug^TE?jMft$}Eq^WaR~)%f)vSNs&gek&x%A9X9sM<Rdl=8h
W@EqZ{ytxBt8iS{+pUXO@geCxcDJg#d

diff --git a/docs/html/pages.html b/docs/html/pages.html
deleted file mode 100644
index fef29f969..000000000
--- a/docs/html/pages.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Related Pages</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
-  $(document).ready(initResizable);
-  $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td id="commonprojectlogo">
-    <img alt="Logo" src="fpl_logo_small.png"/>
-  </td>
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">FlatBuffers
-   </div>
-   <div style="font-size:12px;">
-    An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
-  <div id="nav-tree">
-    <div id="nav-tree-contents">
-      <div id="nav-sync" class="sync"></div>
-    </div>
-  </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
-       class="ui-resizable-handle">
-  </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('pages.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
-  <div class="headertitle">
-<div class="title">Related Pages</div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock">Here is a list of all related documentation pages:</div><div class="directory">
-<table class="directory">
-<tr id="row_0_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__building.html" target="_self">Building</a></td><td class="desc"></td></tr>
-<tr id="row_1_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__compiler.html" target="_self">Using the schema compiler</a></td><td class="desc"></td></tr>
-<tr id="row_2_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__schemas.html" target="_self">Writing a schema</a></td><td class="desc"></td></tr>
-<tr id="row_3_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__cpp_usage.html" target="_self">Use in C++</a></td><td class="desc"></td></tr>
-<tr id="row_4_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__go_usage.html" target="_self">Use in Go</a></td><td class="desc"></td></tr>
-<tr id="row_5_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__java_usage.html" target="_self">Use in Java/C-sharp</a></td><td class="desc"></td></tr>
-<tr id="row_6_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__python_usage.html" target="_self">Use in Python</a></td><td class="desc"></td></tr>
-<tr id="row_7_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__support.html" target="_self">Platform / Language / Feature support</a></td><td class="desc"></td></tr>
-<tr id="row_8_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__benchmarks.html" target="_self">Benchmarks</a></td><td class="desc"></td></tr>
-<tr id="row_9_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__white_paper.html" target="_self">FlatBuffers white paper</a></td><td class="desc"></td></tr>
-<tr id="row_10_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__internals.html" target="_self">FlatBuffer Internals</a></td><td class="desc"></td></tr>
-<tr id="row_11_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__grammar.html" target="_self">Grammar of the schema language</a></td><td class="desc"></td></tr>
-</table>
-</div><!-- directory -->
-</div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-49880327-7', 'auto');
-  ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/html/resize.js b/docs/html/resize.js
deleted file mode 100644
index 304fcb6ba..000000000
--- a/docs/html/resize.js
+++ /dev/null
@@ -1,97 +0,0 @@
-var cookie_namespace = 'doxygen'; 
-var sidenav,navtree,content,header;
-
-function readCookie(cookie) 
-{
-  var myCookie = cookie_namespace+"_"+cookie+"=";
-  if (document.cookie) 
-  {
-    var index = document.cookie.indexOf(myCookie);
-    if (index != -1) 
-    {
-      var valStart = index + myCookie.length;
-      var valEnd = document.cookie.indexOf(";", valStart);
-      if (valEnd == -1) 
-      {
-        valEnd = document.cookie.length;
-      }
-      var val = document.cookie.substring(valStart, valEnd);
-      return val;
-    }
-  }
-  return 0;
-}
-
-function writeCookie(cookie, val, expiration) 
-{
-  if (val==undefined) return;
-  if (expiration == null) 
-  {
-    var date = new Date();
-    date.setTime(date.getTime()+(10*365*24*60*60*1000)); // default expiration is one week
-    expiration = date.toGMTString();
-  }
-  document.cookie = cookie_namespace + "_" + cookie + "=" + val + "; expires=" + expiration+"; path=/";
-}
- 
-function resizeWidth() 
-{
-  var windowWidth = $(window).width() + "px";
-  var sidenavWidth = $(sidenav).outerWidth();
-  content.css({marginLeft:parseInt(sidenavWidth)+"px"}); 
-  writeCookie('width',sidenavWidth, null);
-}
-
-function restoreWidth(navWidth)
-{
-  var windowWidth = $(window).width() + "px";
-  content.css({marginLeft:parseInt(navWidth)+6+"px"});
-  sidenav.css({width:navWidth + "px"});
-}
-
-function resizeHeight() 
-{
-  var headerHeight = header.outerHeight();
-  var footerHeight = footer.outerHeight();
-  var windowHeight = $(window).height() - headerHeight - footerHeight;
-  content.css({height:windowHeight + "px"});
-  navtree.css({height:windowHeight + "px"});
-  sidenav.css({height:windowHeight + "px",top: headerHeight+"px"});
-}
-
-function initResizable()
-{
-  header  = $("#top");
-  sidenav = $("#side-nav");
-  content = $("#doc-content");
-  navtree = $("#nav-tree");
-  footer  = $("#nav-path");
-  $(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
-  $(window).resize(function() { resizeHeight(); });
-  var width = readCookie('width');
-  if (width) { restoreWidth(width); } else { resizeWidth(); }
-  resizeHeight();
-  var url = location.href;
-  var i=url.indexOf("#");
-  if (i>=0) window.location.hash=url.substr(i);
-  var _preventDefault = function(evt) { evt.preventDefault(); };
-  $("#splitbar").bind("dragstart", _preventDefault).bind("selectstart", _preventDefault);
-  $(document).bind('touchmove',function(e){
-    var device = navigator.userAgent.toLowerCase();
-    var ios = device.match(/(iphone|ipod|ipad)/);
-    if (ios) {
-      try {
-        var target = e.target;
-        while (target) {
-          if ($(target).css('-webkit-overflow-scrolling')=='touch') return;
-          target = target.parentNode;
-        }
-        e.preventDefault();
-      } catch(err) {
-        e.preventDefault();
-      }
-    }
-  });
-}
-
-
diff --git a/docs/html/style.css b/docs/html/style.css
deleted file mode 100644
index 94ec90b13..000000000
--- a/docs/html/style.css
+++ /dev/null
@@ -1,396 +0,0 @@
-body, 
-#projectname,
-table, 
-div, 
-p, 
-dl, 
-.title, 
-.tabs, 
-.tabs2, 
-.tabs3, 
-#nav-tree .label {
-  font-family: roboto, sans-serif;
-}
-
-#commonprojectlogo {
-  padding: 5px 0px 5px 15px;
-}
-
-#projectname {
-  color: #00bcd4;
-  font-size: 280%;
-  padding: 15px 0px;
-  font-weight: 300;
-}
-
-#titlearea {
-  border-bottom: 2px solid #e5e5e5;
-}
-
-.title {
-  color: #212121;
-  font: 300 34px/40px Roboto,sans-serif;
-}
-
-#nav-tree {
-  background-color: #fff;
-}
-
-#navrow1, #navrow2 {
-  border-bottom: 2px solid #e7e7e7;
-}
-
-.tabs, .tabs2, .tabs3 {
-  font-size: 14px;
-}
-
-.tabs, 
-.tabs2, 
-.tabs3, 
-.tablist li, 
-.tablist li.current a {
-  background-image: none;	
-}
-
-.tablist {
-  list-style: none;
-}
-
-.tablist li, .tablist li p {
-  margin: 0;
-}
-
-.tablist li a,
-.tablist li.current a {
-  color: #757575;
-  text-shadow: none;
-}
-
-.tablist li.current a {
-  background: #00bcd4;
-  color: #fff;
-}
-
-.tablist a {
-  background-image: none;
-  border-right: 2px solid #e5e5e5;
-  font-weight: normal;
-}
-
-.tablist a:hover,
-.tablist li.current a:hover {
-  background-image: none;
-  text-decoration: underline;
-  text-shadow: none;
-}
-
-.tablist a:hover {
-  color: #00bcd4;
-}
-
-.tablist li.current a:hover {
-  color: #fff;
-}
-
-div.header {
-  background-color: #f7f7f7;
-  background-image: none;
-  border-bottom: none;
-}
-
-#MSearchBox {
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  display: inline-block;
-  height: 20px;
-  right: 10px;
-}
-
-#MSearchBox .left, 
-#MSearchBox .right, 
-#MSearchField {
-  background: none;
-}
-
-a.SelectItem:hover {
-  background-color: #00bcd4;
-}
-
-#nav-tree {
-  background-image: none;
-}
-
-#nav-tree .selected {
-  background-image: none;
-  text-shadow: none;
-  background-color: #f7f7f7;
-}
-
-#nav-tree a {
-  color: #212121;
-}
-
-#nav-tree .selected a {
-  color: #0288d1;
-}
-
-#nav-tree .item:hover {
-  background-color: #f7f7f7;
-}
-
-#nav-tree .item:hover a {
-  color: #0288d1;
-}
-
-#nav-tree .label {
-  font-size: 13px;
-}
-
-#nav-sync {
-  display: none;
-}
-
-.ui-resizable-e {
-  background: #ebebeb;
-  border-left: 1px solid #ddd;
-  border-right: 1px solid #ddd;
-}
-
-.contents tr td .image {
-  margin-top: 24px;
-}
-
-.image {
-  text-align: left;
-  margin-bottom: 8px;
-}
-
-a:link, 
-a:visited, 
-.contents a:link, 
-.contents a:visited,
-a.el {
-  color: #0288d1;
-  font-weight: normal;
-  text-decoration: none;
-}
-
-div.contents {
-  margin-right: 12px;
-}
-
-.directory tr, .directory tr.even {
-  background: #7cb342;
-  border-top: 1px solid #7cb342;
-}
-
-.directory td,
-.directory td.entry,
-.directory td.desc {
-  background: rgba(255,255,255,.95);
-  border-left: none;
-  color: #212121;
-  padding-top: 10px;
-  padding-bottom: 10px;
-  padding-left: 8px;
-  padding-right: 8px;
-}
-
-.directory tr#row_0_ {
-  border-top-color: #7cb342;	
-}
-
-.directory tr#row_0_ td {
-  background: #7cb342;
-  color: #fff;
-  font-size: 18px;
-}
-
-.memSeparator {
-  border-bottom: none;
-}
-
-.memitem {
-  background: #7cb342;
-}
-
-.memproto, dl.reflist dt {
-  background: #7cb342;
-  background-image: none;
-  border: none;
-  box-shadow: none;
-  -webkit-box-shadow: none;
-  color: #fff;
-  text-shadow: none;
-}
-
-.memproto .memtemplate,
-.memproto a.el,
-.memproto .paramname {
-  color: #fff;
-}
-
-.memdoc, dl.reflist dd {
-  border: none;
-  background-color: rgba(255,255,255,.95);
-  background-image: none;
-  box-shadow: none;
-  -webkit-box-shadow: none;
-  -webkit-border-bottom-left-radius: 0;
-  -webkit-border-bottom-right-radius: 0;
-}
-
-.memitem, table.doxtable, table.memberdecls {
-  margin-bottom: 24px;
-}
-
-table.doxtable th {
-  background: #7cb342;
-}
-
-table.doxtable tr {
-  background: #7cb342;
-  border-top: 1px solid #7cb342;
-}
-
-table.doxtable td, table.doxtable th {
-  border: none;
-  padding: 10px 8px;
-}
-
-table.doxtable td {
-  background-color: rgba(255,255,255,.95);
-}
-
-.memberdecls {
-  background: #7cb342;
-  border-top: 1px solid #7cb342;
-}
-
-.memberdecls .heading h2 {
-  border-bottom: none;
-  color: #fff;
-  font-size: 110%;
-  font-weight: bold;
-  margin: 0 0 0 6px;
-}
-
-.memberdecls tr:not(.heading) td {
-  background-color: rgba(255,255,255,.95);  
-}
-
-h1, h2, h2.groupheader, h3, h4, h5, h6 {
-  color: #212121;
-}
-
-h1 {
-  border-bottom: 1px solid #ebebeb;
-  font: 400 28px/32px Roboto,sans-serif;
-  letter-spacing: -.01em;
-  margin: 40px 0 20px;
-  padding-bottom: 3px;
-}
-
-h2, h2.groupheader {
-  border-bottom: 1px solid #ebebeb;
-  font: 400 23px/32px Roboto,sans-serif;
-  letter-spacing: -.01em;
-  margin: 40px 0 20px;
-  padding-bottom: 3px;
-}
-
-h3 {
-  font: 500 20px/32px Roboto,sans-serif;
-  margin: 32px 0 16px;
-}
-
-h4 {
-  font: 500 18px/32px Roboto,sans-serif;
-  margin: 32px 0 16px;
-}
-
-ol,
-ul {
-  margin: 0;
-  padding-left: 40px;
-}
-
-ol {
-  list-style: decimal outside;
-}
-
-ol ol {
-  list-style-type: lower-alpha;
-}
-
-ol ol ol {
-  list-style-type: lower-roman;
-}
-
-ul {
-  list-style: disc outside;
-}
-
-li,
-li p {
-  margin: 8px 0;
-  padding: 0;
-}
-
-div.summary
-{
-  float: none;
-  font-size: 8pt;
-  padding-left: 5px;
-  width: calc(100% - 10px);
-  text-align: left;
-  display: block;
-}
-
-div.ingroups {
-  margin-top: 8px;
-}
-
-div.fragment {
-  border: 1px solid #ddd;
-  color: #455a64;
-  font: 14px/20px Roboto Mono, monospace;
-  padding: 8px;
-}
-
-div.line {
-  line-height: 1.5;
-  font-size: inherit;
-}
-
-code, pre {
-  color: #455a64;
-  background: #f7f7f7;
-  font: 400 100%/1 Roboto Mono,monospace;
-  padding: 1px 4px;
-}
-
-span.preprocessor, span.comment {
-  color: #0b8043;
-}
-
-span.keywordtype {
-  color: #0097a7;  
-}
-
-.paramname {
-  color: #ef6c00;
-}
-
-.memTemplParams {
-  color: #ef6c00;	
-}
-
-span.mlabel {
-  background: rgba(255,255,255,.25);
-  border: none;
-}
-
-blockquote {
-  border: 1px solid #ddd;
-}
diff --git a/docs/html/sync_off.png b/docs/html/sync_off.png
deleted file mode 100644
index 3b443fc62892114406e3d399421b2a881b897acc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 853
zcmV-b1FHOqP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0009VNkl<ZcmeI*
zOK4PA7{KxW<S|JmGnqI|rb(KahDirA+8B+gVk8A)%pe9yF;+3L5iKZG7xuBS&@L(k
z33MTXOIxMHjirbWgs8M;qhM?(_-v^nS(KzU#%Ih_`hB-^XYSm&39)2*I6vmhow@fr
z=iKj{vvuv-e;!~uA+biR6pf-n<cdGVuox5<#BBg4c>oT|#XixUYy%lpuf3i8{fX!o
zUyDD0jOrAiT^tq>fLSOOABs-#u{dV^F$b{L9&!2=9&RmV;;8s^x&UqB$PCj4FdKbh
zoB1WTskPUPu05XzFbA}=KZ-GP1fPpAfSs>6AHb12UlR%-i&uOlTpFNS7{jm@mkU1V
zh`nrXr~+^lsV-s1dkZOaI|kYyVj3WBpPCY{n~yd%u%e+d=f%`N0FItMPtdgBb@py;
zq@v6NVArhyTC7)ULw-Jy8y42S1~4n(3LkrW8mW(F-4oXUP3E`e#g**YyqI7h-J2zK
zK{m9##m4ri!7N>CqQqCcnI3hqo1I;Yh&QLNY4T`*ptiQGozK>FF$!$+84Z`xwmeMh
zJ0WT+OH$WYFALEaGj2_l+#DC3t7_S`vHpSivNeFbP6+r50cO<q-Bsh$IuZaopT|9E
z-75alp&U9s%(|8uI^NA(#AD;nc=%{ivdZX(QFJ7~-yf%_Adjk`W@NhjJTyZ8*;|!n
z9=K#TJuZz+={YZ#>8iu)`7i%Z4BTPh@_m3Tk!nAm^)5Bqnr%Ov|Baunj#&RPtRuK&
z4RGz|D5HNrW83-#ydk}tVKJrNmyYt-sT<tBHx6XfOFDx2(ijpMiR>xLGlJY5nc&Re
zU4SgHNPx8~Yxwr$bsju?4q&%T1874xxzq+_%?h8_ofw~(bld=o3iC)LUNR*BY%c0y
zWd_jX{Y8`l%z+ol1$@Qa?Cy!(0CVIEeYpKZ`(9{z>3$CIe;pJDQk$m3p}$>xBm4lb
zKo{4S)`wdU9Ba9jJbVJ0C=SOefZe%d$8=2r={nu<_^a3~>c#t_U6dye5)JrR(_a^E
f@}b6j1K9lwFJq@>o)+Ry00000NkvXXu0mjfWa5j*

diff --git a/docs/html/sync_on.png b/docs/html/sync_on.png
deleted file mode 100644
index e08320fb64e6fa33b573005ed6d8fe294e19db76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 845
zcmV-T1G4;yP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0009NNkl<ZcmeI*
zUr1D09KiAKIOC-Ar)j4&EoU~y1|7@QCTmeCsMH~fFw#|0OWK8m>Y;xxyHF2B5Wzm|
zOOGupOTn@c(JmBOl)e;XMNnZuiTJP>rM8<|Q`7I<ojWskx{8*sm){4kXJ+p2oO6HY
zoL5W7@h*VL_(ZL!7GaSmtl}SWU-XD;q7T4~4ZuW>_))aP?*T)ow&n59{}X4$3Goat
zgjs?*aasfbrokzG5cT4K=uG`E14xZl@z)F<o_Z}1zllSWC8!Z+rkFN>={P0Y^?$4t
z>v!teRnNZym<6h{7sLyF1V0HsfEl+l6TrZpsfr1}luH~F7L}ktXu|*uVX^RG$L0`K
zWs3j|0tIvVe(N%_?2{(iCPFGf#B6Hjy6o&}D$A%W%jfO8_W%ZO#-mh}EM$LMn7joJ
z05dHr!5Y92g+31l<%i1(=L1a1pXX+OYnalY>31V4K}BjyRe3)9n#;-cCVRD_IG1fT
zOKGeNY8q;TL@K{dj@D^scf&VCs*-Jb>8b>|`b*osv52-!A?BpbYtTQBns5EAU**$m
zSnVSm(teh>tQi*S*A>#ySc=n;`BHz`DuG4&g4Kf8lLhca+zvZ7t7RflD6-i-mcK=M
z!=^P$*u2)bkY5asG4gsss!Hn%u~>}kIW`vMs%lJLH+u*9<4PaV_c6U`KqWXQH%+Nu
zTv41O(^ZVi@qhjQdG!fbZw&y+2o!iYymO^?ud3{P*HdoX83YV*Uu_HB=?U&W9%AU#
z80}k1SS-CXTU7dcQlsm<^oYLxVSseqY6NO}dc`Nj?8vrhNuCdm@^{a3AQ_>6myOj+
z`1RsLUXF|dm|3k7s2jD(B{rzE>WI2scH8i1;=O5Cc9xB3^aJk%fQjqsu+kH#0=_5a
z0nCE8@dbQa-|YIuUVvG0L_IwHMEhOj$M<u9&-IHqnYs=DL+lbi3lG2ysF!p!_2H=p
zj-g89hmThki^;JHknVE4V`@zS$(ZbTd?1=dsrXLRiJbUBq7weAmVjEk@rP>j4Uq05
X8=0q~qBNan00000NkvXXu0mjfptF>5

diff --git a/docs/html/tab_a.png b/docs/html/tab_a.png
deleted file mode 100644
index 3b725c41c5a527a3a3e40097077d0e206a681247..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^j6kfy!2~3aiye;!QlXwMjv*C{Z|8b*H5dputLHD#
z=<0|*y7z(Vor?d;H&?EG&cXR}?!j-Lm&u1OOI7AIF5&c)RFE;&p0MYK>*Kl@eiymD
r@|NpwKX@^z+;{u_Z~trSBfrMKa%3`zocFjEXaR$#tDnm{r-UW|TZ1%4

diff --git a/docs/html/tab_b.png b/docs/html/tab_b.png
deleted file mode 100644
index e2b4a8638cb3496a016eaed9e16ffc12846dea18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^j6kfy!2~3aiye;!QU#tajv*C{Z}0l@H7kg?K0Lnr
z!j&C6_(~HV9oQ0Pa6x{-v0AGV_E?vLn<f<Rf3mJ=+uzfrOMlc%s`x4TZtnrR|B~W{
zyZP0m7vvtXV80W5^J2vvp97)4WrPK1-P<H^B$Ll|TGvzm;+92|BpdT89$b1Qf7x5g
UZ&RH}7SL`6Pgg&ebxsLQ0A}n&iU0rr

diff --git a/docs/html/tab_h.png b/docs/html/tab_h.png
deleted file mode 100644
index fd5cb705488e60fcf30f56fcc951dee74f3b095b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^j6kfy!2~3aiye;!QWc&qjv*C{Z}0jF9dr<AdpNI7
zaOs_6=O($9b?lc?Qk=SJVv5%FA{O^TY1^*qJ@<p}E}!uH_1eoPJ&tpVl={bg{Skd2
zp1FO|;|R90%G3WYZM5AU=A4%H?3qaQhHt%H9G|xYJ)ff*|MmI*zD3`*Z|LP?7d&26
cn!ZiLK0QM$CeyB_80ZEDPgg&ebxsLQ0C?O;!~g&Q

diff --git a/docs/html/tab_s.png b/docs/html/tab_s.png
deleted file mode 100644
index ab478c95b67371d700a20869f7de1ddd73522d50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^j6kfy!2~3aiye;!QuUrLjv*C{Z|^p8HaRdjTwH7)
zC?wLlL}}I{)n%R&r+1}IGmDnq;&J#%V6)9VsYhS`O^BVBQlxOUep0c$RENLq#g8A$
z)z7%K_bI&n@J+X_=x}fJoEKed-$<>=ZI-;YrdjIl`U`uzuDWSP?o#Dmo{%SgM#oan
kX~E1%D-|#H#QbHoIja2U-MgvsK&LQxy85}Sb4q9e0Efg%P5=M^

diff --git a/docs/html/tabs.css b/docs/html/tabs.css
deleted file mode 100644
index 9cf578f23..000000000
--- a/docs/html/tabs.css
+++ /dev/null
@@ -1,60 +0,0 @@
-.tabs, .tabs2, .tabs3 {
-    background-image: url('tab_b.png');
-    width: 100%;
-    z-index: 101;
-    font-size: 13px;
-    font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
-}
-
-.tabs2 {
-    font-size: 10px;
-}
-.tabs3 {
-    font-size: 9px;
-}
-
-.tablist {
-    margin: 0;
-    padding: 0;
-    display: table;
-}
-
-.tablist li {
-    float: left;
-    display: table-cell;
-    background-image: url('tab_b.png');
-    line-height: 36px;
-    list-style: none;
-}
-
-.tablist a {
-    display: block;
-    padding: 0 20px;
-    font-weight: bold;
-    background-image:url('tab_s.png');
-    background-repeat:no-repeat;
-    background-position:right;
-    color: #283A5D;
-    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
-    text-decoration: none;
-    outline: none;
-}
-
-.tabs3 .tablist a {
-    padding: 0 10px;
-}
-
-.tablist a:hover {
-    background-image: url('tab_h.png');
-    background-repeat:repeat-x;
-    color: #fff;
-    text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
-    text-decoration: none;
-}
-
-.tablist li.current a {
-    background-image: url('tab_a.png');
-    background-repeat:repeat-x;
-    color: #fff;
-    text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
-}
diff --git a/docs/source/Benchmarks.md b/docs/source/Benchmarks.md
index 50061d717..e5e58474e 100755
--- a/docs/source/Benchmarks.md
+++ b/docs/source/Benchmarks.md
@@ -1,4 +1,5 @@
-# Benchmarks
+Benchmarks    {#flatbuffers_benchmarks}
+==========
 
 Comparing against other serialization solutions, running on Windows 7
 64bit. We use the LITE runtime for Protocol Buffers (less code / lower
@@ -20,17 +21,17 @@ The benchmark object is a set of about 10 objects containing an array, 4
 strings, and a large variety of int/float scalar values of all sizes,
 meant to be representative of game data, e.g. a scene format.
 
-|                                                        | FlatBuffers (binary)  | Protocol Buffers LITE | Rapid JSON            | FlatBuffers (JSON)    | pugixml               | Raw structs           |
-|--------------------------------------------------------|-----------------------|-----------------------|-----------------------|-----------------------| ----------------------| ----------------------|
-| Decode + Traverse + Dealloc (1 million times, seconds) | 0.08                  | 302                   | 583                   | 105                   | 196                   | 0.02                  |
-| Decode / Traverse / Dealloc (breakdown)                | 0 / 0.08 / 0          | 220 / 0.15 / 81       | 294 / 0.9 / 287       | 70 / 0.08 / 35        | 41 / 3.9 / 150        | 0 / 0.02 / 0          |
-| Encode (1 million times, seconds)                      | 3.2                   | 185                   | 650                   | 169                   | 273                   | 0.15                  |
-| Wire format size (normal / zlib, bytes)                | 344 / 220             | 228 / 174             | 1475 / 322            | 1029 / 298            | 1137 / 341            | 312 / 187             |
-| Memory needed to store decoded wire (bytes / blocks)   | 0 / 0                 | 760 / 20              | 65689 / 4             | 328 / 1               | 34194 / 3             | 0 / 0                 |
-| Transient memory allocated during decode (KB)          | 0                     | 1                     | 131                   | 4                     | 34                    | 0                     |
-| Generated source code size (KB)                        | 4                     | 61                    | 0                     | 4                     | 0                     | 0                     |
-| Field access in handwritten traversal code             | typed accessors       | typed accessors       | manual error checking | typed accessors       | manual error checking | typed but no safety   |
-| Library source code (KB)                               | 15                    | some subset of 3800   | 87                    | 43                    | 327                   | 0                     |
+|                                                        | FlatBuffers (binary)  | Protocol Buffers LITE | Rapid JSON            | FlatBuffers (JSON)     | pugixml               | Raw structs           |
+|--------------------------------------------------------|-----------------------|-----------------------|-----------------------|------------------------| ----------------------| ----------------------|
+| Decode + Traverse + Dealloc (1 million times, seconds) | 0.08                  | 302                   | 583                   | 105                    | 196                   | 0.02                  |
+| Decode / Traverse / Dealloc (breakdown)                | 0 / 0.08 / 0          | 220 / 0.15 / 81       | 294 / 0.9 / 287       | 70 / 0.08 / 35         | 41 / 3.9 / 150        | 0 / 0.02 / 0          |
+| Encode (1 million times, seconds)                      | 3.2                   | 185                   | 650                   | 169                    | 273                   | 0.15                  |
+| Wire format size (normal / zlib, bytes)                | 344 / 220             | 228 / 174             | 1475 / 322            | 1029 / 298             | 1137 / 341            | 312 / 187             |
+| Memory needed to store decoded wire (bytes / blocks)   | 0 / 0                 | 760 / 20              | 65689 / 4             | 328 / 1                | 34194 / 3             | 0 / 0                 |
+| Transient memory allocated during decode (KB)          | 0                     | 1                     | 131                   | 4                      | 34                    | 0                     |
+| Generated source code size (KB)                        | 4                     | 61                    | 0                     | 4                      | 0                     | 0                     |
+| Field access in handwritten traversal code             | typed accessors       | typed accessors       | manual error checking | typed accessors        | manual error checking | typed but no safety   |
+| Library source code (KB)                               | 15                    | some subset of 3800   | 87                    | 43                     | 327                   | 0                     |
 
 ### Some other serialization systems we compared against but did not benchmark (yet), in rough order of applicability:
 
@@ -58,3 +59,5 @@ Code for these benchmarks sits in `benchmarks/` in git branch `benchmarks`.
 It sits in its own branch because it has submodule dependencies that the main
 project doesn't need, and the code standards do not meet those of the main
 project. Please read `benchmarks/cpp/README.txt` before working with the code.
+
+<br>
diff --git a/docs/source/Building.md b/docs/source/Building.md
index f2e1818b6..f57371d5f 100755
--- a/docs/source/Building.md
+++ b/docs/source/Building.md
@@ -1,8 +1,13 @@
-# Building
+Building    {#flatbuffers_guide_building}
+========
+
+## Building with Visual Studio or Xcode projects
 
 There are project files for Visual Studio and Xcode that should allow you
 to build the compiler `flatc`, the samples and the tests out of the box.
 
+## Building with CMake
+
 Alternatively, the distribution comes with a `cmake` file that should allow
 you to build project/make files for any platform. For details on `cmake`, see
 <http://www.cmake.org>. In brief, depending on your platform, use one of
@@ -18,28 +23,45 @@ Note that to use clang instead of gcc, you may need to set up your environment
 variables, e.g.
 `CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake -G "Unix Makefiles"`.
 
-Optionally, run the `flattests` executable to ensure everything is working
-correctly on your system. If this fails, please contact us!
+Optionally, run the `flattests` executable from the root `flatbuffers/`
+directory to ensure everything is working correctly on your system. If this
+fails, please contact us!
 
-Note that you MUST be in the root of the FlatBuffers distribution when you
-run 'flattests' (and the samples), or it will fail to load its files.
+Building should also produce two sample executables, `flatsamplebinary` and
+`flatsampletext`, see the corresponding `.cpp` files in the
+`flatbuffers/samples` directory.
 
-Building should also produce two sample executables, `sample_binary` and
-`sample_text`, see the corresponding `.cpp` file in the samples directory.
+*Note that you MUST be in the root of the FlatBuffers distribution when you
+run 'flattests' or `flatsampletext`, or it will fail to load its files.*
 
-There is an `android` directory that contains all you need to build the test
-executable on android (use the included `build_apk.sh` script, or use
+## Building for Android
+
+There is a `flatbuffers/android` directory that contains all you need to build
+the test executable on android (use the included `build_apk.sh` script, or use
 `ndk_build` / `adb` etc. as usual). Upon running, it will output to the log
 if tests succeeded or not.
 
-There is usually no runtime to compile, as the code consists of a single
-header, `include/flatbuffers/flatbuffers.h`. You should add the
+You may also run an android sample from inside the `flatbuffers/samples`, by
+running the `android_sample.sh` script. Optionally, you may go to the
+`flatbuffers/samples/android` folder and build the sample with the
+`build_apk.sh` script or `ndk_build` / `adb` etc.
+
+## Using FlatBuffers in your own projects.
+
+For C++, there is usually no runtime to compile, as the code consists of a
+single header, `include/flatbuffers/flatbuffers.h`. You should add the
 `include` folder to your include paths. If you wish to be
 able to load schemas and/or parse text into binary buffers at runtime,
 you additionally need the other headers in `include/flatbuffers`. You must
 also compile/link `src/idl_parser.cpp` (and `src/idl_gen_text.cpp` if you
 also want to be able convert binary to text).
 
+To see how to include FlatBuffers in any of our supported languages, please
+view the [Tutorial](@ref flatbuffers_guide_tutorial) and select your appropriate
+language using the radio buttons.
+
+#### For Google Play apps
+
 For applications on Google Play that integrate this library, usage is tracked.
 This tracking is done automatically using the embedded version string
 (flatbuffer_version_string), and helps us continue to optimize it.
diff --git a/docs/source/CONTRIBUTING.md b/docs/source/CONTRIBUTING.md
new file mode 120000
index 000000000..433b7d335
--- /dev/null
+++ b/docs/source/CONTRIBUTING.md
@@ -0,0 +1 @@
+../../CONTRIBUTING
\ No newline at end of file
diff --git a/docs/source/Compiler.md b/docs/source/Compiler.md
index 6c93fb4b9..886fbd9b8 100755
--- a/docs/source/Compiler.md
+++ b/docs/source/Compiler.md
@@ -1,4 +1,5 @@
-# Using the schema compiler
+Using the schema compiler    {#flatbuffers_guide_using_schema_compiler}
+=========================
 
 Usage:
 
diff --git a/docs/source/CppUsage.md b/docs/source/CppUsage.md
index 31619e9d4..8c7f6a7d4 100755
--- a/docs/source/CppUsage.md
+++ b/docs/source/CppUsage.md
@@ -1,227 +1,100 @@
-# Use in C++
+Use in C++    {#flatbuffers_guide_use_cpp}
+==========
 
-Assuming you have written a schema using the above language in say
-`mygame.fbs` (FlatBuffer Schema, though the extension doesn't matter),
-you've generated a C++ header called `mygame_generated.h` using the
+## Before you get started
+
+Before diving into the FlatBuffers usage in C++, it should be noted that
+the [Tutorial](@ref flatbuffers_guide_tutorial) page has a complete guide
+to general FlatBuffers usage in all of the supported languages (including C++).
+This page is designed to cover the nuances of FlatBuffers usage, specific to
+C++.
+
+#### Prerequisites
+
+This page assumes you have written a FlatBuffers schema and compiled it
+with the Schema Compiler. If you have not, please see
+[Using the schema compiler](@ref flatbuffers_guide_using_schema_compiler)
+and [Writing a schema](@ref flatbuffers_guide_writing_schema).
+
+Assuming you wrote a schema, say `mygame.fbs` (though the extension doesn't
+matter), you've generated a C++ header called `mygame_generated.h` using the
 compiler (e.g. `flatc -c mygame.fbs`), you can now start using this in
 your program by including the header. As noted, this header relies on
 `flatbuffers/flatbuffers.h`, which should be in your include path.
 
-### Writing in C++
+## FlatBuffers C++ library code location
 
-To start creating a buffer, create an instance of `FlatBufferBuilder`
-which will contain the buffer as it grows:
+The code for the FlatBuffers C++ library can be found at
+`flatbuffers/include/flatbuffers`. You can browse the library code on the
+[FlatBuffers GitHub page](https://github.com/google/flatbuffers/tree/master/
+include/flatbuffers).
+
+## Testing the FlatBuffers C++ library
+
+The code to test the C++ library can be found at `flatbuffers/tests`.
+The test code itself is located in
+[test.cpp](https://github.com/google/flatbuffers/blob/master/tests/test.cpp).
+
+This test file is built alongside `flatc`. To review how to build the project,
+please read the [Building](@ref flatbuffers_guide_building) documenation.
+
+To run the tests, execute `flattests` from the root `flatbuffers/` directory.
+For example, on [Linux](https://en.wikipedia.org/wiki/Linux), you would simply
+run: `./flattests`.
+
+## Using the FlatBuffers C++ library
+
+*Note: See [Tutorial](@ref flatbuffers_guide_tutorial) for a more in-depth
+example of how to use FlatBuffers in C++.*
+
+FlatBuffers supports both reading and writing FlatBuffers in C++.
+
+To use FlatBuffers in your code, first generate the C++ classes from your
+schema with the `--cpp` option to `flatc`. Then you can include both FlatBuffers
+and the generated code to read or write FlatBuffers.
+
+For example, here is how you would read a FlatBuffer binary file in C++:
+First, include the library and generated code. Then read the file into
+a `char *` array, which you pass to `GetMonster()`.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    FlatBufferBuilder fbb;
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #include "flatbuffers/flatbuffers.h"
+    #include "monster_test_generate.h"
+    #include <cstdio> // For printing and file access.
 
-Before we serialize a Monster, we need to first serialize any objects
-that are contained there-in, i.e. we serialize the data tree using
-depth first, pre-order traversal. This is generally easy to do on
-any tree structures. For example:
+    FILE* file = fopen("monsterdata_test.mon", "rb");
+    fseek(file, 0L, SEEK_END);
+    int length = ftell(file);
+    fseek(file, 0L, SEEK_SET);
+    char *data = new char[length];
+    fread(data, sizeof(char), length, file);
+    fclose(file);
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    auto name = fbb.CreateString("MyMonster");
-
-    unsigned char inv[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-    auto inventory = fbb.CreateVector(inv, 10);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-`CreateString` and `CreateVector` serialize these two built-in
-datatypes, and return offsets into the serialized data indicating where
-they are stored, such that `Monster` below can refer to them.
-
-`CreateString` can also take an `std::string`, or a `const char *` with
-an explicit length, and is suitable for holding UTF-8 and binary
-data if needed.
-
-`CreateVector` can also take an `std::vector`. The
-offset it returns is typed, i.e. can only be used to set fields of the
-correct type below. To create a vector of struct objects (which will
-be stored as contiguous memory in the buffer, use `CreateVectorOfStructs`
-instead.
-
-To create a vector of nested objects (e.g. tables, strings or other vectors)
-collect their offsets in a temporary array/vector, then call `CreateVector`
-on that (see e.g. the array of strings example in `test.cpp`
-`CreateFlatBufferTest`).
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    Vec3 vec(1, 2, 3);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-`Vec3` is the first example of code from our generated
-header. Structs (unlike tables) translate to simple structs in C++, so
-we can construct them in a familiar way.
-
-We have now serialized the non-scalar components of of the monster
-example, so we could create the monster something like this:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    auto mloc = CreateMonster(fbb, &vec, 150, 80, name, inventory, Color_Red, 0, Any_NONE);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Note that we're passing `150` for the `mana` field, which happens to be the
-default value: this means the field will not actually be written to the buffer,
-since we'll get that value anyway when we query it. This is a nice space
-savings, since it is very common for fields to be at their default. It means
-we also don't need to be scared to add fields only used in a minority of cases,
-since they won't bloat up the buffer sizes if they're not actually used.
-
-We do something similarly for the union field `test` by specifying a `0` offset
-and the `NONE` enum value (part of every union) to indicate we don't actually
-want to write this field. You can use `0` also as a default for other
-non-scalar types, such as strings, vectors and tables. To pass an actual
-table, pass a preconstructed table as `mytable.Union()` that corresponds to
-union enum you're passing.
-
-Tables (like `Monster`) give you full flexibility on what fields you write
-(unlike `Vec3`, which always has all fields set because it is a `struct`).
-If you want even more control over this (i.e. skip fields even when they are
-not default), instead of the convenient `CreateMonster` call we can also
-build the object field-by-field manually:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    MonsterBuilder mb(fbb);
-    mb.add_pos(&vec);
-    mb.add_hp(80);
-    mb.add_name(name);
-    mb.add_inventory(inventory);
-    auto mloc = mb.Finish();
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-We start with a temporary helper class `MonsterBuilder` (which is
-defined in our generated code also), then call the various `add_`
-methods to set fields, and `Finish` to complete the object. This is
-pretty much the same code as you find inside `CreateMonster`, except
-we're leaving out a few fields. Fields may also be added in any order,
-though orderings with fields of the same size adjacent
-to each other most efficient in size, due to alignment. You should
-not nest these Builder classes (serialize your
-data in pre-order).
-
-Regardless of whether you used `CreateMonster` or `MonsterBuilder`, you
-now have an offset to the root of your data, and you can finish the
-buffer using:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    FinishMonsterBuffer(fbb, mloc);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The buffer is now ready to be stored somewhere, sent over the network,
-be compressed, or whatever you'd like to do with it. You can access the
-start of the buffer with `fbb.GetBufferPointer()`, and it's size from
-`fbb.GetSize()`.
-
-Calling code may take ownership of the buffer with `fbb.ReleaseBufferPointer()`.
-Should you do it, the `FlatBufferBuilder` will be in an invalid state,
-and *must* be cleared before it can be used again.
-However, it also means you are able to destroy the builder while keeping
-the buffer in your application.
-
-`samples/sample_binary.cpp` is a complete code sample similar to
-the code above, that also includes the reading code below.
-
-### Reading in C++
-
-If you've received a buffer from somewhere (disk, network, etc.) you can
-directly start traversing it using:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    auto monster = GetMonster(buffer_pointer);
+    auto monster = GetMonster(data);
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 `monster` is of type `Monster *`, and points to somewhere *inside* your
 buffer (root object pointers are not the same as `buffer_pointer` !).
 If you look in your generated header, you'll see it has
-convenient accessors for all fields, e.g.
+convenient accessors for all fields, e.g. `hp()`, `mana()`, etc:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    assert(monster->hp() == 80);
-    assert(monster->mana() == 150);  // default
-    assert(strcmp(monster->name()->c_str(), "MyMonster") == 0);
+    printf("%d\n", monster->hp());            // `80`
+    printf("%d\n", monster->mana());          // default value of `150`
+    printf("%s\n", monster->name()->c_str()); // "MyMonster"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-These should all be true. Note that we never stored a `mana` value, so
-it will return the default.
+*Note: That we never stored a `mana` value, so it will return the default.*
 
-To access sub-objects, in this case the `Vec3`:
+## Reflection (& Resizing)
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    auto pos = monster->pos();
-    assert(pos);
-    assert(pos->z() == 3);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+There is experimental support for reflection in FlatBuffers, allowing you to
+read and write data even if you don't know the exact format of a buffer, and
+even allows you to change sizes of strings and vectors in-place.
 
-If we had not set the `pos` field during serialization, it would be
-`NULL`.
-
-Similarly, we can access elements of the inventory array:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    auto inv = monster->inventory();
-    assert(inv);
-    assert(inv->Get(9) == 9);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-### Mutating FlatBuffers
-
-As you saw above, typically once you have created a FlatBuffer, it is
-read-only from that moment on. There are however cases where you have just
-received a FlatBuffer, and you'd like to modify something about it before
-sending it on to another recipient. With the above functionality, you'd have
-to generate an entirely new FlatBuffer, while tracking what you modify in your
-own data structures. This is inconvenient.
-
-For this reason FlatBuffers can also be mutated in-place. While this is great
-for making small fixes to an existing buffer, you generally want to create
-buffers from scratch whenever possible, since it is much more efficient and
-the API is much more general purpose.
-
-To get non-const accessors, invoke `flatc` with `--gen-mutable`.
-
-Similar to the reading API above, you now can:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    auto monster = GetMutableMonster(buffer_pointer);  // non-const
-    monster->mutate_hp(10);                      // Set table field.
-    monster->mutable_pos()->mutate_z(4);         // Set struct field.
-    monster->mutable_inventory()->Mutate(0, 1);  // Set vector element.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-We use the somewhat verbose term `mutate` instead of `set` to indicate that
-this is a special use case, not to be confused with the default way of
-constructing FlatBuffer data.
-
-After the above mutations, you can send on the FlatBuffer to a new recipient
-without any further work!
-
-Note that any `mutate_` functions on tables return a bool, which is false
-if the field we're trying to set isn't present in the buffer. Fields are not
-present if they weren't set, or even if they happen to be equal to the
-default value. For example, in the creation code above we set the `mana` field
-to `150`, which is the default value, so it was never stored in the buffer.
-Trying to call mutate_mana() on such data will return false, and the value won't
-actually be modified!
-
-One way to solve this is to call `ForceDefaults()` on a
-`FlatBufferBuilder` to force all fields you set to actually be written. This
-of course increases the size of the buffer somewhat, but this may be
-acceptable for a mutable buffer.
-
-Alternatively, you can use the more powerful reflection functionality:
-
-### Reflection (& Resizing)
-
-If the above ways of accessing a buffer are still too static for you, there is
-experimental support for reflection in FlatBuffers, allowing you to read and
-write data even if you don't know the exact format of a buffer, and even allows
-you to change sizes of strings and vectors in-place.
-
-The way this works is very elegant, there is actually a FlatBuffer schema that
+The way this works is very elegant; there is actually a FlatBuffer schema that
 describes schemas (!) which you can find in `reflection/reflection.fbs`.
-The compiler `flatc` can write out any schemas it has just parsed as a binary
+The compiler, `flatc`, can write out any schemas it has just parsed as a binary
 FlatBuffer, corresponding to this meta-schema.
 
 Loading in one of these binary schemas at runtime allows you traverse any
@@ -232,9 +105,10 @@ For convenient field manipulation, you can include the header
 `flatbuffers/reflection.h` which includes both the generated code from the meta
 schema, as well as a lot of helper functions.
 
-And example of usage for the moment you can find in `test.cpp/ReflectionTest()`.
+And example of usage, for the time being, can be found in
+`test.cpp/ReflectionTest()`.
 
-### Storing maps / dictionaries in a FlatBuffer
+## Storing maps / dictionaries in a FlatBuffer
 
 FlatBuffers doesn't support maps natively, but there is support to
 emulate their behavior with vectors and binary search, which means you
@@ -260,7 +134,7 @@ To use it:
     only works if the vector has been sorted, it will likely not find elements
     if it hasn't been sorted.
 
-### Direct memory access
+## Direct memory access
 
 As you can see from the above examples, all elements in a buffer are
 accessed through generated accessors. This is because everything is
@@ -285,7 +159,7 @@ machines, so only use tricks like this if you can guarantee you're not
 shipping on a big endian machine (an `assert(FLATBUFFERS_LITTLEENDIAN)`
 would be wise).
 
-### Access of untrusted buffers
+## Access of untrusted buffers
 
 The generated accessor functions access fields over offsets, which is
 very quick. These offsets are not verified at run-time, so a malformed
@@ -342,7 +216,7 @@ accepted).
 
 There are two ways to use text formats:
 
-### Using the compiler as a conversion tool
+#### Using the compiler as a conversion tool
 
 This is the preferred path, as it doesn't require you to add any new
 code to your program, and is maximally efficient since you can ship with
@@ -354,7 +228,7 @@ users/developers to perform, though you might be able to automate it.
 This will generate the binary file `mydata_wire.bin` which can be loaded
 as before.
 
-### Making your program capable of loading text directly
+#### Making your program capable of loading text directly
 
 This gives you maximum flexibility. You could even opt to support both,
 i.e. check for both files, and regenerate the binary from text when
@@ -400,7 +274,7 @@ file, that you can access as described above.
 
 `samples/sample_text.cpp` is a code sample showing the above operations.
 
-### Threading
+## Threading
 
 Reading a FlatBuffer does not touch any memory outside the original buffer,
 and is entirely read-only (all const), so is safe to access from multiple
@@ -413,3 +287,5 @@ share instances of FlatBufferBuilder between threads (recommended), or
 manually wrap it in synchronisation primites. There's no automatic way to
 accomplish this, by design, as we feel multithreaded construction
 of a single buffer will be rare, and synchronisation overhead would be costly.
+
+<br>
diff --git a/docs/source/FlatBuffers.md b/docs/source/FlatBuffers.md
index 79846d776..bbb0dce58 100644
--- a/docs/source/FlatBuffers.md
+++ b/docs/source/FlatBuffers.md
@@ -1,9 +1,12 @@
-# FlatBuffers
+FlatBuffers    {#flatbuffers_index}
+===========
 
-FlatBuffers is an efficient cross platform serialization library for C++, Java,
-C#, Go, Python and JavaScript (C, PHP & Ruby in progress).
-It was originally created at Google for game development and other
-performance-critical applications.
+# Overview {#flatbuffers_overview}
+
+[FlatBuffers](@ref flatbuffers_overview) is an efficient cross platform
+serialization library for C++, C#, Go, Java, JavaScript, PHP, and Python
+(C and Ruby in progress). It was originally created at Google for game
+development and other performance-critical applications.
 
 It is available as Open Source on [GitHub](http://github.com/google/flatbuffers)
 under the Apache license, v2 (see LICENSE.txt).
@@ -26,7 +29,7 @@ under the Apache license, v2 (see LICENSE.txt).
     projects where spending time and space (many memory allocations) to
     be able to access or construct serialized data is undesirable, such
     as in games or any other performance sensitive applications. See the
-    [benchmarks](md__benchmarks.html) for details.
+    [benchmarks](@ref flatbuffers_benchmarks) for details.
 
 -   **Flexible** - Optional fields means not only do you get great
     forwards and backwards compatibility (increasingly important for
@@ -76,7 +79,7 @@ In this context, it is only a better choice for systems that have very
 little to no information ahead of time about what data needs to be stored.
 
 Read more about the "why" of FlatBuffers in the
-[white paper](md__white_paper.html).
+[white paper](@ref flatbuffers_white_paper).
 
 ### Who uses FlatBuffers?
 -   [Cocos2d-x](http://www.cocos2d-x.org/), the #1 open source mobile game
@@ -118,22 +121,23 @@ sections provide a more in-depth usage guide.
 
 ## In-depth documentation
 
--   How to [build the compiler](md__building.html) and samples on various
-    platforms.
--   How to [use the compiler](md__compiler.html).
--   How to [write a schema](md__schemas.html).
--   How to [use the generated C++ code](md__cpp_usage.html) in your own
-    programs.
--   How to [use the generated Java/C# code](md__java_usage.html) in your own
-    programs.
--   How to [use the generated Go code](md__go_usage.html) in your own
-    programs.
--   [Support matrix](md__support.html) for platforms/languages/features.
--   Some [benchmarks](md__benchmarks.html) showing the advantage of using
+-   How to [build the compiler](@ref flatbuffers_guide_building) and samples on
+    various platforms.
+-   How to [use the compiler](@ref flatbuffers_guide_using_schema_compiler).
+-   How to [write a schema](@ref flatbuffers_guide_writing_schema).
+-   How to [use the generated C++ code](@ref flatbuffers_guide_use_cpp) in your
+    own programs.
+-   How to [use the generated Java/C# code](@ref flatbuffers_guide_use_java_c-sharp)
+    in your own programs.
+-   How to [use the generated Go code](@ref flatbuffers_guide_use_go) in your
+    own programs.
+-   [Support matrix](@ref flatbuffers_support) for platforms/languages/features.
+-   Some [benchmarks](@ref flatbuffers_benchmarks) showing the advantage of
+    using FlatBuffers.
+-   A [white paper](@ref flatbuffers_white_paper) explaining the "why" of
     FlatBuffers.
--   A [white paper](md__white_paper.html) explaining the "why" of FlatBuffers.
--   A description of the [internals](md__internals.html) of FlatBuffers.
--   A formal [grammar](md__grammar.html) of the schema language.
+-   A description of the [internals](@ref flatbuffers_internals) of FlatBuffers.
+-   A formal [grammar](@ref flatbuffers_grammar) of the schema language.
 
 ## Online resources
 
diff --git a/docs/source/GoApi.md b/docs/source/GoApi.md
new file mode 100644
index 000000000..98be2b6a9
--- /dev/null
+++ b/docs/source/GoApi.md
@@ -0,0 +1,26 @@
+Go API
+======
+
+\addtogroup flatbuffers_go_api
+
+<!-- Note: The `GoApi_generate.txt` code snippet was generated using `godoc` and
+     customized for use with this markdown file. To regenerate the file, use the
+     `godoc` tool (http://godoc.org) with the files in the `flatbuffers/go`
+     folder.
+
+     You may need to ensure that copies of the files exist in the `src/`
+     subfolder at the path set by the `$GOROOT` environment variable. You can
+     either move the files to `$GOROOT/src/flatbuffers` manually, if `$GOROOT`
+     is already set, otherwise you will need to manually set the `$GOROOT`
+     variable to a path and create `src/flatbuffers` subfolders at that path.
+     Then copy the flatbuffers files into `$GOROOT/src/flatbuffers`. (Some
+     versions of `godoc` include a `-path` flag. This could be used instead, if
+     available).
+
+     Once the files exist at the `$GOROOT/src/flatbuffers` location, you can
+     regenerate this doc using the following command:
+     `godoc flatbuffers > GoApi_generated.txt`.
+
+     After the documentation is generated, you will have to manually remove any
+     non-user facing documentation from this file. -->
+\snippet GoApi_generated.txt Go API
diff --git a/docs/source/GoApi_generated.txt b/docs/source/GoApi_generated.txt
new file mode 100644
index 000000000..3d4e0fc77
--- /dev/null
+++ b/docs/source/GoApi_generated.txt
@@ -0,0 +1,125 @@
+// This file was generated using `godoc` and customized for use with the
+// API Reference documentation. To recreate this file, use the `godoc` tool
+// (http://godoc.org) with the files in the `flatbuffers/go` folder.
+//
+// Note: You may need to ensure that copies of the files exist in the
+// `src/` subfolder at the path set by the `$GOROOT` environment variable.
+// You can either move the files to `$GOROOT/src/flatbuffers` manually, if
+// `$GOROOT` is already set, otherwise you will need to manually set the
+// `$GOROOT` variable to a path and create `src/flatbuffers` subfolders at that
+// path. Then copy these files into `$GOROOT/src/flatbuffers`. (Some versions of
+// `godoc` include a `-path` flag. This could be used instead, if available).
+//
+// Once the files exist at the `$GOROOT/src/flatbuffers` location, you can
+// regenerate this doc using the following command:
+// `godoc flatbuffers > GoApi_generated.txt`.
+//
+// After the documentation is generated, you will have to manually remove any
+// non-user facing documentation from this file.
+
+/// [Go API]
+PACKAGE DOCUMENTATION
+
+package flatbuffers
+    Package flatbuffers provides facilities to read and write flatbuffers
+    objects.
+
+TYPES
+
+type Builder struct {
+    // `Bytes` gives raw access to the buffer. Most users will want to use
+    // FinishedBytes() instead.
+    Bytes []byte
+}
+    Builder is a state machine for creating FlatBuffer objects. Use a
+    Builder to construct object(s) starting from leaf nodes.
+
+    A Builder constructs byte buffers in a last-first manner for simplicity
+    and performance.
+
+FUNCTIONS
+
+func NewBuilder(initialSize int) *Builder
+    NewBuilder initializes a Builder of size `initial_size`. The internal
+    buffer is grown as needed.
+
+func (b *Builder) CreateByteString(s []byte) UOffsetT
+    CreateByteString writes a byte slice as a string (null-terminated).
+
+func (b *Builder) CreateByteVector(v []byte) UOffsetT
+    CreateByteVector writes a ubyte vector
+
+func (b *Builder) CreateString(s string) UOffsetT
+    CreateString writes a null-terminated string as a vector.
+
+func (b *Builder) EndVector(vectorNumElems int) UOffsetT
+    EndVector writes data necessary to finish vector construction.
+
+func (b *Builder) Finish(rootTable UOffsetT)
+    Finish finalizes a buffer, pointing to the given `rootTable`.
+
+func (b *Builder) FinishedBytes() []byte
+    FinishedBytes returns a pointer to the written data in the byte buffer.
+    Panics if the builder is not in a finished state (which is caused by
+    calling `Finish()`).
+
+func (b *Builder) Head() UOffsetT
+    Head gives the start of useful data in the underlying byte buffer. Note:
+    unlike other functions, this value is interpreted as from the left.
+
+func (b *Builder) PrependBool(x bool)
+    PrependBool prepends a bool to the Builder buffer. Aligns and checks for
+    space.
+
+func (b *Builder) PrependByte(x byte)
+    PrependByte prepends a byte to the Builder buffer. Aligns and checks for
+    space.
+
+func (b *Builder) PrependFloat32(x float32)
+    PrependFloat32 prepends a float32 to the Builder buffer. Aligns and
+    checks for space.
+
+func (b *Builder) PrependFloat64(x float64)
+    PrependFloat64 prepends a float64 to the Builder buffer. Aligns and
+    checks for space.
+
+func (b *Builder) PrependInt16(x int16)
+    PrependInt16 prepends a int16 to the Builder buffer. Aligns and checks
+    for space.
+
+func (b *Builder) PrependInt32(x int32)
+    PrependInt32 prepends a int32 to the Builder buffer. Aligns and checks
+    for space.
+
+func (b *Builder) PrependInt64(x int64)
+    PrependInt64 prepends a int64 to the Builder buffer. Aligns and checks
+    for space.
+
+func (b *Builder) PrependInt8(x int8)
+    PrependInt8 prepends a int8 to the Builder buffer. Aligns and checks for
+    space.
+
+func (b *Builder) PrependUOffsetT(off UOffsetT)
+    PrependUOffsetT prepends an UOffsetT, relative to where it will be
+    written.
+
+func (b *Builder) PrependUint16(x uint16)
+    PrependUint16 prepends a uint16 to the Builder buffer. Aligns and checks
+    for space.
+
+func (b *Builder) PrependUint32(x uint32)
+    PrependUint32 prepends a uint32 to the Builder buffer. Aligns and checks
+    for space.
+
+func (b *Builder) PrependUint64(x uint64)
+    PrependUint64 prepends a uint64 to the Builder buffer. Aligns and checks
+    for space.
+
+func (b *Builder) PrependUint8(x uint8)
+    PrependUint8 prepends a uint8 to the Builder buffer. Aligns and checks
+    for space.
+
+func (b *Builder) Reset()
+    Reset truncates the underlying Builder buffer, facilitating alloc-free
+    reuse of a Builder. It also resets bookkeeping data.
+/// [Go API]
diff --git a/docs/source/GoUsage.md b/docs/source/GoUsage.md
index c2a7495c3..a3a0e928a 100644
--- a/docs/source/GoUsage.md
+++ b/docs/source/GoUsage.md
@@ -1,11 +1,51 @@
-# Use in Go
+Use in Go    {#flatbuffers_guide_use_go}
+=========
 
-There's experimental support for reading FlatBuffers in Go. Generate code
-for Go with the `-g` option to `flatc`.
+## Before you get started
 
-See `go_test.go` for an example. You import the generated code, read a
-FlatBuffer binary file into a `[]byte`, which you pass to the
-`GetRootAsMonster` function:
+Before diving into the FlatBuffers usage in Go, it should be noted that
+the [Tutorial](@ref flatbuffers_guide_tutorial) page has a complete guide
+to general FlatBuffers usage in all of the supported languages (including Go).
+This page is designed to cover the nuances of FlatBuffers usage, specific to
+Go.
+
+You should also have read the [Building](@ref flatbuffers_guide_building)
+documentation to build `flatc` and should be familiar with
+[Using the schema compiler](@ref flatbuffers_guide_using_schema_compiler) and
+[Writing a schema](@ref flatbuffers_guide_writing_schema).
+
+## FlatBuffers Go library code location
+
+The code for the FlatBuffers Go library can be found at
+`flatbuffers/go`. You can browse the library code on the [FlatBuffers
+GitHub page](https://github.com/google/flatbuffers/tree/master/go).
+
+## Testing the FlatBuffers Go library
+
+The code to test the Go library can be found at `flatbuffers/tests`.
+The test code itself is located in [go_test.go](https://github.com/google/
+flatbuffers/blob/master/tests/go_test.go).
+
+To run the tests, use the [GoTest.sh](https://github.com/google/flatbuffers/
+blob/master/tests/GoTest.sh) shell script.
+
+*Note: The shell script requires [Go](https://golang.org/doc/install) to
+be installed.*
+
+## Using the FlatBuffers Go library
+
+*Note: See [Tutorial](@ref flatbuffers_guide_tutorial) for a more in-depth
+example of how to use FlatBuffers in Go.*
+
+FlatBuffers supports reading and writing binary FlatBuffers in Go.
+
+To use FlatBuffers in your own code, first generate Go classes from your
+schema with the `--go` option to `flatc`. Then you can include both FlatBuffers
+and the generated code to read or write a FlatBuffer.
+
+For example, here is how you would read a FlatBuffer binary file in Go: First,
+include the library and generated code. Then read a FlatBuffer binary file into
+a `[]byte`, which you pass to the `GetRootAsMonster` function:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.go}
     import (
@@ -27,96 +67,10 @@ Now you can access values like this:
     pos := monster.Pos(nil)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Note that whenever you access a new object like in the `Pos` example above,
-a new temporary accessor object gets created. If your code is very performance
-sensitive (you iterate through a lot of objects), you can replace nil with a
-pointer to a `Vec3` object you've already created. This allows
-you to reuse it across many calls and reduce the amount of object allocation
-(and thus garbage collection) your program does.
-
-To access vectors you pass an extra index to the
-vector field accessor. Then a second method with the same name suffixed
-by `Length` let's you know the number of elements you can access:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.go}
-    for i := 0; i < monster.InventoryLength(); i++ {
-        monster.Inventory(i) // do something here
-    }
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You can also construct these buffers in Go using the functions found in the
-generated code, and the FlatBufferBuilder class:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.go}
-    builder := flatbuffers.NewBuilder(0)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Create strings:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.go}
-    str := builder.CreateString("MyMonster")
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Create a table with a struct contained therein:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.go}
-    example.MonsterStart(builder)
-    example.MonsterAddPos(builder, example.CreateVec3(builder, 1.0, 2.0, 3.0, 3.0, 4, 5, 6))
-    example.MonsterAddHp(builder, 80)
-    example.MonsterAddName(builder, str)
-    example.MonsterAddInventory(builder, inv)
-    example.MonsterAddTest_Type(builder, 1)
-    example.MonsterAddTest(builder, mon2)
-    example.MonsterAddTest4(builder, test4s)
-    mon := example.MonsterEnd(builder)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Unlike C++, Go does not support table creation functions like 'createMonster()'.
-This is to create the buffer without
-using temporary object allocation (since the `Vec3` is an inline component of
-`Monster`, it has to be created right where it is added, whereas the name and
-the inventory are not inline, and **must** be created outside of the table
-creation sequence).
-Structs do have convenient methods that allow you to construct them in one call.
-These also have arguments for nested structs, e.g. if a struct has a field `a`
-and a nested struct field `b` (which has fields `c` and `d`), then the arguments
-will be `a`, `c` and `d`.
-
-Vectors also use this start/end pattern to allow vectors of both scalar types
-and structs:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.go}
-    example.MonsterStartInventoryVector(builder, 5)
-    for i := 4; i >= 0; i-- {
-        builder.PrependByte(byte(i))
-    }
-    inv := builder.EndVector(5)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The generated method 'StartInventoryVector' is provided as a convenience
-function which calls 'StartVector' with the correct element size of the vector
-type which in this case is 'ubyte' or 1 byte per vector element.
-You pass the number of elements you want to write.
-You write the elements backwards since the buffer
-is being constructed back to front. Use the correct `Prepend` call for the type,
-or `PrependUOffsetT` for offsets. You then pass `inv` to the corresponding
-`Add` call when you construct the table containing it afterwards.
-
-There are `Prepend` functions for all the scalar types. You use
-`PrependUOffset` for any previously constructed objects (such as other tables,
-strings, vectors). For structs, you use the appropriate `create` function
-in-line, as shown above in the `Monster` example.
-
-Once you're done constructing a buffer, you call `Finish` with the root object
-offset (`mon` in the example above). Your data now resides in Builder.Bytes.
-Important to note is that the real data starts at the index indicated by Head(),
-for Offset() bytes (this is because the buffer is constructed backwards).
-If you wanted to read the buffer right after creating it (using
-`GetRootAsMonster` above), the second argument, instead of `0` would thus
-also be `Head()`.
-
 ## Text Parsing
 
 There currently is no support for parsing text (Schema's and JSON) directly
 from Go, though you could use the C++ parser through cgo. Please see the
 C++ documentation for more on text parsing.
+
+<br>
diff --git a/docs/source/Grammar.md b/docs/source/Grammar.md
index bcc5f7496..b6b48c08b 100755
--- a/docs/source/Grammar.md
+++ b/docs/source/Grammar.md
@@ -1,4 +1,5 @@
-# Grammar of the schema language
+Grammar of the schema language    {#flatbuffers_grammar}
+==============================
 
 schema = include*
          ( namespace\_decl | type\_decl | enum\_decl | root\_decl |
diff --git a/docs/source/Internals.md b/docs/source/Internals.md
index 215842d36..a7dce4fb0 100755
--- a/docs/source/Internals.md
+++ b/docs/source/Internals.md
@@ -1,4 +1,5 @@
-# FlatBuffer Internals
+FlatBuffer Internals    {#flatbuffers_internals}
+====================
 
 This section is entirely optional for the use of FlatBuffers. In normal
 usage, you should never need the information contained herein. If you're
@@ -16,7 +17,7 @@ byte-swap intrinsics.
 
 On purpose, the format leaves a lot of details about where exactly
 things live in memory undefined, e.g. fields in a table can have any
-order, and objects to some extend can be stored in many orders. This is
+order, and objects to some extent can be stored in many orders. This is
 because the format doesn't need this information to be efficient, and it
 leaves room for optimization and extension (for example, fields can be
 packed in a way that is most compact). Instead, the format is defined in
@@ -228,7 +229,12 @@ Otherwise, it uses the entry as an offset into the table to locate the field.
 `FlatBufferBuilder`. You can add the fields in any order, and the `Finish`
 call will ensure the correct vtable gets generated.
 
-    inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder &_fbb, const Vec3 *pos, int16_t mana, int16_t hp, flatbuffers::Offset<flatbuffers::String> name, flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory, int8_t color) {
+    inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder &_fbb,
+                                                      const Vec3 *pos, int16_t mana,
+                                                      int16_t hp,
+                                                      flatbuffers::Offset<flatbuffers::String> name,
+                                                      flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory,
+                                                      int8_t color) {
       MonsterBuilder builder_(_fbb);
       builder_.add_inventory(inventory);
       builder_.add_name(name);
@@ -285,3 +291,5 @@ Note that this not the only possible encoding, since the writer has some
 flexibility in which of the children of root object to write first (though in
 this case there's only one string), and what order to write the fields in.
 Different orders may also cause different alignments to happen.
+
+<br>
diff --git a/docs/source/JavaCsharpUsage.md b/docs/source/JavaCsharpUsage.md
new file mode 100755
index 000000000..3af9cfa48
--- /dev/null
+++ b/docs/source/JavaCsharpUsage.md
@@ -0,0 +1,141 @@
+Use in Java/C#    {#flatbuffers_guide_use_java_c-sharp}
+==============
+
+## Before you get started
+
+Before diving into the FlatBuffers usage in Java or C#, it should be noted that
+the [Tutorial](@ref flatbuffers_guide_tutorial) page has a complete guide to
+general FlatBuffers usage in all of the supported languages (including both Java
+and C#). This page is designed to cover the nuances of FlatBuffers usage,
+specific to Java and C#.
+
+You should also have read the [Building](@ref flatbuffers_guide_building)
+documentation to build `flatc` and should be familiar with
+[Using the schema compiler](@ref flatbuffers_guide_using_schema_compiler) and
+[Writing a schema](@ref flatbuffers_guide_writing_schema).
+
+## FlatBuffers Java and C-sharp code location
+
+#### Java
+
+The code for the FlatBuffers Java library can be found at
+`flatbuffers/java/com/google/flatbuffers`. You can browse the library on the
+[FlatBuffers GitHub page](https://github.com/google/flatbuffers/tree/master/
+java/com/google/flatbuffers).
+
+#### C-sharp
+
+The code for the FlatBuffers C# library can be found at
+`flatbuffers/net/FlatBuffers`. You can browse the library on the
+[FlatBuffers GitHub page](https://github.com/google/flatbuffers/tree/master/net/
+FlatBuffers).
+
+## Testing the FlatBuffers Java and C-sharp libraries
+
+The code to test the libraries can be found at `flatbuffers/tests`.
+
+#### Java
+
+The test code for Java is located in [JavaTest.java](https://github.com/google
+/flatbuffers/blob/master/tests/JavaTest.java).
+
+To run the tests, use either [JavaTest.sh](https://github.com/google/
+flatbuffers/blob/master/tests/JavaTest.sh) or [JavaTest.bat](https://github.com/
+google/flatbuffers/blob/master/tests/JavaTest.bat), depending on your operating
+system.
+
+*Note: These scripts require that [Java](https://www.oracle.com/java/index.html)
+is installed.*
+
+#### C-sharp
+
+The test code for C# is located in the [FlatBuffers.Test](https://github.com/
+google/flatbuffers/tree/master/tests/FlatBuffers.Test) subfolder. To run the
+tests, open `FlatBuffers.Test.csproj` in [Visual Studio](
+https://www.visualstudio.com), and compile/run the project.
+
+Optionally, you can run this using [Mono](http://www.mono-project.com/) instead.
+Once you have installed `Mono`, you can run the tests from the command line
+by running the following commands from inside the `FlatBuffers.Test` folder:
+
+~~~{.sh}
+  mcs *.cs ../MyGame/Example/*.cs ../../net/FlatBuffers/*.cs
+  mono Assert.exe
+~~~
+
+## Using the FlatBuffers Java (and C#) library
+
+*Note: See [Tutorial](@ref flatbuffers_guide_tutorial) for a more in-depth
+example of how to use FlatBuffers in Java or C#.*
+
+FlatBuffers supports reading and writing binary FlatBuffers in Java and C#.
+
+To use FlatBuffers in your own code, first generate Java classes from your
+schema with the `--java` option to `flatc`. (Or for C# with `--csharp`).
+Then you can include both FlatBuffers and the generated code to read
+or write a FlatBuffer.
+
+For example, here is how you would read a FlatBuffer binary file in Java:
+First, import the library and generated code. Then, you read a FlatBuffer binary
+file into a `byte[]`.  You then turn the `byte[]` into a `ByteBuffer`, which you
+pass to the `getRootAsMyRootType` function:
+
+*Note: The code here is written from the perspective of Java. Code for both
+languages is both generated and used in nearly the exact same way, with only
+minor differences. These differences are
+[explained in a section below](#differences_in_c-sharp).*
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
+    import MyGame.Example.*;
+    import com.google.flatbuffers.FlatBufferBuilder;
+
+    // This snippet ignores exceptions for brevity.
+    File file = new File("monsterdata_test.mon");
+    RandomAccessFile f = new RandomAccessFile(file, "r");
+    byte[] data = new byte[(int)f.length()];
+    f.readFully(data);
+    f.close();
+
+    ByteBuffer bb = ByteBuffer.wrap(data);
+    Monster monster = Monster.getRootAsMonster(bb);
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Now you can access the data from the `Monster monster`:
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
+    short hp = monster.hp();
+    Vec3 pos = monster.pos();
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+<a name="differences_in_c-sharp">
+#### Differences in C-sharp
+</a>
+
+C# code works almost identically to Java, with only a few minor differences.
+You can see an example of C# code in
+`tests/FlatBuffers.Test/FlatBuffersExampleTests.cs` or
+`samples/SampleBinary.cs`.
+
+First of all, naming follows standard C# style with `PascalCasing` identifiers,
+e.g. `GetRootAsMyRootType`. Also, values (except vectors and unions) are
+available as properties instead of parameterless accessor methods as in Java.
+The performance-enhancing methods to which you can pass an already created
+object are prefixed with `Get`, e.g.:
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cs}
+    // property
+    var pos = monster.Pos;
+
+    // method filling a preconstructed object
+    var preconstructedPos = new Vec3();
+    monster.GetPos(preconstructedPos);
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+## Text parsing
+
+There currently is no support for parsing text (Schema's and JSON) directly
+from Java or C#, though you could use the C++ parser through native call
+interfaces available to each language. Please see the
+C++ documentation for more on text parsing.
+
+<br>
diff --git a/docs/source/JavaScriptUsage.md b/docs/source/JavaScriptUsage.md
new file mode 100755
index 000000000..c321c95e3
--- /dev/null
+++ b/docs/source/JavaScriptUsage.md
@@ -0,0 +1,105 @@
+Use in JavaScript    {#flatbuffers_guide_use_javascript}
+=================
+
+## Before you get started
+
+Before diving into the FlatBuffers usage in JavaScript, it should be noted that
+the [Tutorial](@ref flatbuffers_guide_tutorial) page has a complete guide to
+general FlatBuffers usage in all of the supported languages
+(including JavaScript). This page is specifically designed to cover the nuances
+of FlatBuffers usage in JavaScript.
+
+You should also have read the [Building](@ref flatbuffers_guide_building)
+documentation to build `flatc` and should be familiar with
+[Using the schema compiler](@ref flatbuffers_guide_using_schema_compiler) and
+[Writing a schema](@ref flatbuffers_guide_writing_schema).
+
+## FlatBuffers JavaScript library code location
+
+The code for the FlatBuffers JavaScript library can be found at
+`flatbuffers/js`. You can browse the library code on the [FlatBuffers
+GitHub page](https://github.com/google/flatbuffers/tree/master/js).
+
+## Testing the FlatBuffers JavaScript library
+
+The code to test the JavaScript library can be found at `flatbuffers/tests`.
+The test code itself is located in [JavaScriptTest.js](https://github.com/
+google/flatbuffers/blob/master/tests/JavaScriptTest.js).
+
+To run the tests, use the [JavaScriptTest.sh](https://github.com/google/
+flatbuffers/blob/master/tests/JavaScriptTest.sh) shell script.
+
+*Note: The JavaScript test file requires [Node.js](https://nodejs.org/en/).*
+
+## Using the FlatBuffers JavaScript libary
+
+*Note: See [Tutorial](@ref flatbuffers_guide_tutorial) for a more in-depth
+example of how to use FlatBuffers in JavaScript.*
+
+FlatBuffers supports both reading and writing FlatBuffers in JavaScript.
+
+To use FlatBuffers in your own code, first generate JavaScript classes from your
+schema with the `--js` option to `flatc`. Then you can include both FlatBuffers
+and the generated code to read or write a FlatBuffer.
+
+For example, here is how you would read a FlatBuffer binary file in Javascript:
+First, include the library and generated code. Then read the file into an
+`Uint8Array`. Make a `flatbuffers.ByteBuffer` out of the `Uint8Array`, and pass
+the ByteBuffer to the `getRootAsMonster` function.
+
+*Note: Both JavaScript module loaders (e.g. Node.js) and browser-based
+HTML/JavaScript code segments are shown below in the following snippet:*
+
+~~~{.js}
+  // Note: These require functions are specific to JavaScript module loaders
+  //       (namely, Node.js). See below for a browser-based example.
+  var fs = require('fs');
+
+  var flatbuffers = require('../flatbuffers').flatbuffers;
+  var MyGame = require('./monster_generated').MyGame;
+
+  var data = new Uint8Array(fs.readFileSync('monster.dat'));
+  var buf = new flatbuffers.ByteBuffer(data);
+
+  var monster = MyGame.Example.Monster.getRootAsMonster(buf);
+
+  //--------------------------------------------------------------------------//
+
+  // Note: This code is specific to browser-based HTML/JavaScript. See above
+  //       for the code using JavaScript module loaders (e.g. Node.js).
+  <script src="../js/flatbuffers.js"></script>
+  <script src="monster_generated.js"></script>
+  <script>
+    function readFile() {
+      var reader = new FileReader(); // This example uses the HTML5 FileReader.
+      var file = document.getElementById(
+          'file_input').files[0]; // "monster.dat" from the HTML <input> field.
+
+      reader.onload = function() { // Executes after the file is read.
+        var data = new Uint8Array(reader.result);
+
+        var buf = new flatbuffers.ByteBuffer(data);
+
+        var monster = MyGame.Example.Monster.getRootAsMonster(buf);
+      }
+
+      reader.readAsArrayBuffer(file);
+    }
+  </script>
+
+  // Open the HTML file in a browser and select "monster.dat" from with the
+  // <input> field.
+  <input type="file" id="file_input" onchange="readFile();">
+~~~
+
+Now you can access values like this:
+
+~~~{.js}
+  var hp = monster.hp();
+  var pos = monster.pos();
+~~~
+
+## Text parsing FlatBuffers in JavaScript
+
+There currently is no support for parsing text (Schema's and JSON) directly
+from JavaScript.
diff --git a/docs/source/JavaUsage.md b/docs/source/JavaUsage.md
deleted file mode 100755
index 4819e5b79..000000000
--- a/docs/source/JavaUsage.md
+++ /dev/null
@@ -1,224 +0,0 @@
-# Use in Java/C-sharp
-
-FlatBuffers supports reading and writing binary FlatBuffers in Java and C#.
-Generate code for Java with the `-j` option to `flatc`, or for C# with `-n`
-(think .Net).
-
-Note that this document is from the perspective of Java. Code for both languages
-is generated in the same way, with only minor differences. These differences
-are [explained in a section below](#differences-in-c-sharp).
-
-See `javaTest.java` for an example. Essentially, you read a FlatBuffer binary
-file into a `byte[]`, which you then turn into a `ByteBuffer`, which you pass to
-the `getRootAsMyRootType` function:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
-    ByteBuffer bb = ByteBuffer.wrap(data);
-    Monster monster = Monster.getRootAsMonster(bb);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Now you can access values much like C++:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
-    short hp = monster.hp();
-    Vec3 pos = monster.pos();
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Note that whenever you access a new object like in the `pos` example above,
-a new temporary accessor object gets created. If your code is very performance
-sensitive (you iterate through a lot of objects), there's a second `pos()`
-method to which you can pass a `Vec3` object you've already created. This allows
-you to reuse it across many calls and reduce the amount of object allocation
-(and thus garbage collection) your program does.
-
-Java does not support unsigned scalars. This means that any unsigned types you
-use in your schema will actually be represented as a signed value. This means
-all bits are still present, but may represent a negative value when used.
-For example, to read a `byte b` as an unsigned number, you can do:
-`(short)(b & 0xFF)`
-
-The default string accessor (e.g. `monster.name()`) currently always create
-a new Java `String` when accessed, since FlatBuffer's UTF-8 strings can't be
-used in-place by `String`. Alternatively, use `monster.nameAsByteBuffer()`
-which returns a `ByteBuffer` referring to the UTF-8 data in the original
-`ByteBuffer`, which is much more efficient. The `ByteBuffer`'s `position`
-points to the first character, and its `limit` to just after the last.
-
-Vector access is also a bit different from C++: you pass an extra index
-to the vector field accessor. Then a second method with the same name
-suffixed by `Length` let's you know the number of elements you can access:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
-    for (int i = 0; i < monster.inventoryLength(); i++)
-        monster.inventory(i); // do something here
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Alternatively, much like strings, you can use `monster.inventoryAsByteBuffer()`
-to get a `ByteBuffer` referring to the whole vector. Use `ByteBuffer` methods
-like `asFloatBuffer` to get specific views if needed.
-
-If you specified a file_indentifier in the schema, you can query if the
-buffer is of the desired type before accessing it using:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
-    if (Monster.MonsterBufferHasIdentifier(bb)) ...
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-## Buffer construction in Java
-
-You can also construct these buffers in Java using the static methods found
-in the generated code, and the FlatBufferBuilder class:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
-    FlatBufferBuilder fbb = new FlatBufferBuilder();
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Create strings:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
-    int str = fbb.createString("MyMonster");
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Create a table with a struct contained therein:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
-    Monster.startMonster(fbb);
-    Monster.addPos(fbb, Vec3.createVec3(fbb, 1.0f, 2.0f, 3.0f, 3.0, (byte)4, (short)5, (byte)6));
-    Monster.addHp(fbb, (short)80);
-    Monster.addName(fbb, str);
-    Monster.addInventory(fbb, inv);
-    Monster.addTest_type(fbb, (byte)1);
-    Monster.addTest(fbb, mon2);
-    Monster.addTest4(fbb, test4s);
-    int mon = Monster.endMonster(fbb);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-For some simpler types, you can use a convenient `create` function call that
-allows you to construct tables in one function call. This example definition
-however contains an inline struct field, so we have to create the table
-manually.
-This is to create the buffer without using temporary object allocation.
-
-It's important to understand that fields that are structs are inline (like
-`Vec3` above), and MUST thus be created between the start and end calls of
-a table. Everything else (other tables, strings, vectors) MUST be created
-before the start of the table they are referenced in.
-
-Structs do have convenient methods that even have arguments for nested structs.
-
-As you can see, references to other objects (e.g. the string above) are simple
-ints, and thus do not have the type-safety of the Offset type in C++. Extra
-care must thus be taken that you set the right offset on the right field.
-
-Vectors can be created from the corresponding Java array like so:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
-    int inv = Monster.createInventoryVector(fbb, new byte[] { 0, 1, 2, 3, 4 });
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This works for arrays of scalars and (int) offsets to strings/tables,
-but not structs. If you want to write structs, or what you want to write
-does not sit in an array, you can also use the start/end pattern:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
-    Monster.startInventoryVector(fbb, 5);
-    for (byte i = 4; i >=0; i--) fbb.addByte(i);
-    int inv = fbb.endVector();
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You can use the generated method `startInventoryVector` to conveniently call
-`startVector` with the right element size. You pass the number of
-elements you want to write. Note how you write the elements backwards since
-the buffer is being constructed back to front. You then pass `inv` to the
-corresponding `Add` call when you construct the table containing it afterwards.
-
-There are `add` functions for all the scalar types. You use `addOffset` for
-any previously constructed objects (such as other tables, strings, vectors).
-For structs, you use the appropriate `create` function in-line, as shown
-above in the `Monster` example.
-
-To finish the buffer, call:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
-    Monster.finishMonsterBuffer(fbb, mon);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The buffer is now ready to be transmitted. It is contained in the `ByteBuffer`
-which you can obtain from `fbb.dataBuffer()`. Importantly, the valid data does
-not start from offset 0 in this buffer, but from `fbb.dataBuffer().position()`
-(this is because the data was built backwards in memory).
-It ends at `fbb.capacity()`.
-
-
-## Differences in C-sharp
-
-C# code works almost identically to Java, with only a few minor differences.
-You can see an example of C# code in `tests/FlatBuffers.Test/FlatBuffersExampleTests.cs`.
-
-First of all, naming follows standard C# style with `PascalCasing` identifiers,
-e.g. `GetRootAsMyRootType`. Also, values (except vectors and unions) are available
-as properties instead of parameterless accessor methods as in Java. The
-performance-enhancing methods to which you can pass an already created object
-are prefixed with `Get`, e.g.:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cs}
-    // property
-    var pos = monster.Pos;
-    // method filling a preconstructed object
-    var preconstructedPos = new Vec3();
-    monster.GetPos(preconstructedPos);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-## Text parsing
-
-There currently is no support for parsing text (Schema's and JSON) directly
-from Java or C#, though you could use the C++ parser through native call
-interfaces available to each language. Please see the
-C++ documentation for more on text parsing.
-
-### Mutating FlatBuffers
-
-As you saw above, typically once you have created a FlatBuffer, it is
-read-only from that moment on. There are however cases where you have just
-received a FlatBuffer, and you'd like to modify something about it before
-sending it on to another recipient. With the above functionality, you'd have
-to generate an entirely new FlatBuffer, while tracking what you modify in your
-own data structures. This is inconvenient.
-
-For this reason FlatBuffers can also be mutated in-place. While this is great
-for making small fixes to an existing buffer, you generally want to create
-buffers from scratch whenever possible, since it is much more efficient and
-the API is much more general purpose.
-
-To get non-const accessors, invoke `flatc` with `--gen-mutable`.
-
-You now can:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.java}
-    Monster monster = Monster.getRootAsMonster(bb);
-    monster.mutateHp(10);            // Set table field.
-    monster.pos().mutateZ(4);        // Set struct field.
-    monster.mutateInventory(0, 1);   // Set vector element.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-We use the somewhat verbose term `mutate` instead of `set` to indicate that
-this is a special use case, not to be confused with the default way of
-constructing FlatBuffer data.
-
-After the above mutations, you can send on the FlatBuffer to a new recipient
-without any further work!
-
-Note that any `mutate` functions on tables return a boolean, which is false
-if the field we're trying to set isn't present in the buffer. Fields are not
-present if they weren't set, or even if they happen to be equal to the
-default value. For example, in the creation code above we set the `mana` field
-to `150`, which is the default value, so it was never stored in the buffer.
-Trying to call mutateMana() on such data will return false, and the value won't
-actually be modified!
-
-One way to solve this is to call `forceDefaults()` on a
-`FlatBufferBuilder` to force all fields you set to actually be written. This
-of course increases the size of the buffer somewhat, but this may be
-acceptable for a mutable buffer.
diff --git a/docs/source/PHPUsage.md b/docs/source/PHPUsage.md
new file mode 100644
index 000000000..cdff44954
--- /dev/null
+++ b/docs/source/PHPUsage.md
@@ -0,0 +1,89 @@
+Use in PHP    {#flatbuffers_guide_use_php}
+==========
+
+## Before you get started
+
+Before diving into the FlatBuffers usage in PHP, it should be noted that
+the [Tutorial](@ref flatbuffers_guide_tutorial) page has a complete guide to
+general FlatBuffers usage in all of the supported languages
+(including PHP). This page is specifically designed to cover the nuances of
+FlatBuffers usage in PHP.
+
+You should also have read the [Building](@ref flatbuffers_guide_building)
+documentation to build `flatc` and should be familiar with
+[Using the schema compiler](@ref flatbuffers_guide_using_schema_compiler) and
+[Writing a schema](@ref flatbuffers_guide_writing_schema).
+
+## FlatBuffers PHP library code location
+
+The code for FlatBuffers PHP library can be found at `flatbuffers/php`. You
+can browse the library code on the [FlatBuffers
+GitHub page](https://github.com/google/flatbuffers/tree/master/php).
+
+## Testing the FlatBuffers JavaScript library
+
+The code to test the PHP library can be found at `flatbuffers/tests`.
+The test code itself is located in [phpTest.php](https://github.com/google/
+flatbuffers/blob/master/tests/phpTest.php).
+
+You can run the test with `php phpTest.php` from the command line.
+
+*Note: The PHP test file requires
+[PHP](http://php.net/manual/en/install.php) to be installed.*
+
+## Using theFlatBuffers PHP library
+
+*Note: See [Tutorial](@ref flatbuffers_guide_tutorial) for a more in-depth
+example of how to use FlatBuffers in PHP.*
+
+FlatBuffers supports both reading and writing FlatBuffers in PHP.
+
+To use FlatBuffers in your own code, first generate PHP classes from your schema
+with the `--php` option to `flatc`. Then you can include both FlatBuffers and
+the generated code to read or write a FlatBuffer.
+
+For example, here is how you would read a FlatBuffer binary file in PHP:
+First, include the library and generated code (using the PSR `autoload`
+function). Then you can read a FlatBuffer binary file, which you
+pass the contents of to the `GetRootAsMonster` function:
+
+~~~{.php}
+  // It is recommended that your use PSR autoload when using FlatBuffers in PHP.
+  // Here is an example:
+  function __autoload($class_name) {
+    // The last segment of the class name matches the file name.
+    $class = substr($class_name, strrpos($class_name, "\\") + 1);
+    $root_dir = join(DIRECTORY_SEPARATOR, array(dirname(dirname(__FILE__)))); // `flatbuffers` root.
+
+    // Contains the `*.php` files for the FlatBuffers library and the `flatc` generated files.
+    $paths = array(join(DIRECTORY_SEPARATOR, array($root_dir, "php")),
+                   join(DIRECTORY_SEPARATOR, array($root_dir, "tests", "MyGame", "Example")));
+    foreach ($paths as $path) {
+      $file = join(DIRECTORY_SEPARATOR, array($path, $class . ".php"));
+      if (file_exists($file)) {
+        require($file);
+        break;
+    }
+  }
+
+  // Read the contents of the FlatBuffer binary file.
+  $filename = "monster.dat";
+  $handle = fopen($filename, "rb");
+  $contents = $fread($handle, filesize($filename));
+  fclose($handle);
+
+  // Pass the contents to `GetRootAsMonster`.
+  $monster = \MyGame\Example\Monster::GetRootAsMonster($contents);
+~~~
+
+Now you can access values like this:
+
+~~~{.php}
+  $hp = $monster->GetHp();
+  $pos = $monster->GetPos();
+~~~
+
+## Text Parsing
+
+There currently is no support for parsing text (Schema's and JSON) directly
+from PHP.
diff --git a/docs/source/PythonUsage.md b/docs/source/PythonUsage.md
index 33008b3fe..2a0cddeea 100755
--- a/docs/source/PythonUsage.md
+++ b/docs/source/PythonUsage.md
@@ -1,11 +1,52 @@
-# Use in Python
+Use in Python    {#flatbuffers_guide_use_python}
+=============
 
-There's experimental support for reading FlatBuffers in Python. Generate
-code for Python with the `-p` option to `flatc`.
+## Before you get started
 
-See `py_test.py` for an example. You import the generated code, read a
-FlatBuffer binary file into a `bytearray`, which you pass to the
-`GetRootAsMonster` function:
+Before diving into the FlatBuffers usage in Python, it should be noted that the
+[Tutorial](@ref flatbuffers_guide_tutorial) page has a complete guide to general
+FlatBuffers usage in all of the supported languages (including Python). This
+page is designed to cover the nuances of FlatBuffers usage, specific to
+Python.
+
+You should also have read the [Building](@ref flatbuffers_guide_building)
+documentation to build `flatc` and should be familiar with
+[Using the schema compiler](@ref flatbuffers_guide_using_schema_compiler) and
+[Writing a schema](@ref flatbuffers_guide_writing_schema).
+
+## FlatBuffers Python library code location
+
+The code for the FlatBuffers Python library can be found at
+`flatbuffers/python/flatbuffers`. You can browse the library code on the
+[FlatBuffers GitHub page](https://github.com/google/flatbuffers/tree/master/
+python).
+
+## Testing the FlatBuffers Python library
+
+The code to test the Python library can be found at `flatbuffers/tests`.
+The test code itself is located in [py_test.py](https://github.com/google/
+flatbuffers/blob/master/tests/py_test.py).
+
+To run the tests, use the [PythonTest.sh](https://github.com/google/flatbuffers/
+blob/master/tests/PythonTest.sh) shell script.
+
+*Note: This script requires [python](https://www.python.org/) to be
+installed.*
+
+## Using the FlatBuffers Python library
+
+*Note: See [Tutorial](@ref flatbuffers_guide_tutorial) for a more in-depth
+example of how to use FlatBuffers in Python.*
+
+There is support for both reading and writing FlatBuffers in Python.
+
+To use FlatBuffers in your own code, first generate Python classes from your
+schema with the `--python` option to `flatc`. Then you can include both
+FlatBuffers and the generated code to read or write a FlatBuffer.
+
+For example, here is how you would read a FlatBuffer binary file in Python:
+First, import the library and the generated code. Then read a FlatBuffer binary
+file into a `bytearray`, which you pass to the `GetRootAsMonster` function:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.py}
     import MyGame.Example as example
@@ -23,93 +64,10 @@ Now you can access values like this:
     pos = monster.Pos()
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To access vectors you pass an extra index to the
-vector field accessor. Then a second method with the same name suffixed
-by `Length` let's you know the number of elements you can access:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.py}
-    for i in xrange(monster.InventoryLength()):
-        monster.Inventory(i) # do something here
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You can also construct these buffers in Python using the functions found
-in the generated code, and the FlatBufferBuilder class:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.py}
-    builder = flatbuffers.Builder(0)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Create strings:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.py}
-    s = builder.CreateString("MyMonster")
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Create a table with a struct contained therein:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.py}
-    example.MonsterStart(builder)
-    example.MonsterAddPos(builder, example.CreateVec3(builder, 1.0, 2.0, 3.0, 3.0, 4, 5, 6))
-    example.MonsterAddHp(builder, 80)
-    example.MonsterAddName(builder, str)
-    example.MonsterAddInventory(builder, inv)
-    example.MonsterAddTest_Type(builder, 1)
-    example.MonsterAddTest(builder, mon2)
-    example.MonsterAddTest4(builder, test4s)
-    mon = example.MonsterEnd(builder)
-
-    final_flatbuffer = builder.Output()
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Unlike C++, Python does not support table creation functions like 'createMonster()'.
-This is to create the buffer without
-using temporary object allocation (since the `Vec3` is an inline component of
-`Monster`, it has to be created right where it is added, whereas the name and
-the inventory are not inline, and **must** be created outside of the table
-creation sequence).
-Structs do have convenient methods that allow you to construct them in one call.
-These also have arguments for nested structs, e.g. if a struct has a field `a`
-and a nested struct field `b` (which has fields `c` and `d`), then the arguments
-will be `a`, `c` and `d`.
-
-Vectors also use this start/end pattern to allow vectors of both scalar types
-and structs:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.py}
-    example.MonsterStartInventoryVector(builder, 5)
-    i = 4
-    while i >= 0:
-        builder.PrependByte(byte(i))
-        i -= 1
-
-    inv = builder.EndVector(5)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The generated method 'StartInventoryVector' is provided as a convenience
-function which calls 'StartVector' with the correct element size of the vector
-type which in this case is 'ubyte' or 1 byte per vector element.
-You pass the number of elements you want to write.
-You write the elements backwards since the buffer
-is being constructed back to front. Use the correct `Prepend` call for the type,
-or `PrependUOffsetT` for offsets. You then pass `inv` to the corresponding
-`Add` call when you construct the table containing it afterwards.
-
-There are `Prepend` functions for all the scalar types. You use
-`PrependUOffset` for any previously constructed objects (such as other tables,
-strings, vectors). For structs, you use the appropriate `create` function
-in-line, as shown above in the `Monster` example.
-
-Once you're done constructing a buffer, you call `Finish` with the root object
-offset (`mon` in the example above). Your data now resides in Builder.Bytes.
-Important to note is that the real data starts at the index indicated by Head(),
-for Offset() bytes (this is because the buffer is constructed backwards).
-If you wanted to read the buffer right after creating it (using
-`GetRootAsMonster` above), the second argument, instead of `0` would thus
-also be `Head()`.
-
 ## Text Parsing
 
 There currently is no support for parsing text (Schema's and JSON) directly
 from Python, though you could use the C++ parser through SWIG or ctypes. Please
 see the C++ documentation for more on text parsing.
 
+<br>
diff --git a/docs/source/README_TO_GENERATE_DOCS.md b/docs/source/README_TO_GENERATE_DOCS.md
new file mode 100644
index 000000000..5df0b6a8b
--- /dev/null
+++ b/docs/source/README_TO_GENERATE_DOCS.md
@@ -0,0 +1,32 @@
+## Prerequisites
+
+To generate the docs for FlatBuffers from the source files, you
+will first need to install two programs.
+
+1. You will need to install `doxygen`. See
+   [Download Doxygen](http://www.stack.nl/~dimitri/doxygen/download.html).
+
+2. You will need to install `doxypypy` to format python comments appropriately.
+   Install it from [here](https://github.com/Feneric/doxypypy).
+
+*Note: You will need both `doxygen` and `doxypypy` to be in your
+[PATH](https://en.wikipedia.org/wiki/PATH_(variable)) environment variable.*
+
+After you have both of those files installed and in your path, you need to
+set up the `py_filter` to invoke `doxypypy` from `doxygen`.
+
+Follow the steps
+[here](https://github.com/Feneric/doxypypy#invoking-doxypypy-from-doxygen).
+
+## Generating Docs
+
+Run the following commands to generate the docs:
+
+`cd flatbuffers/docs/source`
+`doxygen`
+
+The output is placed in `flatbuffers/docs/html`.
+
+*Note: The Go API Reference code must be generated ahead of time. For
+instructions on how to regenerated this file, please read the comments
+in `GoApi.md`.*
diff --git a/docs/source/Schemas.md b/docs/source/Schemas.md
index 36bebf17d..2ed3005d9 100755
--- a/docs/source/Schemas.md
+++ b/docs/source/Schemas.md
@@ -1,7 +1,8 @@
-# Writing a schema
+Writing a schema    {#flatbuffers_guide_writing_schema}
+================
 
-The syntax of the schema language (aka IDL, Interface Definition
-Language) should look quite familiar to users of any of the C family of
+The syntax of the schema language (aka IDL, [Interface Definition Language][])
+should look quite familiar to users of any of the C family of
 languages, and also to users of other IDLs. Let's look at an example
 first:
 
@@ -34,14 +35,14 @@ first:
 
     root_type Monster;
 
-(Weapon & Pickup not defined as part of this example).
+(`Weapon` & `Pickup` not defined as part of this example).
 
 ### Tables
 
 Tables are the main way of defining objects in FlatBuffers, and consist
 of a name (here `Monster`) and a list of fields. Each field has a name,
-a type, and optionally a default value (if omitted, it defaults to 0 /
-NULL).
+a type, and optionally a default value (if omitted, it defaults to `0` /
+`NULL`).
 
 Each field is optional: It does not have to appear in the wire
 representation, and you can choose to omit fields for each individual
@@ -85,13 +86,13 @@ parent object, and use no virtual table).
 
 Built-in scalar types are:
 
--   8 bit: `byte ubyte bool`
+-   8 bit: `byte`, `ubyte`, `bool`
 
--   16 bit: `short ushort`
+-   16 bit: `short`, `ushort`
 
--   32 bit: `int uint float`
+-   32 bit: `int`, `uint`, `float`
 
--   64 bit: `long ulong double`
+-   64 bit: `long`, `ulong`, `double`
 
 Built-in non-scalar types:
 
@@ -111,18 +112,19 @@ high bit yet.
 
 ### (Default) Values
 
-Values are a sequence of digits, optionally followed by a `.` and more digits
-for float constants, and optionally prefixed by a `-`. Floats may end with an
-`e` or `E`, followed by a `+` or `-` and more digits (scientific notation).
+Values are a sequence of digits. Values may be optionally followed by a decimal
+point (`.`) and more digits, for float constants, or optionally prefixed by
+a `-`. Floats may also be in scientific notation; optionally ending with an `e`
+or `E`, followed by a `+` or `-` and more digits.
 
 Only scalar values can have defaults, non-scalar (string/vector/table) fields
-default to NULL when not present.
+default to `NULL` when not present.
 
 You generally do not want to change default values after they're initially
 defined. Fields that have the default value are not actually stored in the
 serialized data but are generated in code, so when you change the default, you'd
 now get a different value than from code generated from an older version of
-the schema. There are situations however where this may be
+the schema. There are situations, however, where this may be
 desirable, especially if you can ensure a simultaneous rebuild of
 all code.
 
@@ -142,7 +144,7 @@ itself, by handling unknown enum values.
 
 Unions share a lot of properties with enums, but instead of new names
 for constants, you use names of tables. You can then declare
-a union field which can hold a reference to any of those types, and
+a union field, which can hold a reference to any of those types, and
 additionally a hidden field with the suffix `_type` is generated that
 holds the corresponding enum value, allowing you to know which type to
 cast to at runtime.
@@ -178,7 +180,7 @@ included files (those you still generate separately).
 ### Root type
 
 This declares what you consider to be the root table (or struct) of the
-serialized data. This is particular important for parsing JSON data,
+serialized data. This is particularly important for parsing JSON data,
 which doesn't include object type information.
 
 ### File identification and extension
@@ -234,7 +236,7 @@ in the corresponding C++ code. Multiple such lines per item are allowed.
 
 Attributes may be attached to a declaration, behind a field, or after
 the name of a table/struct/enum/union. These may either have a value or
-not. Some attributes like `deprecated` are understood by the compiler,
+not. Some attributes like `deprecated` are understood by the compiler;
 user defined ones need to be declared with the attribute declaration
 (like `priority` in the example above), and are
 available to query if you parse the schema at runtime.
@@ -421,3 +423,6 @@ Occasionally ok. You've renamed fields, which will break all code (and JSON
 files!) that use this schema, but as long as the change is obvious, this is not
 incompatible with the actual binary buffers, since those only ever address
 fields by id/offset.
+<br>
+
+   [Interface Definition Language]: https://en.wikipedia.org/wiki/Interface_description_language
diff --git a/docs/source/Support.md b/docs/source/Support.md
index 7df42499b..ba8c76579 100755
--- a/docs/source/Support.md
+++ b/docs/source/Support.md
@@ -1,4 +1,5 @@
-# Platform / Language / Feature support
+Platform / Language / Feature support    {#flatbuffers_support}
+=====================================
 
 FlatBuffers is actively being worked on, which means that certain platform /
 language / feature combinations may not be available yet.
@@ -39,3 +40,5 @@ Primary authors (github)       | gwvo   | gwvo   | ev*/js*| rw     | rw     | ev
   * js = jonsimantov
   * mik = mikkelfj
   * ch = chobie
+
+<br>
diff --git a/docs/source/Tutorial.md b/docs/source/Tutorial.md
new file mode 100644
index 000000000..fcc208a3b
--- /dev/null
+++ b/docs/source/Tutorial.md
@@ -0,0 +1,1723 @@
+Tutorial   {#flatbuffers_guide_tutorial}
+========
+
+## Overview
+
+This tutorial provides a basic example of how to work with
+[FlatBuffers](@ref flatbuffers_overview). We will step through a simple example
+application, which shows you how to:
+
+   - Write a FlatBuffer `schema` file.
+   - Use the `flatc` FlatBuffer compiler.
+   - Parse [JSON](http://json.org) files that conform to a schema into
+     FlatBuffer binary files.
+   - Use the generated files in many of the supported languages (such as C++,
+     Java, and more.)
+
+During this example, imagine that you are creating a game where the main
+character, the hero of the story, needs to slay some `orc`s. We will walk
+through each step necessary to create this monster type using FlatBuffers.
+
+Please select your desired language for our quest:
+
+\htmlonly
+<form>
+  <input type="radio" name="language" value="cpp" checked="checked">C++</input>
+  <input type="radio" name="language" value="java">Java</input>
+  <input type="radio" name="language" value="csharp">C#</input>
+  <input type="radio" name="language" value="go">Go</input>
+  <input type="radio" name="language" value="python">Python</input>
+  <input type="radio" name="language" value="javascript">JavaScript</input>
+  <input type="radio" name="language" value="php">PHP</input>
+</form>
+\endhtmlonly
+
+\htmlonly
+<script>
+  /**
+   * Check if an HTML `class` attribute is in the language-specific format.
+   * @param {string} languageClass An HTML `class` attribute in the format
+   * 'language-{lang}', where {lang} is a programming language (e.g. 'cpp',
+   * 'java', 'go', etc.).
+   * @return {boolean} Returns `true` if `languageClass` was in the valid
+   * format, prefixed with 'language-'. Otherwise, it returns false.
+   */
+  function isProgrammingLanguageClassName(languageClass) {
+    if (languageClass && languageClass.substring(0, 9) == 'language-' &&
+        languageClass.length > 8) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Given a language-specific HTML `class` attribute, extract the language.
+   * @param {string} languageClass The string name of an HTML `class` attribute,
+   * in the format `language-{lang}`, where {lang} is a programming language
+   * (e.g. 'cpp', 'java', 'go', etc.).
+   * @return {string} Returns a string containing only the {lang} portion of
+   * the class name. If the input was invalid, then it returns `null`.
+   */
+  function extractProgrammingLanguageFromLanguageClass(languageClass) {
+    if (isProgrammingLanguageClassName(languageClass)) {
+      return languageClass.substring(9);
+    } else {
+      return null;
+    }
+  }
+
+  /**
+   * Hide every code snippet, except for the language that is selected.
+   */
+  function displayChosenLanguage() {
+    var selection = $('input:checked').val();
+
+    var htmlElements = document.getElementsByTagName('*');
+    for (var i = 0; i < htmlElements.length; i++) {
+      if (isProgrammingLanguageClassName(htmlElements[i].className)) {
+        if (extractProgrammingLanguageFromLanguageClass(
+              htmlElements[i].className).toLowerCase() != selection) {
+          htmlElements[i].style.display = 'none';
+        } else {
+          htmlElements[i].style.display = 'initial';
+        }
+      }
+    }
+  }
+
+  $( document ).ready(displayChosenLanguage);
+
+  $('input[type=radio]').on("click", displayChosenLanguage);
+</script>
+\endhtmlonly
+
+## Where to Find the Example Code
+
+Samples demonstating the concepts in this example are located in the source code
+package, under the `samples` directory. You can browse the samples on GitHub
+[here](https://github.com/google/flatbuffers/tree/master/samples).
+
+For your chosen language, please cross-reference with:
+
+<div class="language-cpp">
+[sample_binary.cpp](https://github.com/google/flatbuffers/blob/master/samples/sample_binary.cpp)
+</div>
+<div class="language-java">
+[SampleBinary.java](https://github.com/google/flatbuffers/blob/master/samples/SampleBinary.java)
+</div>
+<div class="language-csharp">
+[SampleBinary.cs](https://github.com/google/flatbuffers/blob/master/samples/SampleBinary.cs)
+</div>
+<div class="language-go">
+[sample_binary.go](https://github.com/google/flatbuffers/blob/master/samples/sample_binary.go)
+</div>
+<div class="language-python">
+[sample_binary.py](https://github.com/google/flatbuffers/blob/master/samples/sample_binary.py)
+</div>
+<div class="language-javascript">
+[samplebinary.js](https://github.com/google/flatbuffers/blob/master/samples/samplebinary.js)
+</div>
+<div class="language-php">
+[SampleBinary.php](https://github.com/google/flatbuffers/blob/master/samples/SampleBinary.php)
+</div>
+
+## Writing the Monsters' FlatBuffer Schema
+
+To start working with FlatBuffers, you first need to create a `schema` file,
+which defines the format for each data structure you wish to serialize. Here is
+the `schema` that defines the template for our monsters:
+
+~~~
+  // Example IDL file for our monster's schema.
+
+  namespace MyGame.Sample;
+
+  enum Color:byte { Red = 0, Green, Blue = 2 }
+
+  union Equipment { Weapon } // Optionally add more tables.
+
+  struct Vec3 {
+    x:float;
+    y:float;
+    z:float;
+  }
+
+  table Monster {
+    pos:Vec3; // Struct.
+    mana:short = 150;
+    hp:short = 100;
+    name:string;
+    friendly:bool = false (deprecated);
+    inventory:[ubyte];  // Vector of scalars.
+    color:Color = Blue; // Enum.
+    weapons:[Weapon];   // Vector of tables.
+    equipped:Equipment; // Union.
+  }
+
+  table Weapon {
+    name:string;
+    damage:short;
+  }
+
+  root_type Monster;
+~~~
+
+As you can see, the syntax for the `schema`
+[Interface Definition Language (IDL)](https://en.wikipedia.org/wiki/Interface_description_language)
+is similar to those of the C family of languages, and other IDL languages. Let's
+examine each part of this `schema` to determine what it does.
+
+The `schema` starts with a `namespace` declaration. This determines the
+corresponding package/namespace for the generated code. In our example, we have
+the `Sample` namespace inside of the `MyGame` namespace.
+
+Next, we have an `enum` definition. In this example, we have an `enum` of type
+`byte`, named `Color`. We have three values in this `enum`: `Red`, `Green`, and
+`Blue`. We specify `Red = 0` and `Blue = 2`, but we do not specify an explicit
+value for `Green`. Since the behavior of an `enum` is to increment if
+unspecified, `Green` will receive the implicit value of `1`.
+
+Following the `enum` is a `union`. The `union` in this example is not very
+useful, as it only contains the one `table` (named `Weapon`). If we had created
+multiple tables that we would want the `union` to be able to reference, we
+could add more elements to the `union Equipment`.
+
+After the `union` comes a `struct Vec3`, which represents a floating point
+vector with `3` dimensions. We use a `struct` here, over a `table`, because
+`struct`s are ideal for data structures that will not change, since they use
+less memory and have faster lookup.
+
+The `Monster` table is the main object in our FlatBuffer. This will be used as
+the template to store our `orc` monster. We specify some default values for
+fields, such as `mana:short = 150`. All unspecified fields will default to `0`
+or `NULL`. Another thing to note is the line
+`friendly:bool = false (deprecated);`. Since you cannot delete fields from a
+`table` (to support backwards compatability), you can set fields as
+`deprecated`, which will prevent the generation of accessors for this field in
+the generated code. Be careful when using `deprecated`, however, as it may break
+legacy code that used this accessor.
+
+The `Weapon` table is a sub-table used within our FlatBuffer. It is
+used twice: once within the `Monster` table and once within the `Equipment`
+enum. For our `Monster`, it is used to populate a `vector of tables` via the
+`weapons` field within our `Monster`. It is also the only table referenced by
+the `Equipment` enum.
+
+The last part of the `schema` is the `root_type`. The root type declares what
+will be the root table for the serialized data. In our case, the root type is
+our `Monster` table.
+
+#### More Information About Schemas
+
+You can find a complete guide to writing `schema` files in the
+[Writing a schema](@ref flatbuffers_guide_writing_schema) section of the
+Programmer's Guide. You can also view the formal
+[Grammar of the schema language](@ref flatbuffers_grammar).
+
+## Compiling the Monsters' Schema
+
+After you have written the FlatBuffers schema, the next step is to compile it.
+
+If you have not already done so, please follow
+[these instructions](@ref flatbuffers_guide_building) to build `flatc`, the
+FlatBuffer compiler.
+
+Once `flatc` is built successfully, compile the schema for your language:
+
+<div class="language-cpp">
+~~~{.sh}
+  cd flatbuffers/sample
+  ./../flatc --cpp samples/monster.fbs
+~~~
+</div>
+<div class="language-java">
+~~~{.sh}
+  cd flatbuffers/sample
+  ./../flatc --java samples/monster.fbs
+~~~
+</div>
+<div class="language-csharp">
+~~~{.sh}
+  cd flatbuffers/sample
+  ./../flatc --csharp samples/monster.fbs
+~~~
+</div>
+<div class="language-go">
+~~~{.sh}
+  cd flatbuffers/sample
+  ./../flatc --go samples/monster.fbs
+~~~
+</div>
+<div class="language-python">
+~~~{.sh}
+  cd flatbuffers/sample
+  ./../flatc --python samples/monster.fbs
+~~~
+</div>
+<div class="language-javascript">
+~~~{.sh}
+  cd flatbuffers/sample
+  ./../flatc --javascript samples/monster.fbs
+~~~
+</div>
+<div class="language-php">
+~~~{.sh}
+  cd flatbuffers/sample
+  ./../flatc --php samples/monster.fbs
+~~~
+</div>
+
+For a more complete guide to using the `flatc` compiler, pleaes read the
+[Using the schema compiler](@ref flatbuffers_guide_using_schema_compiler)
+section of the Programmer's Guide.
+
+## Reading and Writing Monster FlatBuffers
+
+Now that we have compiled the schema for our programming language, we can
+start creating some monsters and serializing/deserializing them from
+FlatBuffers.
+
+#### Creating and Writing Orc FlatBuffers
+
+The first step is to import/include the library, generated files, etc.
+
+<div class="language-cpp">
+~~~{.cpp}
+  #include "monster_generate.h" // This was generated by `flatc`.
+
+  using namespace MyGame::Sample; // Specified in the schema.
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  import MyGame.Sample.*; //The `flatc` generated files. (Monster, Vec3, etc.)
+
+  import com.google.flatbuffers.FlatBufferBuilder;
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  using FlatBuffers;
+  using MyGame.Sample; // The `flatc` generated files. (Monster, Vec3, etc.)
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  import (
+          flatbuffers "github.com/google/flatbuffers/go"
+          sample "MyGame/Sample"
+  )
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  import flatbuffers
+
+  # Generated by `flatc`.
+  import MyGame.Sample.Color
+  import MyGame.Sample.Equipment
+  import MyGame.Sample.Monster
+  import MyGame.Sample.Vec3
+  import MyGame.Sample.Weapon
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  // The following code is for JavaScript module loaders (e.g. Node.js). See
+  // below for a browser-based HTML/JavaScript example of including the library.
+  var flatbuffers = require('/js/flatbuffers').flatbuffers;
+  var MyGame = require('./monster_generated').MyGame; // Generated by `flatc`.
+
+  //--------------------------------------------------------------------------//
+
+  // The following code is for browser-based HTML/JavaScript. Use the above code
+  // for JavaScript module loaders (e.g. Node.js).
+  <script src="../js/flatbuffers.js"></script>
+  <script src="monster_generated.js"></script> // Generated by `flatc`.
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  // It is recommended that your use PSR autoload when using FlatBuffers in PHP.
+  // Here is an example from `SampleBinary.php`:
+  function __autoload($class_name) {
+    // The last segment of the class name matches the file name.
+    $class = substr($class_name, strrpos($class_name, "\\") + 1);
+    $root_dir = join(DIRECTORY_SEPARATOR, array(dirname(dirname(__FILE__)))); // `flatbuffers` root.
+
+    // Contains the `*.php` files for the FlatBuffers library and the `flatc` generated files.
+    $paths = array(join(DIRECTORY_SEPARATOR, array($root_dir, "php")),
+                   join(DIRECTORY_SEPARATOR, array($root_dir, "samples", "MyGame", "Sample")));
+    foreach ($paths as $path) {
+      $file = join(DIRECTORY_SEPARATOR, array($path, $class . ".php"));
+      if (file_exists($file)) {
+        require($file);
+        break;
+      }
+    }
+  }
+~~~
+</div>
+
+Now we are ready to start building some buffers. In order to start, we need
+to create an instance of the `FlatBufferBuilder`, which will contain the buffer
+as it grows:
+
+<div class="language-cpp">
+~~~{.cpp}
+  // Create a `FlatBufferBuilder`, which will be used to create our
+  // monsters' FlatBuffers.
+  flatbuffers::FlatBufferBuilder builder;
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  // Create a `FlatBufferBuilder`, which will be used to create our
+  // monsters' FlatBuffers.
+  FlatBufferBuilder builder = new FlatBufferBuilder(0);
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  // Create a `FlatBufferBuilder`, which will be used to create our
+  // monsters' FlatBuffers.
+  var builder = new FlatBufferBuilder(1);
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  // Create a `FlatBufferBuilder`, which will be used to create our
+  // monsters' FlatBuffers.
+  builder := flatbuffers.NewBuilder(0)
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  # Create a `FlatBufferBuilder`, which will be used to create our
+  # monsters' FlatBuffers.
+  builder = flatbuffers.Builder(0)
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  // Create a `flatbuffer.Builder`, which will be used to create our
+  // monsters' FlatBuffers.
+  var builder = new flatbuffers.Builder(1);
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  // Create a `FlatBufferBuilder`, which will be used to create our
+  // monsters' FlatBuffers.
+  $builder = new Google\FlatBuffers\FlatbufferBuilder(0);
+~~~
+</div>
+
+After creating the `builder`, we can start serializing our data. Before we make
+our `orc` Monster, lets create some `Weapon`s: a `Sword` and an `Axe`.
+
+<div class="language-cpp">
+~~~{.cpp}
+  auto weapon_one_name = builder.CreateString("Sword");
+  short weapon_one_damage = 3;
+
+  auto weapon_two_name = builder.CreateString("Axe");
+  short weapon_two_damage = 5;
+
+  // Use the `CreateWeapon` shortcut to create Weapons with all the fields set.
+  auto sword = CreateWeapon(builder, weapon_one_name, weapon_one_damage);
+  auto axe = CreateWeapon(builder, weapon_two_name, weapon_two_damage);
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  String weaponOneName = builder.createString("Sword")
+  short weaponOneDamage = 3;
+
+  String weaponTwoName = builder.createString("Axe");
+  short weaponTwoDamage = 5;
+
+  // Use the `createWeapon()` helper function to create the weapons, since we set every field.
+  int sword = Weapon.createWeapon(builder, weaponOneName, weaponOneDamage);
+  int axe = Weapon.createWeapon(builder, weaponTwoName, weaponTwoDamage);
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  var weaponOneName = builder.CreateString("Sword");
+  var weaponOneDamage = 3;
+
+  var weaponTwoName = builder.CreateString("Axe");
+  var weaponTwoDamage = 5;
+
+  // Use the `CreateWeapon()` helper function to create the weapons, since we set every field.
+  var sword = Weapon.CreateWeapon(builder, weaponOneName, (short)weaponOneDamage);
+  var axe = Weapon.CreateWeapon(builder, weaponTwoName, (short)weaponTwoDamage);
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  weaponOne := builder.CreateString("Sword")
+  weaponTwo := builder.CreateString("Axe")
+
+  // Create the first `Weapon` ("Sword").
+  sample.WeaponStart(builder)
+  sample.Weapon.AddName(builder, weaponOne)
+  sample.Weapon.AddDamage(builder, 3)
+  sword := sample.WeaponEnd(builder)
+
+  // Create the second `Weapon` ("Axe").
+  sample.WeaponStart(builder)
+  sample.Weapon.AddName(builder, weaponTwo)
+  sample.Weapon.AddDamage(builder, 5)
+  axe := sample.WeaponEnd(builder)
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  weapon_one = builder.CreateString('Sword')
+  weapon_two = builder.CreateString('Axe')
+
+  # Create the first `Weapon` ('Sword').
+  MyGame.Sample.Weapon.WeaponStart(builder)
+  MyGame.Sample.Weapon.WeaponAddName(builder, weapon_one)
+  MyGame.Sample.Weapon.WeaponAddDamage(builder, 3)
+  sword = MyGame.Sample.Weapon.WeaponEnd(builder)
+
+  # Create the second `Weapon` ('Axe').
+  MyGame.Sample.Weapon.WeaponStart(builder)
+  MyGame.Sample.Weapon.WeaponAddName(builder, weapon_two)
+  MyGame.Sample.Weapon.WeaponAddDamage(builder, 5)
+  axe = MyGame.Sample.Weapon.WeaponEnd(builder)
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  var weaponOne = builder.createString('Sword');
+  var weaponTwo = builder.createString('Axe');
+
+  // Create the first `Weapon` ('Sword').
+  MyGame.Sample.Weapon.startWeapon(builder);
+  MyGame.Sample.Weapon.addName(builder, weaponOne);
+  MyGame.Sample.Weapon.addDamage(builder, 3);
+  var sword = MyGame.Sample.Weapon.endWeapon(builder);
+
+  // Create the second `Weapon` ('Axe').
+  MyGame.Sample.Weapon.startWeapon(builder);
+  MyGame.Sample.Weapon.addName(builder, weaponTwo);
+  MyGame.Sample.Weapon.addDamage(builder, 5);
+  var axe = MyGame.Sample.Weapon.endWeapon(builder);
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  // Create the `Weapon`s using the `createWeapon()` helper function.
+  $weapon_one_name = $builder->createString("Sword");
+  $sword = \MyGame\Sample\Weapon::CreateWeapon($builder, $weapon_one_name, 3);
+
+  $weapon_two_name = $builder->createString("Axe");
+  $axe = \MyGame\Sample\Weapon::CreateWeapon($builder, $weapon_two_name, 5);
+
+  // Create an array from the two `Weapon`s and pass it to the
+  // `CreateWeaponsVector()` method to create a FlatBuffer vector.
+  $weaps = array($sword, $axe);
+  $weapons = \MyGame\Sample\Monster::CreateWeaponsVector($builder, $weaps);
+~~~
+</div>
+
+Now let's create our monster, the `orc`. For this `orc`, lets make him
+`red` with rage, positioned at `(1.0, 2.0, 3.0)`, and give him
+a large pool of hit points with `300`. We can give him a vector of weapons
+to choose from (our `Sword` and `Axe` from earlier). In this case, we will
+equip him with the `Axe`, since it is the most powerful of the two. Lastly,
+let's fill his inventory with some potential treasures that can be taken once he
+is defeated.
+
+Before we serialize a monster, we need to first serialize any objects that are
+contained there-in, i.e. we serialize the data tree using depth-first, pre-order
+traversal. This is generally easy to do on any tree structures.
+
+<div class="language-cpp">
+~~~{.cpp}
+  // Serialize a name for our monster, called "Orc".
+  auto name = builder.CreateString("Orc");
+
+  // Create a `vector` representing the inventory of the Orc. Each number
+  // could correspond to an item that can be claimed after he is slain.
+  unsigned char treasure = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  auto inventory = builder.CreateVector(treasure, 10);
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  // Serialize a name for our monster, called "Orc".
+  int name = builder.createString("Orc");
+
+  // Create a `vector` representing the inventory of the Orc. Each number
+  // could correspond to an item that can be claimed after he is slain.
+  byte[] treasure = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  int inv = Monster.createInventoryVector(builder, treasure);
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  // Serialize a name for our monster, called "Orc".
+  var name = builder.CreateString("Orc");
+
+  // Create a `vector` representing the inventory of the Orc. Each number
+  // could correspond to an item that can be claimed after he is slain.
+  // Note: Since we prepend the bytes, this loop iterates in reverse order.
+  Monster.StartInventoryVector(builder, 10);
+  for (int i = 9; i >= 0; i--)
+  {
+    builder.AddByte((byte)i);
+  }
+  var inv = builder.EndVector();
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  // Serialize a name for our monster, called "Orc".
+  name := builder.CreateString("Orc")
+
+  // Create a `vector` representing the inventory of the Orc. Each number
+  // could correspond to an item that can be claimed after he is slain.
+  // Note: Since we prepend the bytes, this loop iterates in reverse.
+  sample.MonsterStartInventoryVector(builder, 10)
+  for i := 9; i >= 0; i-- {
+          builder.PrependByte(byte(i))
+  }
+  int := builder.EndVector(10)
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  # Serialize a name for our monster, called "Orc".
+  name = builder.CreateString("Orc")
+
+  # Create a `vector` representing the inventory of the Orc. Each number
+  # could correspond to an item that can be claimed after he is slain.
+  # Note: Since we prepend the bytes, this loop iterates in reverse.
+  MyGame.Sample.Monster.MonsterStartInventoryVector(builder, 10)
+  for i in reversed(range(0, 10)):
+    builder.PrependByte(i)
+  inv = builder.EndVector(10)
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  // Serialize a name for our monster, called 'Orc'.
+  var name = builder.createString('Orc');
+
+  // Create a `vector` representing the inventory of the Orc. Each number
+  // could correspond to an item that can be claimed after he is slain.
+  var treasure = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+  var inv = MyGame.Sample.Monster.createInventoryVector(builder, treasure);
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  // Serialize a name for our monster, called "Orc".
+  $name = $builder->createString("Orc");
+
+  // Create a `vector` representing the inventory of the Orc. Each number
+  // could correspond to an item that can be claimed after he is slain.
+  $treasure = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
+  $inv = \MyGame\Sample\Monster::CreateInventoryVector($builder, $treasure);
+~~~
+</div>
+
+We serialized two built-in data types (`string` and `vector`) and captured
+their return values. These values are offsets into the serialized data,
+indicating where they are stored, such that we can refer to them below when
+adding fields to our monster.
+
+*Note: To create a `vector` of nested objects (e.g. `table`s, `string`s, or
+other `vector`s), collect their offsets into a temporary data structure, and
+then create an additional `vector` containing their offsets.*
+
+For example, take a look at the two `Weapon`s that we created earlier (`Sword`
+and `Axe`). These are both FlatBuffer `table`s, whose offsets we now store in
+memory. Therefore we can create a FlatBuffer `vector` to contain these
+offsets.
+
+<div class="language-cpp">
+~~~{.cpp}
+  // Place the weapons into a `std::vector`, then convert that into a FlatBuffer `vector`.
+  std::vector<flatbuffers::Offset<Weapon>> weapons_vector;
+  weapons_vector.push_back(sword);
+  weapons_vector.push_back(axe);
+  auto weapons = builder.CreateVector(weapons_vector);
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  // Place the two weapons into an array, and pass it to the `createWeaponsVector()` method to
+  // create a FlatBuffer vector.
+  int[] weaps = new int[2];
+  weaps[1] = sword;
+  weaps[2] = axe;
+
+  // Pass the `weaps` array into the `createWeaponsVector()` method to create a FlatBuffer vector.
+  int weapons = Monster.createWeaponsVector(builder, weaps);
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  var weaps = new Offset<Weapon>[2];
+  weaps[0] = sword;
+  weaps[1] = axe;
+
+  // Pass the `weaps` array into the `CreateWeaponsVector()` method to create a FlatBuffer vector.
+  var weapons = Monster.CreateWeaponsVector(builder, weaps);
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  // Create a FlatBuffer vector and prepend the weapons.
+  // Note: Since we prepend the data, prepend them in reverse order.
+  sample.MonsterStartWeaponsVector(builder, 2)
+  builder.PrependUOffsetT(axe)
+  builder.PrependUOffsetT(sword)
+  weapons := builder.EndVector(2)
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  # Create a FlatBuffer vector and prepend the weapons.
+  # Note: Since we prepend the data, prepend them in reverse order.
+  MyGame.Sample.Monster.MonsterStartWeaponsVector(builder, 2)
+  builder.PrependUOffsetTRelative(axe)
+  builder.PrependUOffsetTRelative(sword)
+  weapons = builder.EndVector(2)
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  // Create an array from the two `Weapon`s and pass it to the
+  // `createWeaponsVector()` method to create a FlatBuffer vector.
+  var weaps = [sword, axe];
+  var weapons = MyGame.Sample.Monster.createWeaponsVector(builder, weaps);
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  // Create an array from the two `Weapon`s and pass it to the
+  // `CreateWeaponsVector()` method to create a FlatBuffer vector.
+  $weaps = array($sword, $axe);
+  $weapons = \MyGame\Sample\Monster::CreateWeaponsVector($builder, $weaps);
+~~~
+</div>
+
+To create a `struct`, use the `Vec3` class/struct that was generated by `flatc`:
+
+<div class="language-cpp">
+~~~{.cpp}
+  // Create a `Vec3`, representing the Orc's position in 3-D space.
+  auto pos = Vec3(1.0f, 2.0f, 3.0f);
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  // Create a `Vec3`, representing the Orc's position in 3-D space.
+  int pos = Vec3.createVec3(builder, 1.0f, 2.0f, 3.0f);
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  // Create a `Vec3`, representing the Orc's position in 3-D space.
+  var pos = Vec3.CreateVec3(builder, 1.0f, 2.0f, 3.0f);
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  // Create a `Vec3`, representing the Orc's position in 3-D space.
+  pos := sample.CreateVec3(builder, 1.0, 2.0, 3.0)
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  # Create a `Vec3`, representing the Orc's position in 3-D space.
+  pos = MyGame.Sample.Vec3.CreateVec3(builder, 1.0, 2.0, 3.0)
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  // Create a `Vec3`, representing the Orc's position in 3-D space.
+  var pos = MyGame.Sample.Vec3.createVec3(builder, 1.0, 2.0, 3.0);
+~~~
+</div>
+<div class="language-php">
+~~~{.js}
+  // Create a `Vec3`, representing the Orc's position in 3-D space.
+  $pos = \MyGame\Sample\Vec3::CreateVec3($builder, 1.0, 2.0, 3.0);
+~~~
+</div>
+
+We have now serialized the non-scalar components of the orc, so we
+can serialize the monster itself:
+
+<div class="language-cpp">
+~~~{.cpp}
+  // Set his hit points to 300 and his mana to 150.
+  int hp = 300;
+  int mana = 150;
+
+  // Finally, create the monster using the `CreateMonster` helper function
+  // to set all fields.
+  auto orc = CreateMonster(builder, &pos, mana, hp, name, inventory, Color_Red,
+                           weapons, Equipment_Weapon, axe.Union());
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  // Create our monster using `startMonster()` and `endMonster()`.
+  Monster.startMonster(builder);
+  Monster.addPos(builder, pos);
+  Monster.addName(builder, name);
+  Monster.addColor(builder, Color.Red);
+  Monster.addHp(builder, (short)300);
+  Monster.addInventory(builder, inv);
+  Monster.addWeapons(builder, weapons);
+  Monster.addEquippedType(builder, Equipment.Weapon);
+  Monster.addEquipped(builder, axe);
+  int orc = Monster.endMonster(builder);
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  // Create our monster using `StartMonster()` and `EndMonster()`.
+  Monster.StartMonster(builder);
+  Monster.AddPos(builder, pos);
+  Monster.AddHp(builder, (short)300);
+  Monster.AddName(builder, name);
+  Monster.AddInventory(builder, inv);
+  Monster.AddColor(builder, Color.Red);
+  Monster.AddWeapons(builder, weapons);
+  Monster.AddEquippedType(builder, Equipment.Weapon);
+  Monster.AddEquipped(builder, axe.Value); // Axe
+  var orc = Monster.EndMonster(builder);
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  // Create our monster using `MonsterStart()` and `MonsterEnd()`.
+  sample.MonsterStart(builder)
+  sample.MonsterAddPos(builder, pos)
+  sample.MonsterAddHp(builder, 300)
+  sample.MonsterAddName(builder, name)
+  sample.MonsterAddInventory(builder, inv)
+  sample.MonsterAddColor(builder, sample.ColorRed)
+  sample.MonsterAddWeapons(builder, weapons)
+  sample.MonsterAddEquippedType(builder, sample.EquipmentWeapon)
+  sample.MonsterAddEquipped(builder, axe)
+  orc := sample.MonsterEnd(builder)
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  # Create our monster by using `MonsterStart()` and `MonsterEnd()`.
+  MyGame.Sample.Monster.MonsterStart(builder)
+  MyGame.Sample.Monster.MonsterAddPos(builder, pos)
+  MyGame.Sample.Monster.MonsterAddHp(builder, 300)
+  MyGame.Sample.Monster.MonsterAddName(builder, name)
+  MyGame.Sample.Monster.MonsterAddInventory(builder, inv)
+  MyGame.Sample.Monster.MonsterAddColor(builder,
+                                        MyGame.Sample.Color.Color().Red)
+  MyGame.Sample.Monster.MonsterAddWeapons(builder, weapons)
+  MyGame.Sample.Monster.MonsterAddEquippedType(
+      builder, MyGame.Sample.Equipment.Equipment().Weapon)
+  MyGame.Sample.Monster.MonsterAddEquipped(builder, axe)
+  orc = MyGame.Sample.Monster.MonsterEnd(builder)
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  // Create our monster by using `startMonster()` and `endMonster()`.
+  MyGame.Sample.Monster.startMonster(builder);
+  MyGame.Sample.Monster.addPos(builder, pos);
+  MyGame.Sample.Monster.addHp(builder, 300);
+  MyGame.Sample.Monster.addColor(builder, MyGame.Sample.Color.Red)
+  MyGame.Sample.Monster.addName(builder, name);
+  MyGame.Sample.Monster.addInventory(builder, inv);
+  MyGame.Sample.Monster.addWeapons(builder, weapons);
+  MyGame.Sample.Monster.addEquippedType(builder, MyGame.Sample.Equipment.Weapon);
+  MyGame.Sample.Monster.addEquipped(builder, axe);
+  var orc = MyGame.Sample.Monster.endMonster(builder);
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  // Create our monster by using `StartMonster()` and `EndMonster()`.
+  \MyGame\Sample\Monster::StartMonster($builder);
+  \MyGame\Sample\Monster::AddPos($builder, $pos);
+  \MyGame\Sample\Monster::AddHp($builder, 300);
+  \MyGame\Sample\Monster::AddName($builder, $name);
+  \MyGame\Sample\Monster::AddInventory($builder, $inv);
+  \MyGame\Sample\Monster::AddColor($builder, \MyGame\Sample\Color::Red);
+  \MyGame\Sample\Monster::AddWeapons($builder, $weapons);
+  \MyGame\Sample\Monster::AddEquippedType($builder, \MyGame\Sample\Equipment::Weapon);
+  \MyGame\Sample\Monster::AddEquipped($builder, $axe);
+  $orc = \MyGame\Sample\Monster::EndMonster($builder);
+~~~
+</div>
+
+<div class="language-cpp">
+<br>
+*Note: Since we passing `150` as the `mana` field, which happens to be the
+default value, the field will not actually be written to the buffer, since the
+default value will be returned on query anyway. This is a nice space savings,
+especially if default values are common in your data. It also means that you do
+not need to be worried of adding a lot of fields that are only used in a small
+number of instances, as it will not bloat the buffer if unused.*
+<br><br>
+If you do not wish to set every field in a `table`, it may be more convenient to
+manually set each field of your monster, instead of calling `CreateMonster()`.
+The following snippet is functionally equivalent to the above code, but provides
+a bit more flexibility.
+<br>
+~~~{.cpp}
+  // You can use this code instead of `CreateMonster()`, to create our orc
+  // manually.
+  MonsterBuilder monster_builder(builder);
+  monster_builder.add_pos(&pos);
+  monster_builder.add_hp(hp);
+  monster_builder.add_name(name);
+  monster_builder.add_inventory(inventory);
+  monster_builder.add_color(Color_Red);
+  monster_builder.add_weapons(weapons);
+  monster_builder.add_equipped_type(Equipment_Weapon);
+  monster_builder.add_equpped(axe);
+  auto orc = monster_builder.Finish();
+~~~
+</div>
+
+Before finishing the serialization, let's take a quick look at FlatBuffer
+`union Equipped`. There are two parts to each FlatBuffer `union`. The first, is
+a hidden field `_type`, that is generated to hold the type of `table` referred
+to by the `union`. This allows you to know which type to cast to at runtime.
+Second, is the `union`'s data.
+
+In our example, the last two things we added to our `Monster` were the
+`Equipped Type` and the `Equipped` union itself.
+
+Here is a repetition these lines, to help highlight them more clearly:
+
+<div class="language-cpp">
+  ~~~{.cpp}
+    monster_builder.add_equipped_type(Equipment_Weapon); // Union type
+    monster_builder.add_equipped(axe); // Union data
+  ~~~
+</div>
+<div class="language-java">
+  ~~~{.java}
+    Monster.addEquippedType(builder, Equipment.Weapon); // Union type
+    Monster.addEquipped(axe); // Union data
+  ~~~
+</div>
+<div class="language-csharp">
+  ~~~{.cs}
+    Monster.AddEquippedType(builder, Equipment.Weapon); // Union type
+    Monster.AddEquipped(builder, axe.Value); // Union data
+  ~~~
+</div>
+<div class="language-go">
+  ~~~{.go}
+    sample.MonsterAddEquippedType(builder, sample.EquipmentWeapon) // Union type
+    sample.MonsterAddEquipped(builder, axe) // Union data
+  ~~~
+</div>
+<div class="language-python">
+  ~~~{.py}
+    MyGame.Sample.Monster.MonsterAddEquippedType(            # Union type
+        builder, MyGame.Sample.Equipment.Equipment().Weapon)
+    MyGame.Sample.Monster.MonsterAddEquipped(builder, axe)   # Union data
+  ~~~
+</div>
+<div class="language-javascript">
+  ~~~{.js}
+    MyGame.Sample.Monster.addEquippedType(builder, MyGame.Sample.Equipment.Weapon); // Union type
+    MyGame.Sample.Monster.addEquipped(builder, axe); // Union data
+  ~~~
+</div>
+<div class="language-php">
+  ~~~{.php}
+    \MyGame\Sample\Monster::AddEquippedType($builder, \MyGame\Sample\Equipment::Weapon); // Union type
+    \MyGame\Sample\Monster::AddEquipped($builder, $axe); // Union data
+  ~~~
+</div>
+
+After you have created your buffer, you will have the offset to the root of the
+data in the `orc` variable, so you can finish the buffer by calling the
+appropriate `finish` method.
+
+<div class="language-cpp">
+~~~{.cpp}
+  // Call `Finish()` to instruct the builder that this monster is complete.
+  // Note: Regardless of how you created the `orc`, you still need to call
+  // `Finish()` on the `FlatBufferBuilder`.
+  builder.Finish(orc); // You could also call `FinishMonsterBuffer(builder,
+                       //                                          orc);`.
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  // Call `finish()` to instruct the builder that this monster is complete.
+  builder.finish(orc); // You could also call `Monster.finishMonsterBuffer(builder, orc);`.
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  // Call `Finish()` to instruct the builder that this monster is complete.
+  builder.Finish(orc.Value); // You could also call `Monster.FinishMonsterBuffer(builder, orc);`.
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  // Call `Finish()` to instruct the builder that this monster is complete.
+  builder.Finish(orc)
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  # Call `Finish()` to instruct the builder that this monster is complete.
+  builder.Finish(orc)
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  // Call `finish()` to instruct the builder that this monster is complete.
+  builder.finish(orc); // You could also call `MyGame.Example.Monster.finishMonsterBuffer(builder,
+                       //                                                                 orc);`.
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  // Call `finish()` to instruct the builder that this monster is complete.
+   $builder->finish($orc); // You may also call `\MyGame\Sample\Monster::FinishMonsterBuffer(
+                           //                        $builder, $orc);`.
+~~~
+</div>
+
+The buffer is now ready to be stored somewhere, sent over the network, be
+compressed, or whatever you'd like to do with it. You can access the buffer
+like so:
+
+<div class="language-cpp">
+~~~{.cpp}
+  // This must be called after `Finish()`.
+  uint8_t *buf = builder.GetBufferPointer();
+  int size = builder.GetSize(); // Returns the size of the buffer that
+                                // `GetBufferPointer()` points to.
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  // This must be called after `finish()`.
+  java.nio.ByteBuffer buf = builder.dataBuffer();
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  // This must be called after `Finish()`.
+  var buf = builder.DataBuffer; // Of type `FlatBuffers.ByteBuffer`.
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  // This must be called after `Finish()`.
+  buf := builder.FinishedBytes() // Of type `byte[]`.
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  # This must be called after `Finish()`.
+  buf = builder.Output() // Of type `bytearray`.
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  // This must be called after `finish()`.
+  var buf = builder.dataBuffer(); // Of type `flatbuffers.ByteBuffer`.
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  // This must be called after `finish()`.
+  $buf = $builder->dataBuffer(); // Of type `Google\FlatBuffers\ByteBuffer`
+~~~
+</div>
+
+#### Reading Orc FlatBuffers
+
+Now that we have successfully created an `Orc` FlatBuffer, the monster data can
+be saved, sent over a network, etc. Let's now adventure into the inverse, and
+deserialize a FlatBuffer.
+
+This seciton requires the same import/include, namespace, etc. requirements as
+before:
+
+<div class="language-cpp">
+~~~{.cpp}
+  #include "monster_generate.h" // This was generated by `flatc`.
+
+  using namespace MyGame::Sample; // Specified in the schema.
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  import MyGame.Sample.*; //The `flatc` generated files. (Monster, Vec3, etc.)
+
+  import com.google.flatbuffers.FlatBufferBuilder;
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  using FlatBuffers;
+  using MyGame.Sample; // The `flatc` generated files. (Monster, Vec3, etc.)
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  import (
+          flatbuffers "github.com/google/flatbuffers/go"
+          sample "MyGame/Sample"
+  )
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  import flatbuffers
+
+  # Generated by `flatc`.
+  import MyGame.Sample.Any
+  import MyGame.Sample.Color
+  import MyGame.Sample.Monster
+  import MyGame.Sample.Vec3
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  // The following code is for JavaScript module loaders (e.g. Node.js). See
+  // below for a browser-based HTML/JavaScript example of including the library.
+  var flatbuffers = require('/js/flatbuffers').flatbuffers;
+  var MyGame = require('./monster_generated').MyGame; // Generated by `flatc`.
+
+  //--------------------------------------------------------------------------//
+
+  // The following code is for browser-based HTML/JavaScript. Use the above code
+  // for JavaScript module loaders (e.g. Node.js).
+  <script src="../js/flatbuffers.js"></script>
+  <script src="monster_generated.js"></script> // Generated by `flatc`.
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  // It is recommended that your use PSR autoload when using FlatBuffers in PHP.
+  // Here is an example from `SampleBinary.php`:
+  function __autoload($class_name) {
+    // The last segment of the class name matches the file name.
+    $class = substr($class_name, strrpos($class_name, "\\") + 1);
+    $root_dir = join(DIRECTORY_SEPARATOR, array(dirname(dirname(__FILE__)))); // `flatbuffers` root.
+
+    // Contains the `*.php` files for the FlatBuffers library and the `flatc` generated files.
+    $paths = array(join(DIRECTORY_SEPARATOR, array($root_dir, "php")),
+                   join(DIRECTORY_SEPARATOR, array($root_dir, "samples", "MyGame", "Sample")));
+    foreach ($paths as $path) {
+      $file = join(DIRECTORY_SEPARATOR, array($path, $class . ".php"));
+      if (file_exists($file)) {
+        require($file);
+        break;
+      }
+    }
+  }
+~~~
+</div>
+
+Then, assuming you have a variable containing to the bytes of data from disk,
+network, etc., you can create a monster from this data:
+
+<div class="language-cpp">
+~~~{.cpp}
+  // We can access the buffer we just made directly. Pretend this came over a
+  // network, was read off of disk, etc.
+  auto buffer_pointer = builder.GetBufferPointer();
+
+  // Deserialize the data from the buffer.
+  auto monster = GetMonster(buffer_pointer);
+
+  // `monster` is of type`Monster *`, and points to somewhere inside the buffer.
+
+  // Note: root object pointers are NOT the same as `buffer_pointer`.
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  // We can access the buffer we just made directly. Pretend this came over a
+  // network, was read off of disk, etc.
+  java.nio.ByteBuffer buf = builder.dataBuffer();
+
+  // Deserialize the data from the buffer.
+  Monster monster = Monster.getRootAsMonster(buf);
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  // We can access the buffer we just made directly. Pretend this came over a
+  // network, was read off of disk, etc.
+  var buf = builder.DataBuffer;
+
+  // Deserialize the data from the buffer.
+  var monster = Monster.GetRootAsMonster(buf);
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  // We can access the buffer we just made directly. Pretend this came over a
+  // network, was read off of disk, etc.
+  buf := builder.FinishedBytes()
+
+  // Deserialize the data from the buffer.
+  monster := sample.GetRootAsMonster(buf, 0)
+
+  // Note: We use `0` for the offset here, since we got the data using the
+  // `builder.FinishedBytes()` method. This simulates the data you would
+  // store/receive in your FlatBuffer. If you wanted to read from the
+  // `builder.Bytes` directly, you would need to pass in the offset of
+  // `builder.Head()`, as the builder actually constructs the buffer backwards.
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  # We can access the buffer we just made directly. Pretend this came over a
+  # network, was read off of disk, etc.
+  buf = builder.Output()
+
+  # Deserialize the data from the buffer.
+  monster = MyGame.Sample.Monster.Monster.GetRootAsMonster(buf, 0)
+
+  # Note: We use `0` for the offset here, since we got the data using the
+  # `builder.Output()` method. This simulates the data you would store/receive
+  # in your FlatBuffer. If you wanted to read from the `builder.Bytes` directly,
+  # you would need to pass in the offset of `builder.Head()`, as the builder
+  # actually constructs the buffer backwards.
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  // We can access the buffer we just made directly. Pretend this came over a
+  // network, was read off of disk, etc.
+  var buf = builder.dataBuffer();
+
+  // Deserialize the data from the buffer.
+  var monster = MyGame.Sample.Monster.getRootAsMonster(buf);
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  // We can access the buffer we just made directly. Pretend this came over a
+  // network, was read off of disk, etc.
+  $buf = $builder->dataBuffer();
+
+  // Deserialize the data from the buffer.
+  $monster = \MyGame\Sample\Monster::GetRootAsMonster($buf);
+~~~
+</div>
+
+If you look in the generated files from `flatc`, you will see it generated
+accessors for all non-`deprecated` fields. For example:
+
+<div class="language-cpp">
+~~~{.cpp}
+  auto hp = monster->hp();
+  auto mana = monster->mana();
+  auto name = monster->name()->c_str();
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  short hp = monster.hp();
+  short mana = monster.mana();
+  String name = monster.name();
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  // For C#, unlike other languages support by FlatBuffers, most values (except for
+  // vectors and unions) are available as propreties instead of asccessor methods.
+  var hp = monster.Hp
+  var mana = monster.Mana
+  var name = monster.Name
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  hp := monster.Hp()
+  mana := monster.Mana()
+  name := string(monster.Name()) // Note: `monster.Name()` returns a byte[].
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  hp = monster.Hp()
+  mana = monster.Mana()
+  name = monster.Name()
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  var hp = $monster.hp();
+  var mana = $monster.mana();
+  var name = $monster.name();
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  $hp = $monster->getHp();
+  $mana = $monster->getMana();
+  $name = monster->getName();
+~~~
+</div>
+
+These should hold `300`, `150`, and `"Orc"` respectively.
+
+*Note: We never stored a value in `mp`, so we got the default value of `150`.*
+
+To access sub-objects, in the case of our `pos`, which is a `Vec3`:
+
+<div class="language-cpp">
+~~~{.cpp}
+  auto pos = monster->pos();
+  auto x = pos->x();
+  auto y = pos->y();
+  auto z = pos->z();
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  Vec3 pos = monster.pos();
+  float x = pos.x();
+  float y = pos.y();
+  float z = pos.z();
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  var pos = monster.Pos
+  var x = pos.X
+  var y = pos.Y
+  var z = pos.Z
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  pos := monster.Pos(nil)
+  x := pos.X()
+  y := pos.Y()
+  z := pos.Z()
+
+  // Note: Whenever you access a new object, like in `Pos()`, a new temporary
+  // accessor object gets created. If your code is very performance sensitive,
+  // you can pass in a pointer to an existing `Vec3` instead of `nil`. This
+  // allows you to reuse it across many calls to reduce the amount of object
+  // allocation/garbage collection.
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  pos = monster.Pos()
+  x = pos.X()
+  y = pos.Y()
+  z = pos.Z()
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  var pos = monster.pos();
+  var x = pos.x();
+  var y = pos.y();
+  var z = pos.z();
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  $pos = $monster->getPos();
+  $x = $pos->getX();
+  $y = $pos->getY();
+  $z = $pos->getZ();
+~~~
+</div>
+
+`x`, `y`, and `z` will contain `1.0`, `2.0`, and `3.0`, respectively.
+
+*Note: Had we not set `pos` during serialization, it would be `NULL`-value.*
+
+Similarly, we can access elements of the inventory `vector` by indexing it. You
+can also iterate over the length of the array/vector representing the
+FlatBuffers `vector`.
+
+<div class="language-cpp">
+~~~{.cpp}
+  auto inv = monster->inventory(); // A pointer to a `flatbuffers::Vector<>`.
+  auto inv_len = inv->Length();
+  auto third_item = inv->Get(2);
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  int invLength = monster.inventoryLength();
+  byte thirdItem = monster.inventory(2);
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  int invLength = monster.InventoryLength;
+  var thirdItem = monster.GetInventory(2);
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  invLength := monster.InventoryLength()
+  thirdItem := monster.Inventory(2)
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  inv_len = monster.InventoryLength()
+  third_item = monster.Inventory(2)
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  var invLength = monster.inventoryLength();
+  var thirdItem = monster.inventory(2);
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  $inv_len = $monster->getInventoryLength();
+  $third_item = $monster->getInventory(2);
+~~~
+</div>
+
+For `vector`s of `table`s, you can access the elements like any other vector,
+except your need to handle the result as a FlatBuffer `table`:
+
+<div class="language-cpp">
+~~~{.cpp}
+  auto weapons = monster->weapons(); // A pointer to a `flatbuffers::Vector<>`.
+  auto weapon_len = weapons->Length();
+  auto second_weapon_name = weapons->Get(1)->name()->str();
+  auto second_weapon_damage = weapons->Get(1)->damage()
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  int weaponsLength = monster.weaponsLength();
+  String secondWeaponName = monster.weapons(1).name();
+  short secondWeaponDamage = monster.weapons(1).damage();
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  int weaponsLength = monster.WeaponsLength;
+  var secondWeaponName = monster.GetWeapons(1).Name;
+  var secondWeaponDamage = monster.GetWeapons(1).Damage;
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  weaponLength := monster.WeaponsLength()
+  weapon := new(sample.Weapon) // We need a `sample.Weapon` to pass into `monster.Weapons()`
+                               // to capture the output of the function.
+  if monster.Weapons(weapon, 1) {
+          secondWeaponName := weapon.Name()
+          secondWeaponDamage := weapon.Damage()
+  }
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  weapons_length = monster.WeaponsLength()
+  second_weapon_name = monster.Weapons(1).Name()
+  second_weapon_damage = monster.Weapons(1).Damage()
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  var weaponsLength = monster.weaponsLength();
+  var secondWeaponName = monster.weapons(1).name();
+  var secondWeaponDamage = monster.weapons(1).damage();
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  $weapons_len = $monster->getWeaponsLength();
+  $second_weapon_name = $monster->getWeapons(1)->getName();
+  $second_weapon_damage = $monster->getWeapons(1)->getDamage();
+~~~
+</div>
+
+Last, we can access our `Equipped` FlatBuffer `union`. Just like when we created
+the `union`, we need to get both parts of the `union`: the type and the data.
+
+We can access the type to dynamically cast the data as needed (since the
+`union` only stores a FlatBuffer `table`).
+
+<div class="language-cpp">
+~~~{.cpp}
+  auto union_type = monster.equipped_type();
+
+  if (union_type == Equipment_Weapon) {
+    auto weapon = static_cast<const Weapon*>(monster->equipped()); // Requires `static_cast`
+                                                                   // to type `const Weapon*`.
+
+    auto weapon_name = weapon->name()->str(); // "Axe"
+    auto weapon_damage = weapon->damage();    // 5
+  }
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  int unionType = monster.EquippedType();
+
+  if (unionType == Equipment.Weapon) {
+    Weapon weapon = (Weapon)monster.equipped(new Weapon()); // Requires explicit cast
+                                                            // to `Weapon`.
+
+    String weaponName = weapon.name();    // "Axe"
+    short weaponDamage = weapon.damage(); // 5
+  }
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  var unionType = monster.EquippedType;
+
+  if (unionType == Equipment.Weapon) {
+    var weapon = (Weapon)monster.GetEquipped(new Weapon()); // Requires explicit cast
+                                                            // to `Weapon`.
+
+    var weaponName = weapon.Name;     // "Axe"
+    var weaponDamage = weapon.Damage; // 5
+  }
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  // We need a `flatbuffers.Table` to capture the output of the
+  // `monster.Equipped()` function.
+  unionTable := new(flatbuffers.Table)
+
+  if monster.Equipped(unionTable) {
+          unionType := monster.EquippedType()
+
+          if unionType == sample.EquipmentWeapon {
+                  // Create a `sample.Weapon` object that can be initialized with the contents
+                  // of the `flatbuffers.Table` (`unionTable`), which was populated by
+                  // `monster.Equipped()`.
+                  unionWeapon = new(sample.Weapon)
+                  unionWeapon.Init(unionTable.Bytes, unionTable.Pos)
+
+                  weaponName = unionWeapon.Name()
+                  weaponDamage = unionWeapon.Damage()
+          }
+  }
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  union_type = monster.EquippedType()
+
+  if union_type == MyGame.Sample.Equipment.Equipment().Weapon:
+    # `monster.Equipped()` returns a `flatbuffers.Table`, which can be used to
+    # initialize a `MyGame.Sample.Weapon.Weapon()`.
+    union_weapon = MyGame.Sample.Weapon.Weapon()
+    union_weapon.Init(monster.Equipped().Bytes, monster.Equipped().Pos)
+
+    weapon_name = union_weapon.Name()     // 'Axe'
+    weapon_damage = union_weapon.Damage() // 5
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  var unionType = monster.equippedType();
+
+  if (unionType == MyGame.Sample.Equipment.Weapon) {
+    var weapon_name = monster.equipped(new MyGame.Sample.Weapon()).name();     // 'Axe'
+    var weapon_damage = monster.equipped(new MyGame.Sample.Weapon()).damage(); // 5
+  }
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  $union_type = $monster->getEquippedType();
+
+  if ($union_type == \MyGame\Sample\Equipment::Weapon) {
+    $weapon_name = $monster->getEquipped(new \MyGame\Sample\Weapon())->getName();     // "Axe"
+    $weapon_damage = $monster->getEquipped(new \MyGame\Sample\Weapon())->getDamage(); // 5
+  }
+~~~
+</div>
+
+## Mutating FlatBuffers
+
+As you saw above, typically once you have created a FlatBuffer, it is read-only
+from that moment on. There are, however, cases where you have just received a
+FlatBuffer, and you'd like to modify something about it before sending it on to
+another recipient. With the above functionality, you'd have to generate an
+entirely new FlatBuffer, while tracking what you modified in your own data
+structures. This is inconvenient.
+
+For this reason FlatBuffers can also be mutated in-place. While this is great
+for making small fixes to an existing buffer, you generally want to create
+buffers from scratch whenever possible, since it is much more efficient and the
+API is much more general purpose.
+
+To get non-const accessors, invoke `flatc` with `--gen-mutable`.
+
+Similar to how we read fields using the accessors above, we can now use the
+mutators like so:
+
+<div class="language-cpp">
+~~~{.cpp}
+  auto monster = GetMutableMonster(buffer_pointer);  // non-const
+  monster->mutate_hp(10);                      // Set the table `hp` field.
+  monster->mutable_pos()->mutate_z(4);         // Set struct field.
+  monster->mutable_inventory()->Mutate(0, 1);  // Set vector element.
+~~~
+</div>
+<div class="language-java">
+~~~{.java}
+  Monster monster = Monster.getRootAsMonster(buf);
+  monster.mutateHp(10);            // Set table field.
+  monster.pos().mutateZ(4);        // Set struct field.
+  monster.mutateInventory(0, 1);   // Set vector element.
+~~~
+</div>
+<div class="language-csharp">
+~~~{.cs}
+  var monster = Monster.GetRootAsMonster(buf);
+  monster.MutateHp(10);            // Set table field.
+  monster.Pos.MutateZ(4);          // Set struct field.
+  monster.MutateInventory(0, 1);   // Set vector element.
+~~~
+</div>
+<div class="language-go">
+~~~{.go}
+  <API for mutating FlatBuffers is not yet available in Go.>
+~~~
+</div>
+<div class="language-python">
+~~~{.py}
+  <API for mutating FlatBuffers is not yet available in Python.>
+~~~
+</div>
+<div class="language-javascript">
+~~~{.js}
+  <API for mutating FlatBuffers is not yet support in JavaScript.>
+~~~
+</div>
+<div class="language-php">
+~~~{.php}
+  <API for mutating FlatBuffers is not yet supported in PHP.>
+~~~
+</div>
+
+We use the somewhat verbose term `mutate` instead of `set` to indicate that this
+is a special use case, not to be confused with the default way of constructing
+FlatBuffer data.
+
+After the above mutations, you can send on the FlatBuffer to a new recipient
+without any further work!
+
+Note that any `mutate` functions on a table will return a boolean, which is
+`false` if the field we're trying to set is not present in the buffer. Fields
+that are not present if they weren't set, or even if they happen to be equal to
+the default value. For example, in the creation code above, the `mana`
+field is equal to `150`, which is the default value, so it was never stored in
+the buffer. Trying to call the corresponding `mutate` method for `mana` on such
+data will return `false`, and the value won't actually be modified!
+
+One way to solve this is to call `ForceDefaults` on a FlatBufferBuilder to
+force all fields you set to actually be written. This, of course, increases the
+size of the buffer somewhat, but this may be acceptable for a mutable buffer.
+
+<div class="language-csharp">
+  **Note: `ForceDefaults` is not yet implemented in C#.**
+</div>
+
+## JSON with FlatBuffers
+
+#### Using `flatc` as a Conversion Tool
+
+This is often the preferred method to use JSON with FlatBuffers, as it doesn't
+require you to add any new code to your program. It is also efficient, since you
+can ship with the binary data. The drawback is that it requires an extra step
+for your users/developers to perform (although it may be able to be automated
+as part of your compilation).
+
+Lets say you have a JSON file that describes your monster. In this example,
+we will use the file `flatbuffers/samples/monsterdata.json`.
+
+Here are the contents of the file:
+
+~~~{.json}
+{
+  pos: {
+    x: 1,
+    y: 2,
+    z: 3
+  },
+  hp: 300,
+  name: "Orc"
+}
+~~~
+
+You can run this file through the `flatc` compile with the `-b` flag and
+our `monster.fbs` schema to produce a FlatBuffer binary file.
+
+~~~{.sh}
+./../flatc -b monster.fbs monsterdata.json
+~~~
+
+The output of this will be a file `monsterdata.bin`, which will contain the
+FlatBuffer binary representation of the contents from our `.json` file.
+
+<div class="language-cpp">
+*Note: If you're working in C++, you can also parse JSON at runtime. See the
+[Use in C++](@ref flatbuffers_guide_use_cpp) section of the Programmer's
+Guide for more information.*
+</div>
+
+## Advanced Features for Each Language
+
+Each language has a dedicated `Use in XXX` page in the Programmer's Guide
+to cover the nuances of FlatBuffers in that language.
+
+For your chosen language, see:
+
+<div class="language-cpp">
+[Use in C++](@ref flatbuffers_guide_use_cpp)
+</div>
+<div class="language-java">
+[Use in Java/C#](@ref flatbuffers_guide_use_java_c-sharp)
+</div>
+<div class="language-csharp">
+[Use in Java/C#](@ref flatbuffers_guide_use_java_c-sharp)
+</div>
+<div class="language-go">
+[Use in Go](@ref flatbuffers_guide_use_go)
+</div>
+<div class="language-python">
+[Use in Python](@ref flatbuffers_guide_use_python)
+</div>
+<div class="language-javascript">
+[Use in JavaScript](@ref flatbuffers_guide_use_javascript)
+</div>
+<div class="language-php">
+[Use in PHP](@ref flatbuffers_guide_use_php)
+</div>
+
+<br>
diff --git a/docs/source/WhitePaper.md b/docs/source/WhitePaper.md
index 71b2b2404..e504ada41 100755
--- a/docs/source/WhitePaper.md
+++ b/docs/source/WhitePaper.md
@@ -1,4 +1,5 @@
-# FlatBuffers white paper
+FlatBuffers white paper    {#flatbuffers_white_paper}
+=======================
 
 This document tries to shed some light on to the "why" of FlatBuffers, a
 new serialization library.
@@ -124,4 +125,4 @@ offered by .proto files in the following ways:
 -   A parser that can deal with both schemas and data definitions (JSON
     compatible) uniformly.
 
-
+<br>
diff --git a/docs/source/doxyfile b/docs/source/doxyfile
index 2cb373bc6..ba6fbcbd6 100755
--- a/docs/source/doxyfile
+++ b/docs/source/doxyfile
@@ -88,7 +88,7 @@ OUTPUT_LANGUAGE        = English
 # documentation (similar to Javadoc). Set to NO to disable this.
 # The default value is: YES.
 
-BRIEF_MEMBER_DESC      = NO
+BRIEF_MEMBER_DESC      = YES
 
 # If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
 # description of a member or function before the detailed description
@@ -97,7 +97,7 @@ BRIEF_MEMBER_DESC      = NO
 # brief descriptions will be completely suppressed.
 # The default value is: YES.
 
-REPEAT_BRIEF           = NO
+REPEAT_BRIEF           = YES
 
 # This tag implements a quasi-intelligent brief description abbreviator that is
 # used to form the text in various listings. Each string in this list, if found
@@ -177,7 +177,7 @@ SHORT_NAMES            = NO
 # description.)
 # The default value is: NO.
 
-JAVADOC_AUTOBRIEF      = NO
+JAVADOC_AUTOBRIEF      = YES
 
 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
@@ -203,7 +203,7 @@ MULTILINE_CPP_IS_BRIEF = NO
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
 
-INHERIT_DOCS           = NO
+INHERIT_DOCS           = YES
 
 # If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
 # new page for each member. If set to NO, the documentation of a member will be
@@ -216,7 +216,7 @@ SEPARATE_MEMBER_PAGES  = NO
 # uses this value to replace tabs by spaces in code fragments.
 # Minimum value: 1, maximum value: 16, default value: 4.
 
-TAB_SIZE               = 1
+TAB_SIZE               = 2
 
 # This tag can be used to specify a number of aliases that act as commands in
 # the documentation. An alias has the form:
@@ -296,7 +296,9 @@ MARKDOWN_SUPPORT       = YES
 # or globally by setting AUTOLINK_SUPPORT to NO.
 # The default value is: YES.
 
-AUTOLINK_SUPPORT       = YES
+AUTOLINK_SUPPORT       = NO  # Due to the multiple languages included in the API
+                             # reference for FlatBuffers, the Auto-links were
+                             # wrong more often than not.
 
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should set this
@@ -347,7 +349,7 @@ DISTRIBUTE_GROUP_DOC   = NO
 # \nosubgrouping command.
 # The default value is: YES.
 
-SUBGROUPING            = NO
+SUBGROUPING            = YES
 
 # When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
 # are shown inside the group in which they are included (e.g. using \ingroup)
@@ -424,7 +426,7 @@ EXTRACT_PACKAGE        = NO
 # included in the documentation.
 # The default value is: NO.
 
-EXTRACT_STATIC         = NO
+EXTRACT_STATIC         = YES
 
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
 # locally in source files will be included in the documentation. If set to NO
@@ -508,7 +510,7 @@ HIDE_SCOPE_NAMES       = NO
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
 
-SHOW_INCLUDE_FILES     = NO
+SHOW_INCLUDE_FILES     = YES
 
 # If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
 # files with double quotes in the documentation rather than with sharp brackets.
@@ -520,21 +522,21 @@ FORCE_LOCAL_INCLUDES   = NO
 # documentation for inline members.
 # The default value is: YES.
 
-INLINE_INFO            = NO
+INLINE_INFO            = YES
 
 # If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
 # (detailed) documentation of file and class members alphabetically by member
 # name. If set to NO the members will appear in declaration order.
 # The default value is: YES.
 
-SORT_MEMBER_DOCS       = NO
+SORT_MEMBER_DOCS       = YES
 
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
 # descriptions of file, namespace and class members alphabetically by member
 # name. If set to NO the members will appear in declaration order.
 # The default value is: NO.
 
-SORT_BRIEF_DOCS        = NO
+SORT_BRIEF_DOCS        = YES
 
 # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
 # (brief and detailed) documentation of class members so that constructors and
@@ -600,7 +602,7 @@ GENERATE_BUGLIST       = NO
 # the documentation.
 # The default value is: YES.
 
-GENERATE_DEPRECATEDLIST= NO
+GENERATE_DEPRECATEDLIST= YES
 
 # The ENABLED_SECTIONS tag can be used to enable conditional documentation
 # sections, marked by \if <section_label> ... \endif and \cond <section_label>
@@ -624,21 +626,21 @@ MAX_INITIALIZER_LINES  = 30
 # will mention the files that were used to generate the documentation.
 # The default value is: YES.
 
-SHOW_USED_FILES        = NO
+SHOW_USED_FILES        = YES
 
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
 # will remove the Files entry from the Quick Index and from the Folder Tree View
 # (if specified).
 # The default value is: YES.
 
-SHOW_FILES             = NO
+SHOW_FILES             = YES
 
 # Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
 # page. This will remove the Namespaces entry from the Quick Index and from the
 # Folder Tree View (if specified).
 # The default value is: YES.
 
-SHOW_NAMESPACES        = NO
+SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
@@ -661,7 +663,7 @@ FILE_VERSION_FILTER    =
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.
 
-LAYOUT_FILE            =
+LAYOUT_FILE            = doxygen_layout.xml
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
@@ -692,14 +694,14 @@ QUIET                  = NO
 # Tip: Turn warnings on while writing the documentation.
 # The default value is: YES.
 
-WARNINGS               = NO
+WARNINGS               = YES
 
 # If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
 # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
 # will automatically be disabled.
 # The default value is: YES.
 
-WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
 # potential errors in the documentation, such as not documenting some parameters
@@ -749,13 +751,26 @@ INPUT = "FlatBuffers.md" \
         "Schemas.md" \
         "CppUsage.md" \
         "GoUsage.md" \
-        "JavaUsage.md" \
+        "JavaCsharpUsage.md" \
+        "JavaScriptUsage.md" \
+        "PHPUsage.md" \
         "PythonUsage.md" \
         "Support.md" \
         "Benchmarks.md" \
         "WhitePaper.md" \
         "Internals.md" \
-        "Grammar.md"
+        "Grammar.md" \
+        "CONTRIBUTING.md" \
+        "Tutorial.md" \
+        "GoApi.md" \
+        "groups" \
+        "../../java/com/google/flatbuffers" \
+        "../../python/flatbuffers/builder.py" \
+        "../../js/flatbuffers.js" \
+        "../../php/FlatbufferBuilder.php" \
+        "../../net/FlatBuffers/FlatBufferBuilder.cs" \
+        "../../include/flatbuffers/flatbuffers.h" \
+        "../../go/builder.go"
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -816,13 +831,14 @@ FILE_PATTERNS          = *.c \
                          *.ucf \
                          *.qsf \
                          *.as \
-                         *.js
+                         *.js \
+                         *.go
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
 # The default value is: NO.
 
-RECURSIVE              = NO
+RECURSIVE              = YES
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
@@ -847,7 +863,8 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = *_test.py |
+                         __init__.py
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -864,7 +881,7 @@ EXCLUDE_SYMBOLS        =
 # that contain example code fragments that are included (see the \include
 # command).
 
-EXAMPLE_PATH           =
+EXAMPLE_PATH           = "GoApi_generated.txt"
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
@@ -910,7 +927,7 @@ INPUT_FILTER           =
 # filters are used. If the FILTER_PATTERNS tag is empty or if none of the
 # patterns match the file name, INPUT_FILTER is applied.
 
-FILTER_PATTERNS        =
+FILTER_PATTERNS        = *.py=py_filter
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER ) will also be used to filter the input files that are used for
@@ -978,7 +995,7 @@ REFERENCES_RELATION    = NO
 # link to the documentation.
 # The default value is: YES.
 
-REFERENCES_LINK_SOURCE = NO
+REFERENCES_LINK_SOURCE = YES
 
 # If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
 # source code will show a tooltip with additional information such as prototype,
@@ -1018,26 +1035,7 @@ USE_HTAGS              = NO
 # See also: Section \class.
 # The default value is: YES.
 
-VERBATIM_HEADERS       = NO
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more acurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
+VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
@@ -1048,7 +1046,7 @@ CLANG_OPTIONS          =
 # classes, structs, unions or interfaces.
 # The default value is: YES.
 
-ALPHABETICAL_INDEX     = NO
+ALPHABETICAL_INDEX     = YES
 
 # The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
 # which the alphabetical index list will be split.
@@ -1129,7 +1127,7 @@ HTML_FOOTER            = ../footer.html
 # obsolete.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_STYLESHEET        = style.css
+HTML_STYLESHEET        =
 
 # The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
 # defined cascading style sheet that is included after the standard style sheets
@@ -1140,7 +1138,7 @@ HTML_STYLESHEET        = style.css
 # see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_STYLESHEET  = style.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1150,7 +1148,9 @@ HTML_EXTRA_STYLESHEET  =
 # files will be copied as-is; there are no commands or markers available.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       = ../images/fpl_logo_small.png ../images/ftv2mnode.png ../images/ftv2pnode.png
+HTML_EXTRA_FILES       = "../images/fpl_logo_small.png" \
+                         "../images/ftv2mnode.png" \
+                         "../images/ftv2pnode.png"
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the stylesheet and background images according to
@@ -1407,7 +1407,7 @@ ECLIPSE_DOC_ID         = org.doxygen.Project
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-DISABLE_INDEX          = YES
+DISABLE_INDEX          = NO
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information. If the tag
@@ -1538,7 +1538,7 @@ MATHJAX_CODEFILE       =
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-SEARCHENGINE           = NO
+SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a web server instead of a web client using Javascript. There
@@ -2071,7 +2071,7 @@ EXTERNAL_GROUPS        = NO
 # be listed.
 # The default value is: YES.
 
-EXTERNAL_PAGES         = NO
+EXTERNAL_PAGES         = YES
 
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of 'which perl').
diff --git a/docs/source/doxygen_layout.xml b/docs/source/doxygen_layout.xml
new file mode 100644
index 000000000..9cb838193
--- /dev/null
+++ b/docs/source/doxygen_layout.xml
@@ -0,0 +1,230 @@
+<!-- Copyright 2015 Google Inc. All rights reserved.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+<doxygenlayout version="1.0">
+  <navindex>
+    <tab type="mainpage" visible="no" title=""/>
+    <tab type="usergroup" url="" title="Programmer's Guide">
+      <tab type="user" url="@ref flatbuffers_guide_building"
+          title="Building"/>
+      <tab type="user" url="@ref flatbuffers_guide_tutorial" title="Tutorial"/>
+      <tab type="user" url="@ref flatbuffers_guide_using_schema_compiler"
+          title="Using the schema compiler"/>
+      <tab type="user" url="@ref flatbuffers_guide_writing_schema"
+          title="Writing a schema"/>
+      <tab type="user" url="@ref flatbuffers_guide_use_cpp"
+          title="Use in C++"/>
+      <tab type="user" url="@ref flatbuffers_guide_use_go"
+          title="Use in Go"/>
+      <tab type="user" url="@ref flatbuffers_guide_use_java_c-sharp"
+          title="Use in Java/C#"/>
+      <tab type="user" url="@ref flatbuffers_guide_use_javascript"
+          title="Use in JavaScript"/>
+      <tab type="user" url="@ref flatbuffers_guide_use_php"
+          title="Use in PHP"/>
+      <tab type="user" url="@ref flatbuffers_guide_use_python"
+          title="Use in Python"/>
+    </tab>
+    <tab type="user" url="@ref flatbuffers_support"
+        title="Platform / Language / Feature support"/>
+    <tab type="user" url="@ref flatbuffers_benchmarks"
+        title="Benchmarks"/>
+    <tab type="user" url="@ref flatbuffers_white_paper"
+        title="FlatBuffers white paper"/>
+    <tab type="user" url="@ref flatbuffers_internals"
+        title="FlatBuffers internals"/>
+    <tab type="user" url="@ref flatbuffers_grammar"
+        title="Grammar of the schema langauge"/>
+    <tab type="usergroup" url="" title="API Reference">
+      <tab type="modules" visible="yes" title="APIs" intro=""/>
+      <tab type="classes" visible="yes" title="">
+        <tab type="classlist" visible="yes" title="" intro=""/>
+        <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
+        <tab type="hierarchy" visible="yes" title="" intro=""/>
+        <tab type="classmembers" visible="yes" title="" intro=""/>
+      </tab>
+    </tab>
+    <tab type="user" url="@ref contributing" title="Contributing"/>
+  </navindex>
+
+  <!-- Layout definition for a class page -->
+  <class>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <inheritancegraph visible="$CLASS_GRAPH"/>
+    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
+    <detaileddescription title=""/>
+    <memberdecl>
+      <nestedclasses visible="yes" title=""/>
+      <publictypes title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <publicslots title=""/>
+      <signals title=""/>
+      <publicmethods title=""/>
+      <publicstaticmethods title=""/>
+      <publicattributes title=""/>
+      <publicstaticattributes title=""/>
+      <protectedtypes title=""/>
+      <protectedslots title=""/>
+      <protectedmethods title=""/>
+      <protectedstaticmethods title=""/>
+      <protectedattributes title=""/>
+      <protectedstaticattributes title=""/>
+      <packagetypes title=""/>
+      <packagemethods title=""/>
+      <packagestaticmethods title=""/>
+      <packageattributes title=""/>
+      <packagestaticattributes title=""/>
+      <properties title=""/>
+      <events title=""/>
+      <privatetypes title=""/>
+      <privateslots title=""/>
+      <privatemethods title=""/>
+      <privatestaticmethods title=""/>
+      <privateattributes title=""/>
+      <privatestaticattributes title=""/>
+      <friends title=""/>
+      <related title="" subtitle=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <constructors title=""/>
+      <functions title=""/>
+      <related title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <events title=""/>
+    </memberdef>
+    <allmemberslink visible="yes"/>
+    <usedfiles visible="$SHOW_USED_FILES"/>
+    <authorsection visible="yes"/>
+  </class>
+
+  <!-- Layout definition for a namespace page -->
+  <namespace>
+    <briefdescription visible="yes"/>
+    <memberdecl>
+      <nestednamespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </namespace>
+
+  <!-- Layout definition for a file page -->
+  <file>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includegraph visible="$INCLUDE_GRAPH"/>
+    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
+    <sourcelink visible="yes"/>
+    <detaileddescription title=""/>
+    <memberdecl>
+      <classes visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <memberdef>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection/>
+  </file>
+
+  <!-- Layout definition for a group page -->
+  <group>
+    <briefdescription visible="yes"/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
+    <detaileddescription title=""/>
+    <memberdecl>
+      <nestedgroups visible="yes" title=""/>
+      <dirs visible="yes" title=""/>
+      <files visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <memberdef>
+      <pagedocs/>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </group>
+
+  <!-- Layout definition for a directory page -->
+  <directory>
+    <briefdescription visible="yes"/>
+    <directorygraph visible="yes"/>
+    <memberdecl>
+      <dirs visible="yes"/>
+      <files visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+  </directory>
+</doxygenlayout>
diff --git a/docs/source/groups b/docs/source/groups
new file mode 100644
index 000000000..e0d97a7ac
--- /dev/null
+++ b/docs/source/groups
@@ -0,0 +1,20 @@
+/// @defgroup flatbuffers_cpp_api C++ API
+/// @brief FlatBuffers API for C++
+
+/// @defgroup flatbuffers_csharp_api C# API
+/// @brief FlatBuffers API for C#
+
+/// @defgroup flatbuffers_go_api Go API
+/// @brief FlatBuffers API for Go
+
+/// @defgroup flatbuffers_java_api Java API
+/// @brief FlatBuffers API for Java
+
+/// @defgroup flatbuffers_javascript_api JavaScript API
+/// @brief FlatBuffers API for JavaScript
+
+/// @defgroup flatbuffers_php_api PHP API
+/// @brief FlatBuffers API for PHP
+
+/// @defgroup flatbuffers_python_api Python API
+/// @brief FlatBuffers API for Python
diff --git a/docs/source/style.css b/docs/source/style.css
index 94ec90b13..6045a973a 100644
--- a/docs/source/style.css
+++ b/docs/source/style.css
@@ -1,13 +1,13 @@
-body, 
+body,
 #projectname,
-table, 
-div, 
-p, 
-dl, 
-.title, 
-.tabs, 
-.tabs2, 
-.tabs3, 
+table,
+div,
+p,
+dl,
+.title,
+.tabs,
+.tabs2,
+.tabs3,
 #nav-tree .label {
   font-family: roboto, sans-serif;
 }
@@ -44,12 +44,12 @@ dl,
   font-size: 14px;
 }
 
-.tabs, 
-.tabs2, 
-.tabs3, 
-.tablist li, 
+.tabs,
+.tabs2,
+.tabs3,
+.tablist li,
 .tablist li.current a {
-  background-image: none;	
+  background-image: none;
 }
 
 .tablist {
@@ -106,8 +106,8 @@ div.header {
   right: 10px;
 }
 
-#MSearchBox .left, 
-#MSearchBox .right, 
+#MSearchBox .left,
+#MSearchBox .right,
 #MSearchField {
   background: none;
 }
@@ -165,9 +165,9 @@ a.SelectItem:hover {
   margin-bottom: 8px;
 }
 
-a:link, 
-a:visited, 
-.contents a:link, 
+a:link,
+a:visited,
+.contents a:link,
 .contents a:visited,
 a.el {
   color: #0288d1;
@@ -197,7 +197,7 @@ div.contents {
 }
 
 .directory tr#row_0_ {
-  border-top-color: #7cb342;	
+  border-top-color: #7cb342;
 }
 
 .directory tr#row_0_ td {
@@ -276,7 +276,7 @@ table.doxtable td {
 }
 
 .memberdecls tr:not(.heading) td {
-  background-color: rgba(255,255,255,.95);  
+  background-color: rgba(255,255,255,.95);
 }
 
 h1, h2, h2.groupheader, h3, h4, h5, h6 {
@@ -366,7 +366,7 @@ div.line {
 code, pre {
   color: #455a64;
   background: #f7f7f7;
-  font: 400 100%/1 Roboto Mono,monospace;
+  font: 400 100% Roboto Mono,monospace;
   padding: 1px 4px;
 }
 
@@ -375,7 +375,7 @@ span.preprocessor, span.comment {
 }
 
 span.keywordtype {
-  color: #0097a7;  
+  color: #0097a7;
 }
 
 .paramname {
@@ -383,7 +383,7 @@ span.keywordtype {
 }
 
 .memTemplParams {
-  color: #ef6c00;	
+  color: #ef6c00;
 }
 
 span.mlabel {
diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 65790b822..8f4ff7563 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -30,6 +30,7 @@
 #include <functional>
 #include <memory>
 
+/// @cond FLATBUFFERS_INTERNAL
 #if __cplusplus <= 199711L && \
     (!defined(_MSC_VER) || _MSC_VER < 1600) && \
     (!defined(__GNUC__) || \
@@ -89,9 +90,12 @@
 #else
   #define FLATBUFFERS_FINAL_CLASS
 #endif
+/// @endcond
 
+/// @file
 namespace flatbuffers {
 
+/// @cond FLATBUFFERS_INTERNAL
 // Our default offset / size type, 32bit on purpose on 64bit systems.
 // Also, using a consistent offset type maintains compatibility of serialized
 // offset values between 32bit and 64bit systems.
@@ -535,15 +539,29 @@ inline voffset_t FieldIndexToOffset(voffset_t field_id) {
 inline size_t PaddingBytes(size_t buf_size, size_t scalar_size) {
   return ((~buf_size) + 1) & (scalar_size - 1);
 }
+/// @endcond
 
-// Helper class to hold data needed in creation of a flat buffer.
-// To serialize data, you typically call one of the Create*() functions in
-// the generated code, which in turn call a sequence of StartTable/PushElement/
-// AddElement/EndTable, or the builtin CreateString/CreateVector functions.
-// Do this is depth-first order to build up a tree to the root.
-// Finish() wraps up the buffer ready for transport.
-class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
+/// @addtogroup flatbuffers_cpp_api
+/// @{
+/// @class FlatBufferBuilder
+/// @brief Helper class to hold data needed in creation of a FlatBuffer.
+/// To serialize data, you typically call one of the `Create*()` functions in
+/// the generated code, which in turn call a sequence of `StartTable`/
+/// `PushElement`/`AddElement`/`EndTable`, or the builtin `CreateString`/
+/// `CreateVector` functions. Do this is depth-first order to build up a tree to
+/// the root. `Finish()` wraps up the buffer ready for transport.
+class FlatBufferBuilder
+/// @cond FLATBUFFERS_INTERNAL
+FLATBUFFERS_FINAL_CLASS
+/// @endcond
+{
  public:
+  /// @brief Default constructor for FlatBufferBuilder.
+  /// @param[in] initial_size The initial size of the buffer, in bytes. Defaults
+  /// to`1024`.
+  /// @param[in] allocator A pointer to the `simple_allocator` that should be
+  /// used. Defaults to `nullptr`, which means the `default_allocator` will be
+  /// be used.
   explicit FlatBufferBuilder(uoffset_t initial_size = 1024,
                              const simple_allocator *allocator = nullptr)
       : buf_(initial_size, allocator ? *allocator : default_allocator),
@@ -553,8 +571,8 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
     EndianCheck();
   }
 
-  // Reset all the state in this FlatBufferBuilder so it can be reused
-  // to construct another buffer.
+  /// @brief Reset all the state in this FlatBufferBuilder so it can be reused
+  /// to construct another buffer.
   void Clear() {
     buf_.clear();
     offsetbuf_.clear();
@@ -564,29 +582,34 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
     minalign_ = 1;
   }
 
-  // The current size of the serialized buffer, counting from the end.
+  /// @brief The current size of the serialized buffer, counting from the end.
+  /// @return Returns an `uoffset_t` with the current size of the buffer.
   uoffset_t GetSize() const { return buf_.size(); }
 
-  // Get the serialized buffer (after you call Finish()).
+  /// @brief Get the serialized buffer (after you call `Finish()`).
+  /// @return Returns an `uint8_t` pointer to the FlatBuffer data inside the
+  /// buffer.
   uint8_t *GetBufferPointer() const {
     Finished();
     return buf_.data();
   }
 
-  // Get a pointer to an unfinished buffer.
+  /// @brief Get a pointer to an unfinished buffer.
+  /// @return Returns a `uint8_t` pointer to the unfinished buffer.
   uint8_t *GetCurrentBufferPointer() const { return buf_.data(); }
 
-  // Get the released pointer to the serialized buffer.
-  // Don't attempt to use this FlatBufferBuilder afterwards!
-  // The unique_ptr returned has a special allocator that knows how to
-  // deallocate this pointer (since it points to the middle of an allocation).
-  // Thus, do not mix this pointer with other unique_ptr's, or call release() /
-  // reset() on it.
+  /// @brief Get the released pointer to the serialized buffer.
+  /// @warning Do NOT attempt to use this FlatBufferBuilder afterwards!
+  /// @return The `unique_ptr` returned has a special allocator that knows how
+  /// to deallocate this pointer (since it points to the middle of an
+  /// allocation). Thus, do not mix this pointer with other `unique_ptr`'s, or
+  /// call `release()`/`reset()` on it.
   unique_ptr_t ReleaseBufferPointer() {
     Finished();
     return buf_.release();
   }
 
+  /// @cond FLATBUFFERS_INTERNAL
   void Finished() const {
     // If you get this assert, you're attempting to get access a buffer
     // which hasn't been finished yet. Be sure to call
@@ -595,9 +618,14 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
     // GetCurrentBufferPointer instead.
     assert(finished);
   }
+  /// @endcond
 
+  /// @brief In order to save space, fields that are set to their default value
+  /// don't get serialized into the buffer.
+  /// @param[in] bool fd When set to `true`, always serializes default values.
   void ForceDefaults(bool fd) { force_defaults_ = fd; }
 
+  /// @cond FLATBUFFERS_INTERNAL
   void Pad(size_t num_bytes) { buf_.fill(num_bytes); }
 
   void Align(size_t elem_size) {
@@ -786,8 +814,12 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
     AssertScalarT<T>();
     PreAlign(len, sizeof(T));
   }
+  /// @endcond
 
-  // Functions to store strings, which are allowed to contain any binary data.
+  /// @brief Store a string in the buffer, which can contain any binary data.
+  /// @param[in] str A const char pointer to the data to be stored as a string.
+  /// @param[in] len The number of bytes that should be stored from `str`.
+  /// @return Returns the offset in the buffer where the string starts.
   Offset<String> CreateString(const char *str, size_t len) {
     NotNested();
     PreAlign<uoffset_t>(len + 1);  // Always 0-terminated.
@@ -797,18 +829,28 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
     return Offset<String>(GetSize());
   }
 
+  /// @brief Store a string in the buffer, which can contain any binary data.
+  /// @param[in] str A const char pointer to a C-string to add to the buffer.
+  /// @return Returns the offset in the buffer where the string starts.
   Offset<String> CreateString(const char *str) {
     return CreateString(str, strlen(str));
   }
 
+  /// @brief Store a string in the buffer, which can contain any binary data.
+  /// @param[in] str A const reference to a std::string to store in the buffer.
+  /// @return Returns the offset in the buffer where the string starts.
   Offset<String> CreateString(const std::string &str) {
     return CreateString(str.c_str(), str.length());
   }
 
+  /// @brief Store a string in the buffer, which can contain any binary data.
+  /// @param[in] str A const pointer to a `String` struct to add to the buffer.
+  /// @return Returns the offset in the buffer where the string starts
   Offset<String> CreateString(const String *str) {
     return CreateString(str->c_str(), str->Length());
   }
 
+  /// @cond FLATBUFFERS_INTERNAL
   uoffset_t EndVector(size_t len) {
     assert(nested);  // Hit if no corresponding StartVector.
     nested = false;
@@ -834,7 +876,15 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
   uint8_t *ReserveElements(size_t len, size_t elemsize) {
     return buf_.make_space(len * elemsize);
   }
+  /// @endcond
 
+  /// @brief Serialize an array into a FlatBuffer `vector`.
+  /// @tparam T The data type of the array elements.
+  /// @param[in] v A pointer to the array of type `T` to serialize into the
+  /// buffer as a `vector`.
+  /// @param[in] len The number of elements to serialize.
+  /// @return Returns a typed `Offset` into the serialized data indicating
+  /// where the vector is stored.
   template<typename T> Offset<Vector<T>> CreateVector(const T *v, size_t len) {
     StartVector(len, sizeof(T));
     for (auto i = len; i > 0; ) {
@@ -843,10 +893,23 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
     return Offset<Vector<T>>(EndVector(len));
   }
 
+  /// @brief Serialize a `std::vector` into a FlatBuffer `vector`.
+  /// @tparam T The data type of the `std::vector` elements.
+  /// @param v A const reference to the `std::vector` to serialize into the
+  /// buffer as a `vector`.
+  /// @return Returns a typed `Offset` into the serialized data indicating
+  /// where the vector is stored.
   template<typename T> Offset<Vector<T>> CreateVector(const std::vector<T> &v) {
     return CreateVector(v.data(), v.size());
   }
 
+  /// @brief Serialize an array of structs into a FlatBuffer `vector`.
+  /// @tparam T The data type of the struct array elements.
+  /// @param[in] v A pointer to the array of type `T` to serialize into the
+  /// buffer as a `vector`.
+  /// @param[in] len The number of elements to serialize.
+  /// @return Returns a typed `Offset` into the serialized data indicating
+  /// where the vector is stored.
   template<typename T> Offset<Vector<const T *>> CreateVectorOfStructs(
                                                        const T *v, size_t len) {
     StartVector(len * sizeof(T) / AlignOf<T>(), AlignOf<T>());
@@ -854,11 +917,18 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
     return Offset<Vector<const T *>>(EndVector(len));
   }
 
+  /// @brief Serialize a `std::vector` of structs into a FlatBuffer `vector`.
+  /// @tparam T The data type of the `std::vector` struct elements.
+  /// @param[in]] v A const reference to the `std::vector` of structs to
+  /// serialize into the buffer as a `vector`.
+  /// @return Returns a typed `Offset` into the serialized data indicating
+  /// where the vector is stored.
   template<typename T> Offset<Vector<const T *>> CreateVectorOfStructs(
                                                       const std::vector<T> &v) {
     return CreateVectorOfStructs(v.data(), v.size());
   }
 
+  /// @cond FLATBUFFERS_INTERNAL
   template<typename T>
   struct TableKeyComparator {
   TableKeyComparator(vector_downward& buf) : buf_(buf) {}
@@ -869,20 +939,41 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
     }
     vector_downward& buf_;
   };
+  /// @endcond
 
+  /// @brief Serialize an array of `table` offsets as a `vector` in the buffer
+  /// in sorted order.
+  /// @tparam T The data type that the offset refers to.
+  /// @param[in] v An array of type `Offset<T>` that contains the `table`
+  /// offsets to store in the buffer in sorted order.
+  /// @param[in] len The number of elements to store in the `vector`.
+  /// @return Returns a typed `Offset` into the serialized data indicating
+  /// where the vector is stored.
   template<typename T> Offset<Vector<Offset<T>>> CreateVectorOfSortedTables(
                                                      Offset<T> *v, size_t len) {
     std::sort(v, v + len, TableKeyComparator<T>(buf_));
     return CreateVector(v, len);
   }
 
+  /// @brief Serialize an array of `table` offsets as a `vector` in the buffer
+  /// in sorted order.
+  /// @tparam T The data type that the offset refers to.
+  /// @param[in] v An array of type `Offset<T>` that contains the `table`
+  /// offsets to store in the buffer in sorted order.
+  /// @return Returns a typed `Offset` into the serialized data indicating
+  /// where the vector is stored.
   template<typename T> Offset<Vector<Offset<T>>> CreateVectorOfSortedTables(
                                                     std::vector<Offset<T>> *v) {
     return CreateVectorOfSortedTables(v->data(), v->size());
   }
 
-  // Specialized version for non-copying use cases. Write the data any time
-  // later to the returned buffer pointer `buf`.
+  /// @brief Specialized version of `CreateVector` for non-copying use cases.
+  /// Write the data any time later to the returned buffer pointer `buf`.
+  /// @param[in] len The number of elements to store in the `vector`.
+  /// @param[in] elemsize The size of each element in the `vector`.
+  /// @param[out] buf A pointer to a `uint8_t` pointer that can be
+  /// written to at a later time to serialize the data into a `vector`
+  /// in the buffer.
   uoffset_t CreateUninitializedVector(size_t len, size_t elemsize,
                                       uint8_t **buf) {
     NotNested();
@@ -891,17 +982,26 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
     return EndVector(len);
   }
 
+  /// @brief Specialized version of `CreateVector` for non-copying use cases.
+  /// Write the data any time later to the returned buffer pointer `buf`.
+  /// @tparam T The data type of the data that will be stored in the buffer
+  /// as a `vector`.
+  /// @param[in] len The number of elements to store in the `vector`.
+  /// @param[out] buf A pointer to a pointer of type `T` that can be
+  /// written to at a later time to serialize the data into a `vector`
+  /// in the buffer.
   template<typename T> Offset<Vector<T>> CreateUninitializedVector(
                                                     size_t len, T **buf) {
     return CreateUninitializedVector(len, sizeof(T),
                                      reinterpret_cast<uint8_t **>(buf));
   }
 
+  /// @brief The length of a FlatBuffer file header.
   static const size_t kFileIdentifierLength = 4;
 
-  // Finish serializing a buffer by writing the root offset.
-  // If a file_identifier is given, the buffer will be prefix with a standard
-  // FlatBuffers file header.
+  /// @brief Finish serializing a buffer by writing the root offset.
+  /// @param[in] file_identifier If a `file_identifier` is given, the buffer
+  /// will be prefixed with a standard FlatBuffers file header.
   template<typename T> void Finish(Offset<T> root,
                                    const char *file_identifier = nullptr) {
     NotNested();
@@ -946,7 +1046,9 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
 
   bool force_defaults_;  // Serialize values equal to their defaults anyway.
 };
+/// @}
 
+/// @cond FLATBUFFERS_INTERNAL
 // Helpers to get a typed pointer to the root object contained in the buffer.
 template<typename T> T *GetMutableRoot(void *buf) {
   EndianCheck();
@@ -1286,6 +1388,7 @@ volatile __attribute__((weak)) const char *flatbuffer_version_string =
 
 #endif  // !defined(_WIN32) && !defined(__CYGWIN__)
 
+/// @endcond
 }  // namespace flatbuffers
 
 #endif  // FLATBUFFERS_H_
diff --git a/java/com/google/flatbuffers/Constants.java b/java/com/google/flatbuffers/Constants.java
index 67585d728..ac0593ae6 100644
--- a/java/com/google/flatbuffers/Constants.java
+++ b/java/com/google/flatbuffers/Constants.java
@@ -16,12 +16,19 @@
 
 package com.google.flatbuffers;
 
-// Class that holds shared constants.
+/// @cond FLATBUFFERS_INTERNAL
 
+/**
+ * Class that holds shared constants
+ */
 public class Constants {
     // Java doesn't seem to have these.
+    /** The number of bytes in a `short`. */
     static final int SIZEOF_SHORT = 2;
+    /** The number of bytes in an `int`. */
     static final int SIZEOF_INT = 4;
+    /** The number of bytes in a file identifier. */
     static final int FILE_IDENTIFIER_LENGTH = 4;
 }
 
+/// @endcond
diff --git a/java/com/google/flatbuffers/FlatBufferBuilder.java b/java/com/google/flatbuffers/FlatBufferBuilder.java
index a6234ca63..e86471397 100644
--- a/java/com/google/flatbuffers/FlatBufferBuilder.java
+++ b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -22,30 +22,36 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.Charset;
 
+/// @file
+/// @addtogroup flatbuffers_java_api
+/// @{
+
 /**
  * Class that helps you build a FlatBuffer.  See the section
- * <a href="http://google.github.io/flatbuffers/md__java_usage.html">"Use in Java"</a> in the
+ * @ref flatbuffers_guide_use_java_c-sharp "Use in Java/C#" in the
  * main FlatBuffers documentation.
  */
 public class FlatBufferBuilder {
-    ByteBuffer bb;                   // Where we construct the FlatBuffer.
-    int space;                       // Remaining space in the ByteBuffer.
-    static final Charset utf8charset = Charset.forName("UTF-8");
-    int minalign = 1;                // Minimum alignment encountered so far.
-    int[] vtable = null;             // The vtable for the current table.
-    int vtable_in_use = 0;           // The amount of fields we're actually using.
-    boolean nested = false;          // Whether we are currently serializing a table.
-    boolean finished = false;        // Whether the buffer is finished.
-    int object_start;                // Starting offset of the current struct/table.
-    int[] vtables = new int[16];     // List of offsets of all vtables.
-    int num_vtables = 0;             // Number of entries in `vtables` in use.
-    int vector_num_elems = 0;        // For the current vector being built.
-    boolean force_defaults = false;  // False omits default values from the serialized data
+    /// @cond FLATBUFFERS_INTERNAL
+    ByteBuffer bb;                  // Where we construct the FlatBuffer.
+    int space;                      // Remaining space in the ByteBuffer.
+    static final Charset utf8charset = Charset.forName("UTF-8"); // The UTF-8 character set used by FlatBuffers.
+    int minalign = 1;               // Minimum alignment encountered so far.
+    int[] vtable = null;            // The vtable for the current table.
+    int vtable_in_use = 0;          // The amount of fields we're actually using.
+    boolean nested = false;         // Whether we are currently serializing a table.
+    boolean finished = false;       // Whether the buffer is finished.
+    int object_start;               // Starting offset of the current struct/table.
+    int[] vtables = new int[16];    // List of offsets of all vtables.
+    int num_vtables = 0;            // Number of entries in `vtables` in use.
+    int vector_num_elems = 0;       // For the current vector being built.
+    boolean force_defaults = false; // False omits default values from the serialized data.
+    /// @endcond
 
    /**
-    * Start with a buffer of size {@code initial_size}, then grow as required.
+    * Start with a buffer of size `initial_size`, then grow as required.
     *
-    * @param initial_size The initial size of the internal buffer to use
+    * @param initial_size The initial size of the internal buffer to use.
     */
     public FlatBufferBuilder(int initial_size) {
         if (initial_size <= 0) initial_size = 1;
@@ -63,9 +69,9 @@ public class FlatBufferBuilder {
     /**
      * Alternative constructor allowing reuse of {@link ByteBuffer}s.  The builder
      * can still grow the buffer as necessary.  User classes should make sure
-     * to call {@link #dataBuffer()} to obtain the resulting encoded message
+     * to call {@link #dataBuffer()} to obtain the resulting encoded message.
      *
-     * @param existing_bb The byte buffer to reuse
+     * @param existing_bb The byte buffer to reuse.
      */
     public FlatBufferBuilder(ByteBuffer existing_bb) {
         init(existing_bb);
@@ -73,11 +79,11 @@ public class FlatBufferBuilder {
 
     /**
      * Alternative initializer that allows reusing this object on an existing
-     * ByteBuffer. This method resets the builder's internal state, but keeps
+     * `ByteBuffer`. This method resets the builder's internal state, but keeps
      * objects that have been allocated for temporary storage.
      *
-     * @param existing_bb The byte buffer to reuse
-     * @return this
+     * @param existing_bb The byte buffer to reuse.
+     * @return Returns `this`.
      */
     public FlatBufferBuilder init(ByteBuffer existing_bb){
         bb = existing_bb;
@@ -94,6 +100,13 @@ public class FlatBufferBuilder {
         return this;
     }
 
+    /// @cond FLATBUFFERS_INTERNAL
+    /**
+     * Create a `ByteBuffer` with a given capacity.
+     *
+     * @param capacity The size of the `ByteBuffer` to allocate.
+     * @return Returns the new `ByteBuffer` that was allocated.
+     */
     static ByteBuffer newByteBuffer(int capacity) {
         ByteBuffer newbb = ByteBuffer.allocate(capacity);
         newbb.order(ByteOrder.LITTLE_ENDIAN);
@@ -101,10 +114,10 @@ public class FlatBufferBuilder {
     }
 
     /**
-     * Doubles the size of the backing {link ByteBuffer} and copies the old data towards the
+     * Doubles the size of the backing {@link ByteBuffer} and copies the old data towards the
      * end of the new buffer (since we build the buffer backwards).
      *
-     * @param bb The current buffer with the existing data
+     * @param bb The current buffer with the existing data.
      * @return A new byte buffer with the old data copied copied to it.  The data is
      * located at the end of the buffer.
      */
@@ -130,7 +143,7 @@ public class FlatBufferBuilder {
     }
 
    /**
-    * Add zero valued bytes to prepare a new entry to be added
+    * Add zero valued bytes to prepare a new entry to be added.
     *
     * @param byte_size Number of bytes to add.
     */
@@ -139,14 +152,14 @@ public class FlatBufferBuilder {
     }
 
    /**
-    * Prepare to write an element of {@code size} after {@code additional_bytes}
+    * Prepare to write an element of `size` after `additional_bytes`
     * have been written, e.g. if you write a string, you need to align such
     * the int length field is aligned to {@link com.google.flatbuffers.Constants#SIZEOF_INT}, and
-    * the string data follows it directly.  If all you need to do is alignment, {@code additional_bytes}
+    * the string data follows it directly.  If all you need to do is alignment, `additional_bytes`
     * will be 0.
     *
-    * @param size This is the of the new element to write
-    * @param additional_bytes The padding size
+    * @param size This is the of the new element to write.
+    * @param additional_bytes The padding size.
     */
     public void prep(int size, int additional_bytes) {
         // Track the biggest thing we've ever aligned to.
@@ -163,30 +176,116 @@ public class FlatBufferBuilder {
         pad(align_size);
     }
 
-    // Add a scalar to the buffer, backwards from the current location.
-    // Doesn't align nor check for space.
+    /**
+     * Add a `boolean` to the buffer, backwards from the current location. Doesn't align nor
+     * check for space.
+     *
+     * @param x A `boolean` to put into the buffer.
+     */
     public void putBoolean(boolean x) { bb.put      (space -= 1, (byte)(x ? 1 : 0)); }
-    public void putByte   (byte    x) { bb.put      (space -= 1, x); }
-    public void putShort  (short   x) { bb.putShort (space -= 2, x); }
-    public void putInt    (int     x) { bb.putInt   (space -= 4, x); }
-    public void putLong   (long    x) { bb.putLong  (space -= 8, x); }
-    public void putFloat  (float   x) { bb.putFloat (space -= 4, x); }
-    public void putDouble (double  x) { bb.putDouble(space -= 8, x); }
 
-    // Adds a scalar to the buffer, properly aligned, and the buffer grown
-    // if needed.
+    /**
+     * Add a `byte` to the buffer, backwards from the current location. Doesn't align nor
+     * check for space.
+     *
+     * @param x A `byte` to put into the buffer.
+     */
+    public void putByte   (byte    x) { bb.put      (space -= 1, x); }
+
+    /**
+     * Add a `short` to the buffer, backwards from the current location. Doesn't align nor
+     * check for space.
+     *
+     * @param x A `short` to put into the buffer.
+     */
+    public void putShort  (short   x) { bb.putShort (space -= 2, x); }
+
+    /**
+     * Add an `int` to the buffer, backwards from the current location. Doesn't align nor
+     * check for space.
+     *
+     * @param x An `int` to put into the buffer.
+     */
+    public void putInt    (int     x) { bb.putInt   (space -= 4, x); }
+
+    /**
+     * Add a `long` to the buffer, backwards from the current location. Doesn't align nor
+     * check for space.
+     *
+     * @param x A `long` to put into the buffer.
+     */
+    public void putLong   (long    x) { bb.putLong  (space -= 8, x); }
+
+    /**
+     * Add a `float` to the buffer, backwards from the current location. Doesn't align nor
+     * check for space.
+     *
+     * @param x A `float` to put into the buffer.
+     */
+    public void putFloat  (float   x) { bb.putFloat (space -= 4, x); }
+
+    /**
+     * Add a `double` to the buffer, backwards from the current location. Doesn't align nor
+     * check for space.
+     *
+     * @param x A `double` to put into the buffer.
+     */
+    public void putDouble (double  x) { bb.putDouble(space -= 8, x); }
+    /// @endcond
+
+    /**
+     * Add a `boolean` to the buffer, properly aligned, and grows the buffer (if necessary).
+     *
+     * @param x A `boolean` to put into the buffer.
+     */
     public void addBoolean(boolean x) { prep(1, 0); putBoolean(x); }
+
+    /**
+     * Add a `byte` to the buffer, properly aligned, and grows the buffer (if necessary).
+     *
+     * @param x A `byte` to put into the buffer.
+     */
     public void addByte   (byte    x) { prep(1, 0); putByte   (x); }
+
+    /**
+     * Add a `short` to the buffer, properly aligned, and grows the buffer (if necessary).
+     *
+     * @param x A `short` to put into the buffer.
+     */
     public void addShort  (short   x) { prep(2, 0); putShort  (x); }
+
+    /**
+     * Add an `int` to the buffer, properly aligned, and grows the buffer (if necessary).
+     *
+     * @param x An `int` to put into the buffer.
+     */
     public void addInt    (int     x) { prep(4, 0); putInt    (x); }
+
+    /**
+     * Add a `long` to the buffer, properly aligned, and grows the buffer (if necessary).
+     *
+     * @param x A `long` to put into the buffer.
+     */
     public void addLong   (long    x) { prep(8, 0); putLong   (x); }
+
+    /**
+     * Add a `float` to the buffer, properly aligned, and grows the buffer (if necessary).
+     *
+     * @param x A `float` to put into the buffer.
+     */
     public void addFloat  (float   x) { prep(4, 0); putFloat  (x); }
+
+    /**
+     * Add a `double` to the buffer, properly aligned, and grows the buffer (if necessary).
+     *
+     * @param x A `double` to put into the buffer.
+     */
     public void addDouble (double  x) { prep(8, 0); putDouble (x); }
 
    /**
     * Adds on offset, relative to where it will be written.
     *
-    * @param off The offset to add
+    * @param off The offset to add.
     */
     public void addOffset(int off) {
         prep(SIZEOF_INT, 0);  // Ensure alignment is already done.
@@ -195,15 +294,16 @@ public class FlatBufferBuilder {
         putInt(off);
     }
 
+   /// @cond FLATBUFFERS_INTERNAL
    /**
     * Start a new array/vector of objects.  Users usually will not call
-    * this directly.  The {@code FlatBuffers} compiler will create a start/end
+    * this directly.  The `FlatBuffers` compiler will create a start/end
     * method for vector types in generated code.
     * <p>
     * The expected sequence of calls is:
     * <ol>
     * <li>Start the array using this method.</li>
-    * <li>Call {@link #addOffset(int)} {@code num_elems} number of times to set
+    * <li>Call {@link #addOffset(int)} `num_elems` number of times to set
     * the offset of each element in the array.</li>
     * <li>Call {@link #endVector()} to retrieve the offset of the array.</li>
     * </ol>
@@ -233,9 +333,9 @@ public class FlatBufferBuilder {
     * int offsetOfTheVector = fbb.endVector();
     * }</pre>
     *
-    * @param elem_size The size of each element in the array
-    * @param num_elems The number of elements in the array
-    * @param alignment The alignment of the array
+    * @param elem_size The size of each element in the array.
+    * @param num_elems The number of elements in the array.
+    * @param alignment The alignment of the array.
     */
     public void startVector(int elem_size, int num_elems, int alignment) {
         notNested();
@@ -259,12 +359,13 @@ public class FlatBufferBuilder {
         putInt(vector_num_elems);
         return offset();
     }
+    /// @endcond
 
    /**
-    * Encode the string {@code s} in the buffer using UTF-8.
+    * Encode the string `s` in the buffer using UTF-8.
     *
-    * @param s The string to encode
-    * @return The offset in the buffer where the encoded string starts
+    * @param s The string to encode.
+    * @return The offset in the buffer where the encoded string starts.
     */
     public int createString(String s) {
         byte[] utf8 = s.getBytes(utf8charset);
@@ -276,10 +377,10 @@ public class FlatBufferBuilder {
     }
 
    /**
-    * Encode the string {@code s} in the buffer using UTF-8.
+    * Create a string in the buffer from an already encoded UTF-8 string in a ByteBuffer.
     *
-    * @param s An already encoded UTF-8 string
-    * @return The offset in the buffer where the encoded string starts
+    * @param s An already encoded UTF-8 string as a `ByteBuffer`.
+    * @return The offset in the buffer where the encoded string starts.
     */
     public int createString(ByteBuffer s) {
         int length = s.remaining();
@@ -290,6 +391,7 @@ public class FlatBufferBuilder {
         return endVector();
     }
 
+   /// @cond FLATBUFFERS_INTERNAL
    /**
     * Should not be accessing the final buffer before it is finished.
     */
@@ -302,7 +404,7 @@ public class FlatBufferBuilder {
 
    /**
     * Should not be creating any other object, string or vector
-    * while an object is being constructed
+    * while an object is being constructed.
     */
     public void notNested() {
         if (nested)
@@ -314,7 +416,7 @@ public class FlatBufferBuilder {
     * where they're used.  You'll get this assertion failure if you
     * created it elsewhere.
     *
-    * @param obj The offset of the created object
+    * @param obj The offset of the created object.
     */
     public void Nested(int obj) {
         if (obj != offset())
@@ -323,12 +425,12 @@ public class FlatBufferBuilder {
 
    /**
     * Start encoding a new object in the buffer.  Users will not usually need to
-    * call this directly. The {@code FlatBuffers} compiler will generate helper methods
+    * call this directly. The `FlatBuffers` compiler will generate helper methods
     * that call this method internally.
     * <p>
     * For example, using the "Monster" code found on the
-    * <a href="http://google.github.io/flatbuffers/md__java_usage.html">landing page</a>. An
-    * object of type {@code Monster} can be created using the following code:
+    * @ref flatbuffers_guide_use_java_c-sharp "landing page". An
+    * object of type `Monster` can be created using the following code:
     *
     * <pre>{@code
     * int testArrayOfString = Monster.createTestarrayofstringVector(fbb, new int[] {
@@ -351,14 +453,14 @@ public class FlatBufferBuilder {
     * <p>
     * Here:
     * <ul>
-    * <li>The call to {@code Monster#startMonster(FlatBufferBuilder)} will call this
+    * <li>The call to `Monster#startMonster(FlatBufferBuilder)` will call this
     * method with the right number of fields set.</li>
-    * <li>{@code Monster#endMonster(FlatBufferBuilder)} will ensure {@link #endObject()} is called.</li>
+    * <li>`Monster#endMonster(FlatBufferBuilder)` will ensure {@link #endObject()} is called.</li>
     * </ul>
     * <p>
     * It's not recommended to call this method directly.  If it's called manually, you must ensure
     * to audit all calls to it whenever fields are added or removed from your schema.  This is
-    * automatically done by the code generated by the {@code FlatBuffers} compiler.
+    * automatically done by the code generated by the `FlatBuffers` compiler.
     *
     * @param numfields The number of fields found in this object.
     */
@@ -371,17 +473,101 @@ public class FlatBufferBuilder {
         object_start = offset();
     }
 
-    // Add a scalar to a table at `o` into its vtable, with value `x` and default `d`
+    /**
+     * Add a `boolean` to a table at `o` into its vtable, with value `x` and default `d`.
+     *
+     * @param o The index into the vtable.
+     * @param x A `boolean` to put into the buffer, depending on how defaults are handled. If
+     * `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
+     * default value, it can be skipped.
+     * @param d A `boolean` default value to compare against when `force_defaults` is `false`.
+     */
     public void addBoolean(int o, boolean x, boolean d) { if(force_defaults || x != d) { addBoolean(x); slot(o); } }
+
+    /**
+     * Add a `byte` to a table at `o` into its vtable, with value `x` and default `d`.
+     *
+     * @param o The index into the vtable.
+     * @param x A `byte` to put into the buffer, depending on how defaults are handled. If
+     * `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
+     * default value, it can be skipped.
+     * @param d A `byte` default value to compare against when `force_defaults` is `false`.
+     */
     public void addByte   (int o, byte    x, int     d) { if(force_defaults || x != d) { addByte   (x); slot(o); } }
+
+    /**
+     * Add a `short` to a table at `o` into its vtable, with value `x` and default `d`.
+     *
+     * @param o The index into the vtable.
+     * @param x A `short` to put into the buffer, depending on how defaults are handled. If
+     * `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
+     * default value, it can be skipped.
+     * @param d A `short` default value to compare against when `force_defaults` is `false`.
+     */
     public void addShort  (int o, short   x, int     d) { if(force_defaults || x != d) { addShort  (x); slot(o); } }
+
+    /**
+     * Add an `int` to a table at `o` into its vtable, with value `x` and default `d`.
+     *
+     * @param o The index into the vtable.
+     * @param x An `int` to put into the buffer, depending on how defaults are handled. If
+     * `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
+     * default value, it can be skipped.
+     * @param d An `int` default value to compare against when `force_defaults` is `false`.
+     */
     public void addInt    (int o, int     x, int     d) { if(force_defaults || x != d) { addInt    (x); slot(o); } }
+
+    /**
+     * Add a `long` to a table at `o` into its vtable, with value `x` and default `d`.
+     *
+     * @param o The index into the vtable.
+     * @param x A `long` to put into the buffer, depending on how defaults are handled. If
+     * `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
+     * default value, it can be skipped.
+     * @param d A `long` default value to compare against when `force_defaults` is `false`.
+     */
     public void addLong   (int o, long    x, long    d) { if(force_defaults || x != d) { addLong   (x); slot(o); } }
+
+    /**
+     * Add a `float` to a table at `o` into its vtable, with value `x` and default `d`.
+     *
+     * @param o The index into the vtable.
+     * @param x A `float` to put into the buffer, depending on how defaults are handled. If
+     * `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
+     * default value, it can be skipped.
+     * @param d A `float` default value to compare against when `force_defaults` is `false`.
+     */
     public void addFloat  (int o, float   x, double  d) { if(force_defaults || x != d) { addFloat  (x); slot(o); } }
+
+    /**
+     * Add a `double` to a table at `o` into its vtable, with value `x` and default `d`.
+     *
+     * @param o The index into the vtable.
+     * @param x A `double` to put into the buffer, depending on how defaults are handled. If
+     * `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
+     * default value, it can be skipped.
+     * @param d A `double` default value to compare against when `force_defaults` is `false`.
+     */
     public void addDouble (int o, double  x, double  d) { if(force_defaults || x != d) { addDouble (x); slot(o); } }
+
+    /**
+     * Add an `offset` to a table at `o` into its vtable, with value `x` and default `d`.
+     *
+     * @param o The index into the vtable.
+     * @param x An `offset` to put into the buffer, depending on how defaults are handled. If
+     * `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
+     * default value, it can be skipped.
+     * @param d An `offset` default value to compare against when `force_defaults` is `false`.
+     */
     public void addOffset (int o, int     x, int     d) { if(force_defaults || x != d) { addOffset (x); slot(o); } }
 
-    // Structs are stored inline, so nothing additional is being added. `d` is always 0.
+    /**
+     * Add a struct to the table. Structs are stored inline, so nothing additional is being added.
+     *
+     * @param voffset The index into the vtable.
+     * @param x The offset of the created struct.
+     * @param d The default value is always `0`.
+     */
     public void addStruct(int voffset, int x, int d) {
         if(x != d) {
             Nested(x);
@@ -389,7 +575,12 @@ public class FlatBufferBuilder {
         }
     }
 
-    // Set the current vtable at `voffset` to the current location in the buffer.
+    /**
+     * Set the current vtable at `voffset` to the current location in the buffer.
+     *
+     * @param voffset The index into the vtable to store the offset relative to the end of the
+     * buffer.
+     */
     public void slot(int voffset) {
         vtable[voffset] = offset();
     }
@@ -397,7 +588,7 @@ public class FlatBufferBuilder {
    /**
     * Finish off writing the object that is under construction.
     *
-    * @return The offset to the object inside {@link #dataBuffer()}
+    * @return The offset to the object inside {@link #dataBuffer()}.
     * @see #startObject(int)
     */
     public int endObject() {
@@ -453,8 +644,13 @@ public class FlatBufferBuilder {
         return vtableloc;
     }
 
-    // This checks a required field has been set in a given table that has
-    // just been constructed.
+    /**
+     * Checks that a required field has been set in a given table that has
+     * just been constructed.
+     *
+     * @param table The offset to the start of the table from the `ByteBuffer` capacity.
+     * @param field The offset to the field in the vtable.
+     */
     public void required(int table, int field) {
         int table_start = bb.capacity() - table;
         int vtable_start = table_start - bb.getInt(table_start);
@@ -463,7 +659,13 @@ public class FlatBufferBuilder {
         if (!ok)
             throw new AssertionError("FlatBuffers: field " + field + " must be set");
     }
+    /// @endcond
 
+    /**
+     * Finalize a buffer, pointing to the given `root_table`.
+     *
+     * @param root_table An offset to be added to the buffer.
+     */
     public void finish(int root_table) {
         prep(minalign, SIZEOF_INT);
         addOffset(root_table);
@@ -471,6 +673,13 @@ public class FlatBufferBuilder {
         finished = true;
     }
 
+    /**
+     * Finalize a buffer, pointing to the given `root_table`.
+     *
+     * @param root_table An offset to be added to the buffer.
+     * @param file_identifier A FlatBuffer file identifier to be added to the buffer before
+     * `root_table`.
+     */
     public void finish(int root_table, String file_identifier) {
         prep(minalign, SIZEOF_INT + FILE_IDENTIFIER_LENGTH);
         if (file_identifier.length() != FILE_IDENTIFIER_LENGTH)
@@ -487,17 +696,19 @@ public class FlatBufferBuilder {
      * don't get serialized into the buffer. Forcing defaults provides a
      * way to manually disable this optimization.
      *
-     * @param forceDefaults true always serializes default values
-     * @return this
+     * @param forceDefaults When set to `true`, always serializes default values.
+     * @return Returns `this`.
      */
     public FlatBufferBuilder forceDefaults(boolean forceDefaults){
         this.force_defaults = forceDefaults;
         return this;
     }
 
-    // Get the ByteBuffer representing the FlatBuffer. Only call this after you've
-    // called finish(). The actual data starts at the ByteBuffer's current position,
-    // not necessarily at 0.
+    /**
+     * Get the ByteBuffer representing the FlatBuffer. Only call this after you've
+     * called `finish()`. The actual data starts at the ByteBuffer's current position,
+     * not necessarily at `0`.
+     */
     public ByteBuffer dataBuffer() {
         finished();
         return bb;
@@ -518,13 +729,13 @@ public class FlatBufferBuilder {
     }
 
    /**
-    * Utility function for copying a byte array from {@code start} to
-    * {@code start} + {@code length}
+    * A utility function to copy and return the ByteBuffer data from `start` to
+    * `start` + `length` as a `byte[]`.
     *
-    * @param start Start copying at this offset
-    * @param length How many bytes to copy
-    * @return A range copy of the {@link #dataBuffer() data buffer}
-    * @throws IndexOutOfBoundsException If the range of bytes is ouf of bound
+    * @param start Start copying at this offset.
+    * @param length How many bytes to copy.
+    * @return A range copy of the {@link #dataBuffer() data buffer}.
+    * @throws IndexOutOfBoundsException If the range of bytes is ouf of bound.
     */
     public byte[] sizedByteArray(int start, int length){
         finished();
@@ -535,11 +746,13 @@ public class FlatBufferBuilder {
     }
 
    /**
-    * Utility function for copying a byte array that starts at 0.
+    * A utility function to copy and return the ByteBuffer data as a `byte[]`.
     *
-    * @return A full copy of the {@link #dataBuffer() data buffer}
+    * @return A full copy of the {@link #dataBuffer() data buffer}.
     */
     public byte[] sizedByteArray() {
         return sizedByteArray(space, bb.capacity() - space);
     }
 }
+
+/// @}
diff --git a/java/com/google/flatbuffers/Struct.java b/java/com/google/flatbuffers/Struct.java
index 9e6fe4a24..ae3155314 100644
--- a/java/com/google/flatbuffers/Struct.java
+++ b/java/com/google/flatbuffers/Struct.java
@@ -18,8 +18,16 @@ package com.google.flatbuffers;
 
 import java.nio.ByteBuffer;
 
-// All structs in the generated code derive from this class, and add their own accessors.
+/// @cond FLATBUFFERS_INTERNAL
+
+/**
+ * All structs in the generated code derive from this class, and add their own accessors.
+ */
 public class Struct {
+  /** Used to hold the position of the `bb` buffer. */
   protected int bb_pos;
+  /** The underlying ByteBuffer to hold the data of the Struct. */
   protected ByteBuffer bb;
 }
+
+/// @endcond
diff --git a/java/com/google/flatbuffers/Table.java b/java/com/google/flatbuffers/Table.java
index c4a93756e..3d10012a8 100644
--- a/java/com/google/flatbuffers/Table.java
+++ b/java/com/google/flatbuffers/Table.java
@@ -20,34 +20,61 @@ import static com.google.flatbuffers.Constants.*;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-// All tables in the generated code derive from this class, and add their own accessors.
+/// @cond FLATBUFFERS_INTERNAL
+
+/**
+ * All tables in the generated code derive from this class, and add their own accessors.
+ */
 public class Table {
+  /** Used to hold the position of the `bb` buffer. */
   protected int bb_pos;
+  /** The underlying ByteBuffer to hold the data of the Table. */
   protected ByteBuffer bb;
 
+  /**
+   * Get the underlying ByteBuffer.
+   *
+   * @return Returns the Table's ByteBuffer.
+   */
   public ByteBuffer getByteBuffer() { return bb; }
 
-  // Look up a field in the vtable, return an offset into the object, or 0 if the field is not
-  // present.
+  /**
+   * Look up a field in the vtable.
+   *
+   * @param vtable_offset An `int` offset to the vtable in the Table's ByteBuffer.
+   * @return Returns an offset into the object, or `0` if the field is not present.
+   */
   protected int __offset(int vtable_offset) {
     int vtable = bb_pos - bb.getInt(bb_pos);
     return vtable_offset < bb.getShort(vtable) ? bb.getShort(vtable + vtable_offset) : 0;
   }
 
-  // Retrieve the relative offset stored at "offset"
+  /**
+   * Retrieve a relative offset.
+   *
+   * @param offset An `int` index into the Table's ByteBuffer containing the relative offset.
+   * @return Returns the relative offset stored at `offset`.
+   */
   protected int __indirect(int offset) {
     return offset + bb.getInt(offset);
   }
 
-  // Create a java String from UTF-8 data stored inside the flatbuffer.
-  // This allocates a new string and converts to wide chars upon each access,
-  // which is not very efficient. Instead, each FlatBuffer string also comes with an
-  // accessor based on __vector_as_bytebuffer below, which is much more efficient,
-  // assuming your Java program can handle UTF-8 data directly.
+  /**
+   * Create a Java `String` from UTF-8 data stored inside the FlatBuffer.
+   *
+   * This allocates a new string and converts to wide chars upon each access,
+   * which is not very efficient. Instead, each FlatBuffer string also comes with an
+   * accessor based on __vector_as_bytebuffer below, which is much more efficient,
+   * assuming your Java program can handle UTF-8 data directly.
+   *
+   * @param offset An `int` index into the Table's ByteBuffer.
+   * @return Returns a `String` from the data stored inside the FlatBuffer at `offset`.
+   */
   protected String __string(int offset) {
     offset += bb.getInt(offset);
     if (bb.hasArray()) {
-      return new String(bb.array(), bb.arrayOffset() + offset + SIZEOF_INT, bb.getInt(offset), FlatBufferBuilder.utf8charset);
+      return new String(bb.array(), bb.arrayOffset() + offset + SIZEOF_INT, bb.getInt(offset),
+                        FlatBufferBuilder.utf8charset);
     } else {
       // We can't access .array(), since the ByteBuffer is read-only,
       // off-heap or a memory map
@@ -60,23 +87,36 @@ public class Table {
     }
   }
 
-  // Get the length of a vector whose offset is stored at "offset" in this object.
+  /**
+   * Get the length of a vector.
+   *
+   * @param offset An `int` index into the Table's ByteBuffer.
+   * @return Returns the length of the vector whose offset is stored at `offset`.
+   */
   protected int __vector_len(int offset) {
     offset += bb_pos;
     offset += bb.getInt(offset);
     return bb.getInt(offset);
   }
 
-  // Get the start of data of a vector whose offset is stored at "offset" in this object.
+  /**
+   * Get the start data of a vector.
+   *
+   * @param offset An `int` index into the Table's ByteBuffer.
+   * @return Returns the start of the vector data whose offset is stored at `offset`.
+   */
   protected int __vector(int offset) {
     offset += bb_pos;
     return offset + bb.getInt(offset) + SIZEOF_INT;  // data starts after the length
   }
 
-  // Get a whole vector as a ByteBuffer. This is efficient, since it only allocates a new
-  // bytebuffer object, but does not actually copy the data, it still refers to the same
-  // bytes as the original ByteBuffer.
-  // Also useful with nested FlatBuffers etc.
+  /**
+   * Get a whole vector as a ByteBuffer.
+   *
+   * This is efficient, since it only allocates a new bytebuffer object, but does not actually copy
+   * the data, it still refers to the same bytes as the original ByteBuffer. Also useful with nested
+   * FlatBuffers, etc.
+   */
   protected ByteBuffer __vector_as_bytebuffer(int vector_offset, int elem_size) {
     int o = __offset(vector_offset);
     if (o == 0) return null;
@@ -87,7 +127,13 @@ public class Table {
     return bb;
   }
 
-  // Initialize any Table-derived type to point to the union at the given offset.
+  /**
+   * Initialize any Table-derived type to point to the union at the given `offset`.
+   *
+   * @param t A `Table`-derived type that should point to the union at `offset`.
+   * @param offset An `int` index into the Table's ByteBuffer.
+   * @return Returns the Table that points to the union at `offset`.
+   */
   protected Table __union(Table t, int offset) {
     offset += bb_pos;
     t.bb_pos = offset + bb.getInt(offset);
@@ -95,6 +141,12 @@ public class Table {
     return t;
   }
 
+  /**
+   * Check if a ByteBuffer contains a file identifier.
+   *
+   * @param bb A `ByteBuffer` to check if it contains the identifier `ident`.
+   * @param ident A `String` identifier of the flatbuffer file.
+   */
   protected static boolean __has_identifier(ByteBuffer bb, String ident) {
     if (ident.length() != FILE_IDENTIFIER_LENGTH)
         throw new AssertionError("FlatBuffers: file identifier must be length " +
@@ -105,3 +157,5 @@ public class Table {
     return true;
   }
 }
+
+/// @endcond
diff --git a/js/flatbuffers.js b/js/flatbuffers.js
index efa76d946..f3c483425 100644
--- a/js/flatbuffers.js
+++ b/js/flatbuffers.js
@@ -1,3 +1,7 @@
+/// @file
+/// @addtogroup flatbuffers_javascript_api
+/// @{
+/// @cond FLATBUFFERS_INTERNAL
 var flatbuffers = {};
 
 /**
@@ -105,9 +109,11 @@ flatbuffers.Long.prototype.equals = function(other) {
  */
 flatbuffers.Long.ZERO = new flatbuffers.Long(0, 0);
 
+/// @endcond
 ////////////////////////////////////////////////////////////////////////////////
-
 /**
+ * Create a FlatBufferBuilder.
+ *
  * @constructor
  * @param {number=} initial_size
  */
@@ -228,6 +234,7 @@ flatbuffers.Builder.prototype.asUint8Array = function() {
   return this.bb.bytes().subarray(this.bb.position(), this.bb.position() + this.offset());
 };
 
+/// @cond FLATBUFFERS_INTERNAL
 /**
  * Prepare to write an element of `size` after `additional_bytes` have been
  * written, e.g. if you write a string, you need to align such the int length
@@ -307,9 +314,11 @@ flatbuffers.Builder.prototype.writeFloat32 = function(value) {
 flatbuffers.Builder.prototype.writeFloat64 = function(value) {
   this.bb.writeFloat64(this.space -= 8, value);
 };
+/// @endcond
 
 /**
- * @param {number} value
+ * Add an `int8` to the buffer, properly aligned, and grows the buffer (if necessary).
+ * @param {number} value The `int8` to add the the buffer.
  */
 flatbuffers.Builder.prototype.addInt8 = function(value) {
   this.prep(1, 0);
@@ -317,7 +326,8 @@ flatbuffers.Builder.prototype.addInt8 = function(value) {
 };
 
 /**
- * @param {number} value
+ * Add an `int16` to the buffer, properly aligned, and grows the buffer (if necessary).
+ * @param {number} value The `int16` to add the the buffer.
  */
 flatbuffers.Builder.prototype.addInt16 = function(value) {
   this.prep(2, 0);
@@ -325,7 +335,8 @@ flatbuffers.Builder.prototype.addInt16 = function(value) {
 };
 
 /**
- * @param {number} value
+ * Add an `int32` to the buffer, properly aligned, and grows the buffer (if necessary).
+ * @param {number} value The `int32` to add the the buffer.
  */
 flatbuffers.Builder.prototype.addInt32 = function(value) {
   this.prep(4, 0);
@@ -333,7 +344,8 @@ flatbuffers.Builder.prototype.addInt32 = function(value) {
 };
 
 /**
- * @param {flatbuffers.Long} value
+ * Add an `int64` to the buffer, properly aligned, and grows the buffer (if necessary).
+ * @param {flatbuffers.Long} value The `int64` to add the the buffer.
  */
 flatbuffers.Builder.prototype.addInt64 = function(value) {
   this.prep(8, 0);
@@ -341,7 +353,8 @@ flatbuffers.Builder.prototype.addInt64 = function(value) {
 };
 
 /**
- * @param {number} value
+ * Add a `float32` to the buffer, properly aligned, and grows the buffer (if necessary).
+ * @param {number} value The `float32` to add the the buffer.
  */
 flatbuffers.Builder.prototype.addFloat32 = function(value) {
   this.prep(4, 0);
@@ -349,13 +362,15 @@ flatbuffers.Builder.prototype.addFloat32 = function(value) {
 };
 
 /**
- * @param {number} value
+ * Add a `float64` to the buffer, properly aligned, and grows the buffer (if necessary).
+ * @param {number} value The `float64` to add the the buffer.
  */
 flatbuffers.Builder.prototype.addFloat64 = function(value) {
   this.prep(8, 0);
   this.writeFloat64(value);
 };
 
+/// @cond FLATBUFFERS_INTERNAL
 /**
  * @param {number} voffset
  * @param {number} value
@@ -515,17 +530,19 @@ flatbuffers.Builder.growByteBuffer = function(bb) {
   nbb.bytes().set(bb.bytes(), new_buf_size - old_buf_size);
   return nbb;
 };
+/// @endcond
 
 /**
  * Adds on offset, relative to where it will be written.
  *
- * @param {flatbuffers.Offset} offset The offset to add
+ * @param {flatbuffers.Offset} offset The offset to add.
  */
 flatbuffers.Builder.prototype.addOffset = function(offset) {
   this.prep(flatbuffers.SIZEOF_INT, 0); // Ensure alignment is already done.
   this.writeInt32(this.offset() - offset + flatbuffers.SIZEOF_INT);
 };
 
+/// @cond FLATBUFFERS_INTERNAL
 /**
  * Start encoding a new object in the buffer.  Users will not usually need to
  * call this directly. The FlatBuffers compiler will generate helper methods
@@ -606,8 +623,11 @@ outer_loop:
   this.isNested = false;
   return vtableloc;
 };
+/// @endcond
 
 /**
+ * Finalize a buffer, poiting to the given `root_table`.
+ *
  * @param {flatbuffers.Offset} root_table
  * @param {string=} file_identifier
  */
@@ -628,6 +648,7 @@ flatbuffers.Builder.prototype.finish = function(root_table, file_identifier) {
   this.bb.setPosition(this.space);
 };
 
+/// @cond FLATBUFFERS_INTERNAL
 /**
  * This checks a required field has been set in a given table that has
  * just been constructed.
@@ -673,6 +694,7 @@ flatbuffers.Builder.prototype.endVector = function() {
   this.writeInt32(this.vector_num_elems);
   return this.offset();
 };
+/// @endcond
 
 /**
  * Encode the string `s` in the buffer using UTF-8. If a Uint8Array is passed
@@ -729,10 +751,11 @@ flatbuffers.Builder.prototype.createString = function(s) {
   }
   return this.endVector();
 };
-
 ////////////////////////////////////////////////////////////////////////////////
-
+/// @cond FLATBUFFERS_INTERNAL
 /**
+ * Create a new ByteBuffer with a given array of bytes (`Uint8Array`).
+ *
  * @constructor
  * @param {Uint8Array} bytes
  */
@@ -751,6 +774,8 @@ flatbuffers.ByteBuffer = function(bytes) {
 };
 
 /**
+ * Create and allocate a new ByteBuffer with a given size.
+ *
  * @param {number} byte_size
  * @returns {flatbuffers.ByteBuffer}
  */
@@ -759,6 +784,8 @@ flatbuffers.ByteBuffer.allocate = function(byte_size) {
 };
 
 /**
+ * Get the underlying `Uint8Array`.
+ *
  * @returns {Uint8Array}
  */
 flatbuffers.ByteBuffer.prototype.bytes = function() {
@@ -766,6 +793,8 @@ flatbuffers.ByteBuffer.prototype.bytes = function() {
 };
 
 /**
+ * Get the buffer's position.
+ *
  * @returns {number}
  */
 flatbuffers.ByteBuffer.prototype.position = function() {
@@ -773,6 +802,8 @@ flatbuffers.ByteBuffer.prototype.position = function() {
 };
 
 /**
+ * Set the buffer's position.
+ *
  * @param {number} position
  */
 flatbuffers.ByteBuffer.prototype.setPosition = function(position) {
@@ -780,6 +811,8 @@ flatbuffers.ByteBuffer.prototype.setPosition = function(position) {
 };
 
 /**
+ * Get the buffer's capacity.
+ *
  * @returns {number}
  */
 flatbuffers.ByteBuffer.prototype.capacity = function() {
@@ -1070,3 +1103,6 @@ flatbuffers.ByteBuffer.prototype.__has_identifier = function(ident) {
 
 // Exports for Node.js and RequireJS
 this.flatbuffers = flatbuffers;
+
+/// @endcond
+/// @}
diff --git a/net/FlatBuffers/FlatBufferBuilder.cs b/net/FlatBuffers/FlatBufferBuilder.cs
index 7d2115885..1f9f9d5f3 100644
--- a/net/FlatBuffers/FlatBufferBuilder.cs
+++ b/net/FlatBuffers/FlatBufferBuilder.cs
@@ -18,12 +18,15 @@
 using System;
 using System.Text;
 
+/// @file
+/// @addtogroup flatbuffers_csharp_api
+/// @{
 
 namespace FlatBuffers
 {
     /// <summary>
-    /// Responsible for building up and accessing a flatbuffer formatted byte
-    /// array (via ByteBuffer)
+    /// Responsible for building up and accessing a FlatBuffer formatted byte
+    /// array (via ByteBuffer).
     /// </summary>
     public class FlatBufferBuilder
     {
@@ -44,6 +47,12 @@ namespace FlatBuffers
         // For the current vector being built.
         private int _vectorNumElems = 0;
 
+        /// <summary>
+        /// Create a FlatBufferBuilder with a given initial size.
+        /// </summary>
+        /// <param name="initialSize">
+        /// The initial size to use for the internal buffer.
+        /// </param>
         public FlatBufferBuilder(int initialSize)
         {
             if (initialSize <= 0)
@@ -53,6 +62,9 @@ namespace FlatBuffers
             _bb = new ByteBuffer(new byte[initialSize]);
         }
 
+        /// <summary>
+        /// Reset the FlatBufferBuilder by purging all data that it holds.
+        /// </summary>
         public void Clear()
         {
             _space = _bb.Length;
@@ -65,6 +77,8 @@ namespace FlatBuffers
             _vectorNumElems = 0;
         }
 
+        /// @cond FLATBUFFERS_INTERNAL
+
         public int Offset { get { return _bb.Length - _space; } }
 
         public void Pad(int size)
@@ -171,25 +185,79 @@ namespace FlatBuffers
         {
             _bb.PutDouble(_space -= sizeof(double), x);
         }
+        /// @endcond
 
-        // Adds a scalar to the buffer, properly aligned, and the buffer grown
-        // if needed.
+        /// <summary>
+        /// Add a `bool` to the buffer (aligns the data and grows if necessary).
+        /// </summary>
+        /// <param name="x">The `bool` to add to the buffer.</param>
         public void AddBool(bool x) { Prep(sizeof(byte), 0); PutBool(x); }
+
+        /// <summary>
+        /// Add a `sbyte` to the buffer (aligns the data and grows if necessary).
+        /// </summary>
+        /// <param name="x">The `sbyte` to add to the buffer.</param>
         public void AddSbyte(sbyte x) { Prep(sizeof(sbyte), 0); PutSbyte(x); }
+
+        /// <summary>
+        /// Add a `byte` to the buffer (aligns the data and grows if necessary).
+        /// </summary>
+        /// <param name="x">The `byte` to add to the buffer.</param>
         public void AddByte(byte x) { Prep(sizeof(byte), 0); PutByte(x); }
+
+        /// <summary>
+        /// Add a `short` to the buffer (aligns the data and grows if necessary).
+        /// </summary>
+        /// <param name="x">The `short` to add to the buffer.</param>
         public void AddShort(short x) { Prep(sizeof(short), 0); PutShort(x); }
+
+        /// <summary>
+        /// Add an `ushort` to the buffer (aligns the data and grows if necessary).
+        /// </summary>
+        /// <param name="x">The `ushort` to add to the buffer.</param>
         public void AddUshort(ushort x) { Prep(sizeof(ushort), 0); PutUshort(x); }
+
+        /// <summary>
+        /// Add an `int` to the buffer (aligns the data and grows if necessary).
+        /// </summary>
+        /// <param name="x">The `int` to add to the buffer.</param>
         public void AddInt(int x) { Prep(sizeof(int), 0); PutInt(x); }
+
+        /// <summary>
+        /// Add an `uint` to the buffer (aligns the data and grows if necessary).
+        /// </summary>
+        /// <param name="x">The `uint` to add to the buffer.</param>
         public void AddUint(uint x) { Prep(sizeof(uint), 0); PutUint(x); }
+
+        /// <summary>
+        /// Add a `long` to the buffer (aligns the data and grows if necessary).
+        /// </summary>
+        /// <param name="x">The `long` to add to the buffer.</param>
         public void AddLong(long x) { Prep(sizeof(long), 0); PutLong(x); }
+
+        /// <summary>
+        /// Add an `ulong` to the buffer (aligns the data and grows if necessary).
+        /// </summary>
+        /// <param name="x">The `ulong` to add to the buffer.</param>
         public void AddUlong(ulong x) { Prep(sizeof(ulong), 0); PutUlong(x); }
+
+        /// <summary>
+        /// Add a `float` to the buffer (aligns the data and grows if necessary).
+        /// </summary>
+        /// <param name="x">The `float` to add to the buffer.</param>
         public void AddFloat(float x) { Prep(sizeof(float), 0); PutFloat(x); }
+
+        /// <summary>
+        /// Add a `double` to the buffer (aligns the data and grows if necessary).
+        /// </summary>
+        /// <param name="x">The `double` to add to the buffer.</param>
         public void AddDouble(double x) { Prep(sizeof(double), 0);
                                           PutDouble(x); }
 
-
-
-        // Adds on offset, relative to where it will be written.
+        /// <summary>
+        /// Adds an offset, relative to where it will be written.
+        /// </summary>
+        /// <param name="off">The offset to add to the buffer.</param>
         public void AddOffset(int off)
         {
             Prep(sizeof(int), 0);  // Ensure alignment is already done.
@@ -200,6 +268,7 @@ namespace FlatBuffers
             PutInt(off);
         }
 
+        /// @cond FLATBUFFERS_INTERNAL
         public void StartVector(int elemSize, int count, int alignment)
         {
             NotNested();
@@ -207,13 +276,18 @@ namespace FlatBuffers
             Prep(sizeof(int), elemSize * count);
             Prep(alignment, elemSize * count); // Just in case alignment > int.
         }
+        /// @endcond
 
+        /// <summary>
+        /// Writes data necessary to finish a vector construction.
+        /// </summary>
         public VectorOffset EndVector()
         {
             PutInt(_vectorNumElems);
             return new VectorOffset(Offset);
         }
 
+        /// @cond FLATBUFFERS_INTENRAL
         public void Nested(int obj)
         {
             // Structs are always stored inline, so need to be created right
@@ -271,10 +345,18 @@ namespace FlatBuffers
         public void AddFloat(int o, float x, double d) { if (x != d) { AddFloat(x); Slot(o); } }
         public void AddDouble(int o, double x, double d) { if (x != d) { AddDouble(x); Slot(o); } }
         public void AddOffset(int o, int x, int d) { if (x != d) { AddOffset(x); Slot(o); } }
+        /// @endcond
 
+        /// <summary>
+        /// Encode the string `s` in the buffer using UTF-8.
+        /// </summary>
+        /// <param name="s">The string to encode.</param>
+        /// <returns>
+        /// The offset in the buffer where the encoded string starts.
+        /// </returns>
         public StringOffset CreateString(string s)
         {
-            NotNested();            
+            NotNested();
             AddByte(0);
             var utf8StringLen = Encoding.UTF8.GetByteCount(s);
             StartVector(1, utf8StringLen, 1);
@@ -282,6 +364,7 @@ namespace FlatBuffers
             return new StringOffset(EndVector().Value);
         }
 
+        /// @cond FLATBUFFERS_INTERNAL
         // Structs are stored inline, so nothing additional is being added.
         // `d` is always 0.
         public void AddStruct(int voffset, int x, int d)
@@ -376,7 +459,14 @@ namespace FlatBuffers
             throw new InvalidOperationException("FlatBuffers: field " + field +
                                                 " must be set");
         }
+        /// @endcond
 
+        /// <summary>
+        /// Finalize a buffer, pointing to the given `root_table`.
+        /// </summary>
+        /// <param name="rootTable">
+        /// An offset to be added to the buffer.
+        /// </param>
         public void Finish(int rootTable)
         {
             Prep(_minAlign, sizeof(int));
@@ -384,9 +474,24 @@ namespace FlatBuffers
             _bb.Position = _space;
         }
 
+        /// <summary>
+        /// Get the ByteBuffer representing the FlatBuffer.
+        /// </summary>
+        /// <remarks>
+        /// This is typically only called after you call `Finish()`.
+        /// </remarks>
+        /// <returns>
+        /// Returns the ByteBuffer for this FlatBuffer.
+        /// </returns>
         public ByteBuffer DataBuffer { get { return _bb; } }
 
-        // Utility function for copying a byte array that starts at 0.
+        /// <summary>
+        /// A utility function to copy and return the ByteBuffer data as a
+        /// `byte[]`.
+        /// </summary>
+        /// <returns>
+        /// A full copy of the FlatBuffer data.
+        /// </returns>
         public byte[] SizedByteArray()
         {
             var newArray = new byte[_bb.Data.Length - _bb.Position];
@@ -395,6 +500,16 @@ namespace FlatBuffers
             return newArray;
         }
 
+         /// <summary>
+         /// Finalize a buffer, pointing to the given `rootTable`.
+         /// </summary>
+         /// <param name="rootTable">
+         /// An offset to be added to the buffer.
+         /// </param>
+         /// <param name="fileIdentifier">
+         /// A FlatBuffer file identifier to be added to the buffer before
+         /// `root_table`.
+         /// </param>
          public void Finish(int rootTable, string fileIdentifier)
          {
              Prep(_minAlign, sizeof(int) +
@@ -416,3 +531,5 @@ namespace FlatBuffers
 
     }
 }
+
+/// @}
diff --git a/php/FlatbufferBuilder.php b/php/FlatbufferBuilder.php
index b72a6d653..3738582e2 100644
--- a/php/FlatbufferBuilder.php
+++ b/php/FlatbufferBuilder.php
@@ -15,15 +15,21 @@
  * limitations under the License.
  */
 
+/// @file
+/// @addtogroup flatbuffers_php_api
+/// @{
+
 namespace Google\FlatBuffers;
 
 class FlatbufferBuilder
 {
     /**
+     * Internal ByteBuffer for the FlatBuffer data.
      * @var ByteBuffer $bb
      */
     public $bb;
 
+    /// @cond FLATBUFFERS_INTERNAL
     /**
      * @var int $space
      */
@@ -73,9 +79,10 @@ class FlatbufferBuilder
      * @var bool $force_defaults
      */
     protected $force_defaults = false;
+    /// @endcond
 
     /**
-     * create flatbuffers builder
+     * Create a FlatBufferBuilder with a given initial size.
      *
      * @param $initial_size initial byte buffer size.
      */
@@ -88,6 +95,7 @@ class FlatbufferBuilder
         $this->bb = $this->newByteBuffer($initial_size);
     }
 
+    /// @cond FLATBUFFERS_INTERNAL
     /**
      * create new bytebuffer
      *
@@ -100,7 +108,7 @@ class FlatbufferBuilder
     }
 
     /**
-     * returns current bytebuffer offset
+     * Returns the current ByteBuffer offset.
      *
      * @return int
      */
@@ -270,9 +278,11 @@ class FlatbufferBuilder
     {
         $this->bb->putDouble($this->space -= 8, $x);
     }
+    /// @endcond
 
     /**
-     * @param $x
+     * Add a `bool` to the buffer, properly aligned, and grows the buffer (if necessary).
+     * @param $x The `bool` to add to the buffer.
      */
     public function addBool($x)
     {
@@ -281,7 +291,8 @@ class FlatbufferBuilder
     }
 
     /**
-     * @param $x
+     * Add a `byte` to the buffer, properly aligned, and grows the buffer (if necessary).
+     * @param $x The `byte` to add to the buffer.
      */
     public function addByte($x)
     {
@@ -290,7 +301,8 @@ class FlatbufferBuilder
     }
 
     /**
-     * @param $x
+     * Add a `signed byte` to the buffer, properly aligned, and grows the buffer (if necessary).
+     * @param $x The `signed byte` to add to the buffer.
      */
     public function addSbyte($x)
     {
@@ -299,7 +311,8 @@ class FlatbufferBuilder
     }
 
     /**
-     * @param $x
+     * Add a `short` to the buffer, properly aligned, and grows the buffer (if necessary).
+     * @param $x The `short` to add to the buffer.
      */
     public function addShort($x)
     {
@@ -308,7 +321,8 @@ class FlatbufferBuilder
     }
 
     /**
-     * @param $x
+     * Add an `unsigned short` to the buffer, properly aligned, and grows the buffer (if necessary).
+     * @param $x The `unsigned short` to add to the buffer.
      */
     public function addUshort($x)
     {
@@ -317,7 +331,8 @@ class FlatbufferBuilder
     }
 
     /**
-     * @param $x
+     * Add an `int` to the buffer, properly aligned, and grows the buffer (if necessary).
+     * @param $x The `int` to add to the buffer.
      */
     public function addInt($x)
     {
@@ -326,7 +341,8 @@ class FlatbufferBuilder
     }
 
     /**
-     * @param $x
+     * Add an `unsigned int` to the buffer, properly aligned, and grows the buffer (if necessary).
+     * @param $x The `unsigned int` to add to the buffer.
      */
     public function addUint($x)
     {
@@ -334,9 +350,9 @@ class FlatbufferBuilder
         $this->putUint($x);
     }
 
-
     /**
-     * @param $x
+     * Add a `long` to the buffer, properly aligned, and grows the buffer (if necessary).
+     * @param $x The `long` to add to the buffer.
      */
     public function addLong($x)
     {
@@ -345,7 +361,8 @@ class FlatbufferBuilder
     }
 
     /**
-     * @param $x
+     * Add an `unsigned long` to the buffer, properly aligned, and grows the buffer (if necessary).
+     * @param $x The `unsigned long` to add to the buffer.
      */
     public function addUlong($x)
     {
@@ -354,7 +371,8 @@ class FlatbufferBuilder
     }
 
     /**
-     * @param $x
+     * Add a `float` to the buffer, properly aligned, and grows the buffer (if necessary).
+     * @param $x The `float` to add to the buffer.
      */
     public function addFloat($x)
     {
@@ -363,7 +381,8 @@ class FlatbufferBuilder
     }
 
     /**
-     * @param $x
+     * Add a `double` to the buffer, properly aligned, and grows the buffer (if necessary).
+     * @param $x The `double` to add to the buffer.
      */
     public function addDouble($x)
     {
@@ -371,6 +390,7 @@ class FlatbufferBuilder
         $this->putDouble($x);
     }
 
+    /// @cond FLATBUFFERS_INTERNAL
     /**
      * @param $o
      * @param $x
@@ -528,10 +548,13 @@ class FlatbufferBuilder
             $this->slot($o);
         }
     }
+    /// @endcond
 
     /**
-     * @param $off
-     * @throws \Exception
+     * Adds on offset, relative to where it will be written.
+     * @param $off The offset to add to the buffer.
+     * @throws \Exception Throws an exception if `$off` is greater than the underlying ByteBuffer's
+     * offest.
      */
     public function addOffset($off)
     {
@@ -544,6 +567,7 @@ class FlatbufferBuilder
         $this->putInt($off);
     }
 
+    /// @cond FLATBUFFERS_INTERNAL
     /**
      * @param $elem_size
      * @param $num_elems
@@ -668,12 +692,14 @@ class FlatbufferBuilder
 
         return true;
     }
-
+    /// @endcond
 
     /**
-     * @param $s
-     * @return int
-     * @throws \Exception
+     * Encode the string `$s` in the buffer using UTF-8.
+     * @param string $s The string to encode.
+     * @return int The offset in the buffer where the encoded string starts.
+     * @throws InvalidArgumentException Thrown if the input string `$s` is not
+     *     UTF-8.
      */
     public function createString($s)
     {
@@ -691,6 +717,7 @@ class FlatbufferBuilder
         return $this->endVector();
     }
 
+    /// @cond FLATBUFFERS_INTERNAL
     /**
      * @throws \Exception
      */
@@ -850,10 +877,16 @@ class FlatbufferBuilder
             throw new \Exception("FlatBuffers: field "  . $field  .  " must be set");
         }
     }
+    /// @endcond
 
     /**
-     * @param $root_table
-     * @throws \Exception
+     * Finalize a buffer, pointing to the given `$root_table`.
+     * @param $root_table An offest to be added to the buffer.
+     * @param $file_identifier A FlatBuffer file identifier to be added to the
+     *     buffer before `$root_table`. This defaults to `null`.
+     * @throws InvalidArgumentException Thrown if an invalid `$identifier` is
+     *     given, where its length is not equal to
+     *    `Constants::FILE_IDENTIFIER_LENGTH`.
      */
     public function finish($root_table, $identifier = null)
     {
@@ -878,7 +911,10 @@ class FlatbufferBuilder
     }
 
     /**
-     * @param bool $forceDefaults
+     * In order to save space, fields that are set to their default value don't
+     * get serialized into the buffer.
+     * @param bool $forceDefaults When set to `true`, always serializes default
+     *     values.
      */
     public function forceDefaults($forceDefaults)
     {
@@ -886,13 +922,15 @@ class FlatbufferBuilder
     }
 
     /**
-     * @return ByteBuffer
+     * Get the ByteBuffer representing the FlatBuffer.
+     * @return ByteBuffer The ByteBuffer containing the FlatBuffer data.
      */
     public function dataBuffer()
     {
         return $this->bb;
     }
 
+    /// @cond FLATBUFFERS_INTERNAL
     /**
      * @return int
      */
@@ -900,9 +938,13 @@ class FlatbufferBuilder
     {
         return $this->space;
     }
+    /// @endcond
 
     /**
-     * @return string
+     * Utility function to copy and return the FlatBuffer data from the
+     * underlying ByteBuffer.
+     * @return string A string (representing a byte[]) that contains a copy
+     * of the FlatBuffer data.
      */
     public function sizedByteArray()
     {
@@ -916,3 +958,5 @@ class FlatbufferBuilder
         return $result;
     }
 }
+
+/// @}
diff --git a/python/flatbuffers/builder.py b/python/flatbuffers/builder.py
index 6e3465913..7d4222e18 100644
--- a/python/flatbuffers/builder.py
+++ b/python/flatbuffers/builder.py
@@ -23,6 +23,11 @@ from .compat import range_func
 from .compat import memoryview_type
 
 
+## @file
+## @addtogroup flatbuffers_python_api
+## @{
+
+## @cond FLATBUFFERS_INTERNAL
 class OffsetArithmeticError(RuntimeError):
     """
     Error caused by an Offset arithmetic error. Probably caused by bad
@@ -72,12 +77,13 @@ class BuilderNotFinishedError(RuntimeError):
 
 # VtableMetadataFields is the count of metadata fields in each vtable.
 VtableMetadataFields = 2
-
+## @endcond
 
 class Builder(object):
-    """
-    A Builder is used to construct one or more FlatBuffers. Typically, Builder
-    objects will be used from code generated by the `flatc` compiler.
+    """ A Builder is used to construct one or more FlatBuffers.
+
+    Typically, Builder objects will be used from code generated by the `flatc`
+    compiler.
 
     A Builder constructs byte buffers in a last-first manner for simplicity and
     performance during reading.
@@ -85,24 +91,30 @@ class Builder(object):
     Internally, a Builder is a state machine for creating FlatBuffer objects.
 
     It holds the following internal state:
-        Bytes: an array of bytes.
-        current_vtable: a list of integers.
-        vtables: a list of vtable entries (i.e. a list of list of integers).
+        - Bytes: an array of bytes.
+        - current_vtable: a list of integers.
+        - vtables: a list of vtable entries (i.e. a list of list of integers).
+
+    Attributes:
+      Bytes: The internal `bytearray` for the Builder.
+      finished: A boolean determining if the Builder has been finalized.
     """
 
+    ## @cond FLATBUFFERS_INTENRAL
     __slots__ = ("Bytes", "current_vtable", "head", "minalign", "objectEnd",
                  "vtables", "nested", "finished")
 
-    """
-    Maximum buffer size constant, in bytes.
+    """Maximum buffer size constant, in bytes.
+
     Builder will never allow it's buffer grow over this size.
     Currently equals 2Gb.
     """
     MAX_BUFFER_SIZE = 2**31
+    ## @endcond
 
     def __init__(self, initialSize):
-        """
-        Initializes a Builder of size `initial_size`.
+        """Initializes a Builder of size `initial_size`.
+
         The internal buffer is grown as needed.
         """
 
@@ -111,19 +123,27 @@ class Builder(object):
             raise BuilderSizeError(msg)
 
         self.Bytes = bytearray(initialSize)
+        ## @cond FLATBUFFERS_INTERNAL
         self.current_vtable = None
         self.head = UOffsetTFlags.py_type(initialSize)
         self.minalign = 1
         self.objectEnd = None
         self.vtables = []
         self.nested = False
+        ## @endcond
         self.finished = False
 
+
     def Output(self):
-        """
-        Output returns the portion of the buffer that has been used for
-        writing data. It raises BuilderNotFinishedError if the buffer has not
-        been finished with `Finish`.
+        """Return the portion of the buffer that has been used for writing data.
+
+        This is the typical way to access the FlatBuffer data inside the
+        builder. If you try to access `Builder.Bytes` directly, you would need
+        to manually index it with `Head()`, since the buffer is constructed
+        backwards.
+
+        It raises BuilderNotFinishedError if the buffer has not been finished
+        with `Finish`.
         """
 
         if not self.finished:
@@ -131,6 +151,7 @@ class Builder(object):
 
         return self.Bytes[self.Head():]
 
+    ## @cond FLATBUFFERS_INTERNAL
     def StartObject(self, numfields):
         """StartObject initializes bookkeeping for writing a new object."""
 
@@ -266,14 +287,19 @@ class Builder(object):
         bytes2 = bytearray(newSize)
         bytes2[newSize-len(self.Bytes):] = self.Bytes
         self.Bytes = bytes2
+    ## @endcond
 
     def Head(self):
-        """
-        Head gives the start of useful data in the underlying byte buffer.
-        Note: unlike other functions, this value is interpreted as from the left.
-        """
-        return self.head
+        """Get the start of useful data in the underlying byte buffer.
 
+        Note: unlike other functions, this value is interpreted as from the
+        left.
+        """
+        ## @cond FLATBUFFERS_INTERNAL
+        return self.head
+        ## @endcond
+
+    ## @cond FLATBUFFERS_INTERNAL
     def Offset(self):
         """Offset relative to the end of the buffer."""
         return UOffsetTFlags.py_type(len(self.Bytes) - self.Head())
@@ -322,10 +348,10 @@ class Builder(object):
             raise OffsetArithmeticError(msg)
         off2 = self.Offset() - off + N.SOffsetTFlags.bytewidth
         self.PlaceSOffsetT(off2)
+    ## @endcond
 
     def PrependUOffsetTRelative(self, off):
-        """
-        PrependUOffsetTRelative prepends an UOffsetT, relative to where it
+        """Prepends an unsigned offset into vector data, relative to where it
         will be written.
         """
 
@@ -337,13 +363,14 @@ class Builder(object):
         off2 = self.Offset() - off + N.UOffsetTFlags.bytewidth
         self.PlaceUOffsetT(off2)
 
+    ## @cond FLATBUFFERS_INTERNAL
     def StartVector(self, elemSize, numElems, alignment):
         """
         StartVector initializes bookkeeping for writing a new vector.
 
         A vector has the following format:
-          <UOffsetT: number of elements in this vector>
-          <T: data>+, where T is the type of elements of this vector.
+          - <UOffsetT: number of elements in this vector>
+          - <T: data>+, where T is the type of elements of this vector.
         """
 
         self.assertNotNested()
@@ -351,12 +378,15 @@ class Builder(object):
         self.Prep(N.Uint32Flags.bytewidth, elemSize*numElems)
         self.Prep(alignment, elemSize*numElems)  # In case alignment > int.
         return self.Offset()
+    ## @endcond
 
     def EndVector(self, vectorNumElems):
         """EndVector writes data necessary to finish vector construction."""
 
         self.assertNested()
+        ## @cond FLATBUFFERS_INTERNAL
         self.nested = False
+        ## @endcond
         # we already made space for this, so write without PrependUint32
         self.PlaceUOffsetT(vectorNumElems)
         return self.Offset()
@@ -365,7 +395,9 @@ class Builder(object):
         """CreateString writes a null-terminated byte string as a vector."""
 
         self.assertNotNested()
+        ## @cond FLATBUFFERS_INTERNAL
         self.nested = True
+        ## @endcond
 
         if isinstance(s, compat.string_types):
             x = s.encode()
@@ -378,12 +410,14 @@ class Builder(object):
         self.Place(0, N.Uint8Flags)
 
         l = UOffsetTFlags.py_type(len(s))
-
+        ## @cond FLATBUFFERS_INTERNAL
         self.head = UOffsetTFlags.py_type(self.Head() - l)
+        ## @endcond
         self.Bytes[self.Head():self.Head()+l] = x
 
         return self.EndVector(len(x))
 
+    ## @cond FLATBUFFERS_INTERNAL
     def assertNested(self):
         """
         Check that we are in the process of building an object.
@@ -422,6 +456,7 @@ class Builder(object):
         """
         self.assertNested()
         self.current_vtable[slotnum] = self.Offset()
+    ## @endcond
 
     def Finish(self, rootTable):
         """Finish finalizes a buffer, pointing to the given `rootTable`."""
@@ -431,6 +466,7 @@ class Builder(object):
         self.finished = True
         return self.Head()
 
+    ## @cond FLATBUFFERS_INTERNAL
     def Prepend(self, flags, off):
         self.Prep(flags.bytewidth, 0)
         self.Place(off, flags)
@@ -491,30 +527,95 @@ class Builder(object):
             self.assertStructIsInline(x)
             self.Slot(v)
 
-    def PrependBool(self, x): self.Prepend(N.BoolFlags, x)
+    ## @endcond
 
-    def PrependByte(self, x): self.Prepend(N.Uint8Flags, x)
+    def PrependBool(self, x):
+        """Prepend a `bool` to the Builder buffer.
 
-    def PrependUint8(self, x): self.Prepend(N.Uint8Flags, x)
+        Note: aligns and checks for space.
+        """
+        self.Prepend(N.BoolFlags, x)
 
-    def PrependUint16(self, x): self.Prepend(N.Uint16Flags, x)
+    def PrependByte(self, x):
+        """Prepend a `byte` to the Builder buffer.
 
-    def PrependUint32(self, x): self.Prepend(N.Uint32Flags, x)
+        Note: aligns and checks for space.
+        """
+        self.Prepend(N.Uint8Flags, x)
 
-    def PrependUint64(self, x): self.Prepend(N.Uint64Flags, x)
+    def PrependUint8(self, x):
+        """Prepend an `uint8` to the Builder buffer.
 
-    def PrependInt8(self, x): self.Prepend(N.Int8Flags, x)
+        Note: aligns and checks for space.
+        """
+        self.Prepend(N.Uint8Flags, x)
 
-    def PrependInt16(self, x): self.Prepend(N.Int16Flags, x)
+    def PrependUint16(self, x):
+        """Prepend an `uint16` to the Builder buffer.
 
-    def PrependInt32(self, x): self.Prepend(N.Int32Flags, x)
+        Note: aligns and checks for space.
+        """
+        self.Prepend(N.Uint16Flags, x)
 
-    def PrependInt64(self, x): self.Prepend(N.Int64Flags, x)
+    def PrependUint32(self, x):
+        """Prepend an `uint32` to the Builder buffer.
 
-    def PrependFloat32(self, x): self.Prepend(N.Float32Flags, x)
+        Note: aligns and checks for space.
+        """
+        self.Prepend(N.Uint32Flags, x)
 
-    def PrependFloat64(self, x): self.Prepend(N.Float64Flags, x)
+    def PrependUint64(self, x):
+        """Prepend an `uint64` to the Builder buffer.
 
+        Note: aligns and checks for space.
+        """
+        self.Prepend(N.Uint64Flags, x)
+
+    def PrependInt8(self, x):
+        """Prepend an `int8` to the Builder buffer.
+
+        Note: aligns and checks for space.
+        """
+        self.Prepend(N.Int8Flags, x)
+
+    def PrependInt16(self, x):
+        """Prepend an `int16` to the Builder buffer.
+
+        Note: aligns and checks for space.
+        """
+        self.Prepend(N.Int16Flags, x)
+
+    def PrependInt32(self, x):
+        """Prepend an `int32` to the Builder buffer.
+
+        Note: aligns and checks for space.
+        """
+        self.Prepend(N.Int32Flags, x)
+
+    def PrependInt64(self, x):
+        """Prepend an `int64` to the Builder buffer.
+
+        Note: aligns and checks for space.
+        """
+        self.Prepend(N.Int64Flags, x)
+
+    def PrependFloat32(self, x):
+        """Prepend a `float32` to the Builder buffer.
+
+        Note: aligns and checks for space.
+        """
+        self.Prepend(N.Float32Flags, x)
+
+    def PrependFloat64(self, x):
+        """Prepend a `float64` to the Builder buffer.
+
+        Note: aligns and checks for space.
+        """
+        self.Prepend(N.Float64Flags, x)
+
+##############################################################
+
+    ## @cond FLATBUFFERS_INTERNAL
     def PrependVOffsetT(self, x): self.Prepend(N.VOffsetTFlags, x)
 
     def Place(self, x, flags):
@@ -528,33 +629,31 @@ class Builder(object):
         encode.Write(flags.packer_type, self.Bytes, self.Head(), x)
 
     def PlaceVOffsetT(self, x):
-        """
-        PlaceVOffsetT prepends a VOffsetT to the Builder, without checking for
-        space.
+        """PlaceVOffsetT prepends a VOffsetT to the Builder, without checking
+        for space.
         """
         N.enforce_number(x, N.VOffsetTFlags)
         self.head = self.head - N.VOffsetTFlags.bytewidth
         encode.Write(packer.voffset, self.Bytes, self.Head(), x)
 
     def PlaceSOffsetT(self, x):
-        """
-        PlaceSOffsetT prepends a SOffsetT to the Builder, without checking for
-        space.
+        """PlaceSOffsetT prepends a SOffsetT to the Builder, without checking
+        for space.
         """
         N.enforce_number(x, N.SOffsetTFlags)
         self.head = self.head - N.SOffsetTFlags.bytewidth
         encode.Write(packer.soffset, self.Bytes, self.Head(), x)
 
     def PlaceUOffsetT(self, x):
-        """
-        PlaceUOffsetT prepends a UOffsetT to the Builder, without checking for
-        space.
+        """PlaceUOffsetT prepends a UOffsetT to the Builder, without checking
+        for space.
         """
         N.enforce_number(x, N.UOffsetTFlags)
         self.head = self.head - N.UOffsetTFlags.bytewidth
         encode.Write(packer.uoffset, self.Bytes, self.Head(), x)
+    ## @endcond
 
-
+## @cond FLATBUFFERS_INTERNAL
 def vtableEqual(a, objectStart, b):
     """vtableEqual compares an unwritten vtable to a written vtable."""
 
@@ -574,3 +673,5 @@ def vtableEqual(a, objectStart, b):
             if x != y:
                 return False
     return True
+## @endcond
+## @}
diff --git a/readme.md b/readme.md
index 9a4bd5598..eb3b565cd 100755
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-FlatBuffers Version 1.1.0
+FlatBuffers Version 1.2.0
 
 # Welcome to FlatBuffers!
 
@@ -20,6 +20,8 @@ Discuss FlatBuffers with other developers and users on the
 [FlatBuffers Google Group][]. File issues on the [FlatBuffers Issues Tracker][]
 or post your questions to [stackoverflow.com][] using the [`flatbuffers` tag][].
 
+To contribute to this project, see [CONTRIBUTING][].
+
 For applications on Google Play that integrate this tool, usage is tracked.
 This tracking is done automatically using the embedded version string
 (flatbuffer_version_string), and helps us continue to optimize it. Aside from
@@ -29,8 +31,11 @@ is useful and if we should continue to invest in it. Since this is open
 source, you are free to remove the version string but we would appreciate if
 you would leave it in.
 
-  [FlatBuffers Google Group]: http://group.google.com/group/flatbuffers
-  [FlatBuffers Issues Tracker]: http://github.com/google/flatbuffers/issues
-  [stackoverflow.com]: http://www.stackoverflow.com
-  [landing page]: http://google.github.io/flatbuffers
-  [`flatbuffers` tag]: https://stackoverflow.com/questions/tagged/flatbuffers
+<br>
+
+   [CONTRIBUTING]: http://github.com/google/flatbuffers/blob/master/CONTRIBUTING
+   [`flatbuffers` tag]: https://stackoverflow.com/questions/tagged/flatbuffers
+   [FlatBuffers Google Group]: http://group.google.com/group/flatbuffers
+   [FlatBuffers Issues Tracker]: http://github.com/google/flatbuffers/issues
+   [stackoverflow.com]: http://www.stackoverflow.com
+   [landing page]: http://google.github.io/flatbuffers
diff --git a/samples/SampleBinary.cs b/samples/SampleBinary.cs
new file mode 100644
index 000000000..16128c4f6
--- /dev/null
+++ b/samples/SampleBinary.cs
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2015 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// To run, use the `csharp_sample.sh` script.
+
+using System;
+using FlatBuffers;
+using MyGame.Sample;
+
+class SampleBinary
+{
+  // Example how to use FlatBuffers to create and read binary buffers.
+  static void Main()
+  {
+    var builder = new FlatBufferBuilder(1);
+
+    // Create some weapons for our Monster ('Sword' and 'Axe').
+    var weapon1Name = builder.CreateString("Sword");
+    var weapon1Damage = 3;
+    var weapon2Name = builder.CreateString("Axe");
+    var weapon2Damage = 5;
+
+    // Use the `CreateWeapon()` helper function to create the weapons, since we set every field.
+    var weaps = new Offset<Weapon>[2];
+    weaps[0] = Weapon.CreateWeapon(builder, weapon1Name, (short)weapon1Damage);
+    weaps[1] = Weapon.CreateWeapon(builder, weapon2Name, (short)weapon2Damage);
+
+    // Serialize the FlatBuffer data.
+    var name = builder.CreateString("Orc");
+    var treasure =  new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+    var inv = Monster.CreateInventoryVector(builder, treasure);
+    var weapons = Monster.CreateWeaponsVector(builder, weaps);
+    var pos = Vec3.CreateVec3(builder, 1.0f, 2.0f, 3.0f);
+
+    Monster.StartMonster(builder);
+    Monster.AddPos(builder, pos);
+    Monster.AddHp(builder, (short)300);
+    Monster.AddName(builder, name);
+    Monster.AddInventory(builder, inv);
+    Monster.AddColor(builder, Color.Red);
+    Monster.AddWeapons(builder, weapons);
+    Monster.AddEquippedType(builder, Equipment.Weapon);
+    Monster.AddEquipped(builder, weaps[1].Value);
+    var orc = Monster.EndMonster(builder);
+
+    builder.Finish(orc.Value); // You could also call `Monster.FinishMonsterBuffer(builder, orc);`.
+
+    // We now have a FlatBuffer that we could store on disk or send over a network.
+
+    // ...Code to store to disk or send over a network goes here...
+
+    // Instead, we are going to access it right away, as if we just received it.
+
+    var buf = builder.DataBuffer;
+
+    // Get access to the root:
+    var monster = Monster.GetRootAsMonster(buf);
+
+    // For C#, unlike other languages, most values (except for vectors and unions) are available as
+    // properties instead of accessor methods.
+
+    // Note: We did not set the `Mana` field explicitly, so we get back the default value.
+    Assert(monster.Mana == 150, "monster.Mana", Convert.ToString(monster.Mana),
+           Convert.ToString(150));
+    Assert(monster.Hp == 300, "monster.Hp", Convert.ToString(monster.Hp), Convert.ToString(30));
+    Assert(monster.Name.Equals("Orc", StringComparison.Ordinal), "monster.Name", monster.Name,
+           "Orc");
+    Assert(monster.Color == Color.Red, "monster.Color", Convert.ToString(monster.Color),
+           Convert.ToString(Color.Red));
+
+    // C# also allows you to use performance-enhanced methods to fill an object that has already
+    // been created. These functions are prefixed with "Get". For example: `monster.GetPos()`.
+    var myAlreadyCreatedVector = new Vec3();
+    monster.GetPos(myAlreadyCreatedVector); // Instead of `var myNewVec3 = monster.Pos`.
+    Assert(myAlreadyCreatedVector.X == 1.0f, "myAlreadyCreatedVector.X",
+           Convert.ToString(myAlreadyCreatedVector.X), Convert.ToString(1.0f));
+    Assert(myAlreadyCreatedVector.Y == 2.0f, "myAlreadyCreatedVector.Y",
+           Convert.ToString(myAlreadyCreatedVector.Y), Convert.ToString(2.0f));
+    Assert(myAlreadyCreatedVector.Z == 3.0f, "myAlreadyCreatedVector.Z",
+           Convert.ToString(myAlreadyCreatedVector.Z), Convert.ToString(3.0f));
+
+    // Get and test the `Inventory` FlatBuffer `vector`.
+    for (int i = 0; i < monster.InventoryLength; i++)
+    {
+      Assert(monster.GetInventory(i) == i, "monster.GetInventory",
+             Convert.ToString(monster.GetInventory(i)), Convert.ToString(i));
+    }
+
+    // Get and test the `Weapons` FlatBuffer `vector` of `table`s.
+    var expectedWeaponNames = new string[] {"Sword", "Axe"};
+    var expectedWeaponDamages = new short[] {3, 5};
+    for (int i = 0; i < monster.WeaponsLength; i++)
+    {
+      Assert(monster.GetWeapons(i).Name.Equals(expectedWeaponNames[i], StringComparison.Ordinal),
+             "monster.GetWeapons", monster.GetWeapons(i).Name, expectedWeaponNames[i]);
+      Assert(monster.GetWeapons(i).Damage == expectedWeaponDamages[i], "monster.GetWeapons",
+             Convert.ToString(monster.GetWeapons(i).Damage),
+             Convert.ToString(expectedWeaponDamages[i]));
+    }
+
+    // Get and test the `Equipped` FlatBuffer `union`.
+    Assert(monster.EquippedType == Equipment.Weapon, "monster.EquippedType",
+           Convert.ToString(monster.EquippedType), Convert.ToString(Equipment.Weapon));
+    var equipped = (Weapon)monster.GetEquipped(new Weapon());
+    Assert(equipped.Name.Equals("Axe", StringComparison.Ordinal), "equipped.Name", equipped.Name,
+           "Axe");
+    Assert(equipped.Damage == 5, "equipped.Damage", Convert.ToString(equipped.Damage),
+           Convert.ToString(5));
+
+    Console.WriteLine("The FlatBuffer was successfully created and verified!");
+  }
+
+  // A helper function to handle assertions.
+  static void Assert(bool assertPassed, string codeExecuted, string actualValue,
+                     string expectedValue)
+  {
+    if (assertPassed == false)
+    {
+      Console.WriteLine("Assert failed! " + codeExecuted + " (" + actualValue +
+          ") was not equal to " + expectedValue + ".");
+      System.Environment.Exit(1);
+    }
+  }
+}
diff --git a/samples/SampleBinary.java b/samples/SampleBinary.java
new file mode 100644
index 000000000..555194f31
--- /dev/null
+++ b/samples/SampleBinary.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Run this file with the `java_sample.sh` script.
+
+import MyGame.Sample.Color;
+import MyGame.Sample.Equipment;
+import MyGame.Sample.Monster;
+import MyGame.Sample.Vec3;
+import MyGame.Sample.Weapon;
+
+import com.google.flatbuffers.FlatBufferBuilder;
+
+import java.nio.ByteBuffer;
+
+class SampleBinary {
+  // Example how to use FlatBuffers to create and read binary buffers.
+  public static void main(String[] args) {
+    FlatBufferBuilder builder = new FlatBufferBuilder(0);
+
+    // Create some weapons for our Monster ('Sword' and 'Axe').
+    int weaponOneName = builder.createString("Sword");
+    short weaponOneDamage = 3;
+    int weaponTwoName = builder.createString("Axe");
+    short weaponTwoDamage = 5;
+
+    // Use the `createWeapon()` helper function to create the weapons, since we set every field.
+    int[] weaps = new int[2];
+    weaps[0] = Weapon.createWeapon(builder, weaponOneName, weaponOneDamage);
+    weaps[1] = Weapon.createWeapon(builder, weaponTwoName, weaponTwoDamage);
+
+    // Serialize the FlatBuffer data.
+    int name = builder.createString("Orc");
+    byte[] treasure = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+    int inv = Monster.createInventoryVector(builder, treasure);
+    int weapons = Monster.createWeaponsVector(builder, weaps);
+    int pos = Vec3.createVec3(builder, 1.0f, 2.0f, 3.0f);
+
+    Monster.startMonster(builder);
+    Monster.addPos(builder, pos);
+    Monster.addName(builder, name);
+    Monster.addColor(builder, Color.Red);
+    Monster.addHp(builder, (short)300);
+    Monster.addInventory(builder, inv);
+    Monster.addWeapons(builder, weapons);
+    Monster.addEquippedType(builder, Equipment.Weapon);
+    Monster.addEquipped(builder, weaps[1]);
+    int orc = Monster.endMonster(builder);
+
+    builder.finish(orc); // You could also call `Monster.finishMonsterBuffer(builder, orc);`.
+
+    // We now have a FlatBuffer that can be stored on disk or sent over a network.
+
+    // ...Code to store to disk or send over a network goes here...
+
+    // Instead, we are going to access it right away, as if we just received it.
+
+    ByteBuffer buf = builder.dataBuffer();
+
+    // Get access to the root:
+    Monster monster = Monster.getRootAsMonster(buf);
+
+    // Note: We did not set the `mana` field explicitly, so we get back the default value.
+    assert monster.mana() == (short)150;
+    assert monster.hp() == (short)300;
+    assert monster.name().equals("Orc");
+    assert monster.color() == Color.Red;
+    assert monster.pos().x() == 1.0f;
+    assert monster.pos().y() == 2.0f;
+    assert monster.pos().z() == 3.0f;
+
+    // Get and test the `inventory` FlatBuffer `vector`.
+    for (int i = 0; i < monster.inventoryLength(); i++) {
+      assert monster.inventory(i) == (byte)i;
+    }
+
+    // Get and test the `weapons` FlatBuffer `vector` of `table`s.
+    String[] expectedWeaponNames = {"Sword", "Axe"};
+    int[] expectedWeaponDamages = {3, 5};
+    for (int i = 0; i < monster.weaponsLength(); i++) {
+      assert monster.weapons(i).name().equals(expectedWeaponNames[i]);
+      assert monster.weapons(i).damage() == expectedWeaponDamages[i];
+    }
+
+    // Get and test the `equipped` FlatBuffer `union`.
+    assert monster.equippedType() == Equipment.Weapon;
+    Weapon equipped = (Weapon)monster.equipped(new Weapon());
+    assert equipped.name().equals("Axe");
+    assert equipped.damage() == 5;
+
+    System.out.println("The FlatBuffer was successfully created and verified!");
+  }
+}
diff --git a/samples/SampleBinary.php b/samples/SampleBinary.php
new file mode 100644
index 000000000..d28ffa333
--- /dev/null
+++ b/samples/SampleBinary.php
@@ -0,0 +1,115 @@
+<?php
+/*
+ * Copyright 2015 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// To run, use the `php_sample.sh` script.
+
+// It is recommended that you use PSR autoload when using FlatBuffers.
+function __autoload($class_name) {
+  $class = substr($class_name, strrpos($class_name, "\\") + 1);
+  $root_dir = join(DIRECTORY_SEPARATOR, array(dirname(dirname(__FILE__)))); // `flatbuffers` root.
+  $paths = array(join(DIRECTORY_SEPARATOR, array($root_dir, "php")),
+                 join(DIRECTORY_SEPARATOR, array($root_dir, "samples", "MyGame", "Sample")));
+  foreach ($paths as $path) {
+    $file = join(DIRECTORY_SEPARATOR, array($path, $class . ".php"));
+    if (file_exists($file)) {
+      require($file);
+      break;
+    }
+  }
+}
+
+// Example how to use FlatBuffers to create and read binary buffers.
+function main() {
+  $builder = new Google\FlatBuffers\FlatbufferBuilder(0);
+
+  // Create some weapons for our Monster using the `createWeapon()` helper function.
+  $weapon_one = $builder->createString("Sword");
+  $sword = \MyGame\Sample\Weapon::CreateWeapon($builder, $weapon_one, 3);
+  $weapon_two = $builder->createString("Axe");
+  $axe = \MyGame\Sample\Weapon::CreateWeapon($builder, $weapon_two, 5);
+
+  // Serialize the FlatBuffer data.
+  $name = $builder->createString("Orc");
+
+  $treasure = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
+  $inv = \MyGame\Sample\Monster::CreateInventoryVector($builder, $treasure);
+
+  $weaps = array($sword, $axe);
+  $weapons = \MyGame\Sample\Monster::CreateWeaponsVector($builder, $weaps);
+
+  $pos = \MyGame\Sample\Vec3::CreateVec3($builder, 1.0, 2.0, 3.0);
+
+  \MyGame\Sample\Monster::StartMonster($builder);
+  \MyGame\Sample\Monster::AddPos($builder, $pos);
+  \MyGame\Sample\Monster::AddHp($builder, 300);
+  \MyGame\Sample\Monster::AddName($builder, $name);
+  \MyGame\Sample\Monster::AddInventory($builder, $inv);
+  \MyGame\Sample\Monster::AddColor($builder, \MyGame\Sample\Color::Red);
+  \MyGame\Sample\Monster::AddWeapons($builder, $weapons);
+  \MyGame\Sample\Monster::AddEquippedType($builder, \MyGame\Sample\Equipment::Weapon);
+  \MyGame\Sample\Monster::AddEquipped($builder, $weaps[1]);
+  $orc = \MyGame\Sample\Monster::EndMonster($builder);
+
+  $builder->finish($orc); // You may also call `\MyGame\Sample\Monster::FinishMonsterBuffer($builder, $orc);`.
+
+  // We now have a FlatBuffer that can be stored on disk or sent over a network.
+
+  // ...Code to store to disk or send over a network goes here...
+
+  // Instead, we are going to access it right away, as if we just received it.
+
+  $buf = $builder->dataBuffer();
+
+  // Get access to the root:
+  $monster = \MyGame\Sample\Monster::GetRootAsMonster($buf);
+
+  $success = true; // Tracks if an assert occurred.
+
+  // Note: We did not set the `mana` field explicitly, so we get back the default value.
+  $success &= assert($monster->getMana() == 150);
+  $success &= assert($monster->getHp() == 300);
+  $success &= assert($monster->getName() == "Orc");
+  $success &= assert($monster->getColor() == \MyGame\Sample\Color::Red);
+  $success &= assert($monster->getPos()->getX() == 1.0);
+  $success &= assert($monster->getPos()->getY() == 2.0);
+  $success &= assert($monster->getPos()->getZ() == 3.0);
+
+  // Get and test the `inventory` FlatBuffer `vector`.
+  for ($i = 0; $i < $monster->getInventoryLength(); $i++) {
+    $success &= assert($monster->getInventory($i) == $i);
+  }
+
+  // Get and test the `weapons` FlatBuffer `vector` of `table`s.
+  $expected_weapon_names = array("Sword", "Axe");
+  $expected_weapon_damages = array(3, 5);
+  for ($i = 0; $i < $monster->getWeaponsLength(); $i++) {
+    $success &= assert($monster->getWeapons($i)->getName() == $expected_weapon_names[$i]);
+    $success &= assert($monster->getWeapons($i)->getDamage() == $expected_weapon_damages[$i]);
+  }
+
+  // Get and test the `equipped` FlatBuffer `union`.
+  $success &= assert($monster->getEquippedType() == \MyGame\Sample\Equipment::Weapon);
+  $success &= assert($monster->getEquipped(new \MyGame\Sample\Weapon())->getName() == "Axe");
+  $success &= assert($monster->getEquipped(new \MyGame\Sample\Weapon())->getDamage() == 5);
+
+  if ($success) {
+    print("The FlatBuffer was successfully created and verified!\n");
+  }
+}
+
+main();
+?>
diff --git a/samples/android/AndroidManifest.xml b/samples/android/AndroidManifest.xml
new file mode 100755
index 000000000..0fa3dcfc0
--- /dev/null
+++ b/samples/android/AndroidManifest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2015 Google, Inc.
+
+     This software is provided 'as-is', without any express or implied
+     warranty.  In no event will the authors be held liable for any damages
+     arising from the use of this software.
+     Permission is granted to anyone to use this software for any purpose,
+     including commercial applications, and to alter it and redistribute it
+     freely, subject to the following restrictions:
+     1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+     2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+     3. This notice may not be removed or altered from any source distribution.
+ -->
+<!-- BEGIN_INCLUDE(manifest) -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.samples.FlatBufferSample"
+        android:versionCode="1"
+        android:versionName="1.0">
+
+    <uses-feature android:glEsVersion="0x00020000"></uses-feature>
+    <!-- This is the platform API where NativeActivity was introduced. -->
+    <uses-sdk android:minSdkVersion="9" />
+
+    <!-- This .apk has no Java code itself, so set hasCode to false. -->
+    <application android:label="@string/app_name" android:hasCode="false">
+
+        <!-- Our activity is the built-in NativeActivity framework class.
+             This will take care of integrating with our NDK code. -->
+        <activity android:name="android.app.NativeActivity"
+                android:label="@string/app_name"
+                android:configChanges="orientation|keyboardHidden"
+                android:screenOrientation="landscape">
+            <!-- Tell NativeActivity the name of or .so -->
+            <meta-data android:name="android.app.lib_name"
+                    android:value="FlatBufferSample" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
+<!-- END_INCLUDE(manifest) -->
diff --git a/samples/android/build_apk.sh b/samples/android/build_apk.sh
new file mode 100755
index 000000000..4967ee6dd
--- /dev/null
+++ b/samples/android/build_apk.sh
@@ -0,0 +1,510 @@
+#!/bin/bash -eu
+# Copyright (c) 2013 Google, Inc.
+#
+# This software is provided 'as-is', without any express or implied
+# warranty.  In no event will the authors be held liable for any damages
+# arising from the use of this software.
+# Permission is granted to anyone to use this software for any purpose,
+# including commercial applications, and to alter it and redistribute it
+# freely, subject to the following restrictions:
+# 1. The origin of this software must not be misrepresented; you must not
+# claim that you wrote the original software. If you use this software
+# in a product, an acknowledgment in the product documentation would be
+# appreciated but is not required.
+# 2. Altered source versions must be plainly marked as such, and must not be
+# misrepresented as being the original software.
+# 3. This notice may not be removed or altered from any source distribution.
+#
+# Build, deploy, debug / execute a native Android package based upon
+# NativeActivity.
+
+declare -r script_directory=$(dirname $0)
+declare -r android_root=${script_directory}/../../../../../../
+declare -r script_name=$(basename $0)
+declare -r android_manifest=AndroidManifest.xml
+declare -r os_name=$(uname -s)
+
+# Minimum Android target version supported by this project.
+: ${BUILDAPK_ANDROID_TARGET_MINVERSION:=10}
+# Directory containing the Android SDK
+# (http://developer.android.com/sdk/index.html).
+: ${ANDROID_SDK_HOME:=}
+# Directory containing the Android NDK
+# (http://developer.android.com/tools/sdk/ndk/index.html).
+: ${NDK_HOME:=}
+
+# Display script help and exit.
+usage() {
+  echo "
+Build the Android package in the current directory and deploy it to a
+connected device.
+
+Usage: ${script_name} \\
+         [ADB_DEVICE=serial_number] [BUILD=0] [DEPLOY=0] [RUN_DEBUGGER=1] \
+         [LAUNCH=0] [SWIG_BIN=swig_binary_directory] [SWIG_LIB=swig_include_directory] [ndk-build arguments ...]
+
+ADB_DEVICE=serial_number:
+  serial_number specifies the device to deploy the built apk to if multiple
+  Android devices are connected to the host.
+BUILD=0:
+  Disables the build of the package.
+DEPLOY=0:
+  Disables the deployment of the built apk to the Android device.
+RUN_DEBUGGER=1:
+  Launches the application in gdb after it has been deployed.  To debug in
+  gdb, NDK_DEBUG=1 must also be specified on the command line to build a
+  debug apk.
+LAUNCH=0:
+  Disable the launch of the apk on the Android device.
+SWIG_BIN=swig_binary_directory:
+  The directory where the SWIG binary lives. No need to set this if SWIG is
+  installed and point to from your PATH variable.
+SWIG_LIB=swig_include_directory:
+  The directory where SWIG shared include files are, usually obtainable from
+  commandline with \"swig -swiglib\". No need to set this if SWIG is installed
+  and point to from your PATH variable.
+ndk-build arguments...:
+  Additional arguments for ndk-build.  See ndk-build -h for more information.
+" >&2
+  exit 1
+}
+
+# Get the number of CPU cores present on the host.
+get_number_of_cores() {
+  case ${os_name} in
+    Darwin)
+      sysctl hw.ncpu | awk '{ print $2 }'
+      ;;
+    CYGWIN*|Linux)
+      awk '/^processor/ { n=$3 } END { print n + 1 }' /proc/cpuinfo
+      ;;
+    *)
+      echo 1
+      ;;
+  esac
+}
+
+# Get the package name from an AndroidManifest.xml file.
+get_package_name_from_manifest() {
+  xmllint --xpath 'string(/manifest/@package)' "${1}"
+}
+
+# Get the library name from an AndroidManifest.xml file.
+get_library_name_from_manifest() {
+  echo "\
+setns android=http://schemas.android.com/apk/res/android
+xpath string(/manifest/application/activity\
+[@android:name=\"android.app.NativeActivity\"]/meta-data\
+[@android:name=\"android.app.lib_name\"]/@android:value)" |
+  xmllint --shell "${1}" | awk '/Object is a string/ { print $NF }'
+}
+
+# Get the number of Android devices connected to the system.
+get_number_of_devices_connected() {
+  adb devices -l | \
+    awk '/^..*$/ { if (p) { print $0 } }
+         /List of devices attached/ { p = 1 }' | \
+    wc -l
+  return ${PIPESTATUS[0]}
+}
+
+# Kill a process and its' children.  This is provided for cygwin which
+# doesn't ship with pkill.
+kill_process_group() {
+  local parent_pid="${1}"
+  local child_pid=
+  for child_pid in $(ps -f | \
+                     awk '{ if ($3 == '"${parent_pid}"') { print $2 } }'); do
+    kill_process_group "${child_pid}"
+  done
+  kill "${parent_pid}" 2>/dev/null
+}
+
+# Find and run "adb".
+adb() {
+  local adb_path=
+  for path in "$(which adb 2>/dev/null)" \
+              "${ANDROID_SDK_HOME}/sdk/platform-tools/adb" \
+              "${android_root}/prebuilts/sdk/platform-tools/adb"; do
+    if [[ -e "${path}" ]]; then
+      adb_path="${path}"
+      break
+    fi
+  done
+  if [[ "${adb_path}" == "" ]]; then
+    echo -e "Unable to find adb." \
+           "\nAdd the Android ADT sdk/platform-tools directory to the" \
+           "PATH." >&2
+    exit 1
+  fi
+  "${adb_path}" "$@"
+}
+
+# Find and run "android".
+android() {
+  local android_executable=android
+  if echo "${os_name}" | grep -q CYGWIN; then
+    android_executable=android.bat
+  fi
+  local android_path=
+  for path in "$(which ${android_executable})" \
+              "${ANDROID_SDK_HOME}/sdk/tools/${android_executable}" \
+              "${android_root}/prebuilts/sdk/tools/${android_executable}"; do
+    if [[ -e "${path}" ]]; then
+      android_path="${path}"
+      break
+    fi
+  done
+  if [[ "${android_path}" == "" ]]; then
+    echo -e "Unable to find android tool." \
+           "\nAdd the Android ADT sdk/tools directory to the PATH." >&2
+    exit 1
+  fi
+  # Make sure ant is installed.
+  if [[ "$(which ant)" == "" ]]; then
+    echo -e "Unable to find ant." \
+            "\nPlease install ant and add to the PATH." >&2
+    exit 1
+  fi
+
+  "${android_path}" "$@"
+}
+
+# Find and run "ndk-build"
+ndkbuild() {
+  local ndkbuild_path=
+  for path in "$(which ndk-build 2>/dev/null)" \
+              "${NDK_HOME}/ndk-build" \
+              "${android_root}/prebuilts/ndk/current/ndk-build"; do
+    if [[ -e "${path}" ]]; then
+      ndkbuild_path="${path}"
+      break
+    fi
+  done
+  if [[ "${ndkbuild_path}" == "" ]]; then
+    echo -e "Unable to find ndk-build." \
+            "\nAdd the Android NDK directory to the PATH." >&2
+    exit 1
+  fi
+  "${ndkbuild_path}" "$@"
+}
+
+# Get file modification time of $1 in seconds since the epoch.
+stat_mtime() {
+  local filename="${1}"
+  case ${os_name} in
+    Darwin) stat -f%m "${filename}" 2>/dev/null || echo 0 ;;
+    *) stat -c%Y "${filename}" 2>/dev/null || echo 0 ;;
+  esac
+}
+
+# Build the native (C/C++) build targets in the current directory.
+build_native_targets() {
+  # Save the list of output modules in the install directory so that it's
+  # possible to restore their timestamps after the build is complete.  This
+  # works around a bug in ndk/build/core/setup-app.mk which results in the
+  # unconditional execution of the clean-installed-binaries rule.
+  restore_libraries="$(find libs -type f 2>/dev/null | \
+                       sed -E 's@^libs/(.*)@\1@')"
+
+  # Build native code.
+  ndkbuild -j$(get_number_of_cores) "$@"
+
+  # Restore installed libraries.
+  # Obviously this is a nasty hack (along with ${restore_libraries} above) as
+  # it assumes it knows where the NDK will be placing output files.
+  (
+    IFS=$'\n'
+    for libpath in ${restore_libraries}; do
+      source_library="obj/local/${libpath}"
+      target_library="libs/${libpath}"
+      if [[ -e "${source_library}" ]]; then
+        cp -a "${source_library}" "${target_library}"
+      fi
+    done
+  )
+}
+
+# Select the oldest installed android build target that is at least as new as
+# BUILDAPK_ANDROID_TARGET_MINVERSION.  If a suitable build target isn't found,
+# this function prints an error message and exits with an error.
+select_android_build_target() {
+  local -r android_targets_installed=$( \
+    android list targets | \
+    awk -F'"' '/^id:.*android/ { print $2 }')
+  local android_build_target=
+  for android_target in $(echo "${android_targets_installed}" | \
+                          awk -F- '{ print $2 }' | sort -n); do
+    local isNumber='^[0-9]+$'
+    # skip preview API releases e.g. 'android-L'
+    if [[ $android_target =~ $isNumber ]]; then
+      if [[ $((android_target)) -ge \
+          $((BUILDAPK_ANDROID_TARGET_MINVERSION)) ]]; then
+        android_build_target="android-${android_target}"
+        break
+      fi
+    # else
+      # The API version is a letter, so skip it.
+    fi
+  done
+  if [[ "${android_build_target}" == "" ]]; then
+    echo -e \
+      "Found installed Android targets:" \
+      "$(echo ${android_targets_installed} | sed 's/ /\n  /g;s/^/\n  /;')" \
+      "\nAndroid SDK platform" \
+      "android-$((BUILDAPK_ANDROID_TARGET_MINVERSION))" \
+      "must be installed to build this project." \
+      "\nUse the \"android\" application to install API" \
+      "$((BUILDAPK_ANDROID_TARGET_MINVERSION)) or newer." >&2
+    exit 1
+  fi
+  echo "${android_build_target}"
+}
+
+# Sign unsigned apk $1 and write the result to $2 with key store file $3 and
+# password $4.
+# If a key store file $3 and password $4 aren't specified, a temporary
+# (60 day) key is generated and used to sign the package.
+sign_apk() {
+  local unsigned_apk="${1}"
+  local signed_apk="${2}"
+  if [[ $(stat_mtime "${unsigned_apk}") -gt \
+          $(stat_mtime "${signed_apk}") ]]; then
+    local -r key_alias=$(basename ${signed_apk} .apk)
+    local keystore="${3}"
+    local key_password="${4}"
+    [[ "${keystore}" == "" ]] && keystore="${unsigned_apk}.keystore"
+    [[ "${key_password}" == "" ]] && \
+      key_password="${key_alias}123456"
+    if [[ ! -e ${keystore} ]]; then
+      keytool -genkey -v -dname "cn=, ou=${key_alias}, o=fpl" \
+        -storepass ${key_password} \
+        -keypass ${key_password} -keystore ${keystore} \
+        -alias ${key_alias} -keyalg RSA -keysize 2048 -validity 60
+    fi
+    cp "${unsigned_apk}" "${signed_apk}"
+    jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 \
+      -keystore ${keystore} -storepass ${key_password} \
+      -keypass ${key_password} "${signed_apk}" ${key_alias}
+  fi
+}
+
+# Build the apk $1 for package filename $2 in the current directory using the
+# ant build target $3.
+build_apk() {
+  local -r output_apk="${1}"
+  local -r package_filename="${2}"
+  local -r ant_target="${3}"
+  # Get the list of installed android targets and select the oldest target
+  # that is at least as new as BUILDAPK_ANDROID_TARGET_MINVERSION.
+  local -r android_build_target=$(select_android_build_target)
+  [[ "${android_build_target}" == "" ]] && exit 1
+  echo "Building ${output_apk} for target ${android_build_target}" >&2
+
+  # Create / update build.xml and local.properties files.
+  if [[ $(stat_mtime "${android_manifest}") -gt \
+          $(stat_mtime build.xml) ]]; then
+    android update project --target "${android_build_target}" \
+                           -n ${package_filename} --path .
+  fi
+
+  # Use ant to build the apk.
+  ant -quiet ${ant_target}
+
+  # Sign release apks with a temporary key as these packages will not be
+  # redistributed.
+  local unsigned_apk="bin/${package_filename}-${ant_target}-unsigned.apk"
+  if [[ "${ant_target}" == "release" ]]; then
+    sign_apk "${unsigned_apk}" "${output_apk}" "" ""
+  fi
+}
+
+# Uninstall package $1 and install apk $2 on device $3 where $3 is "-s device"
+# or an empty string.  If $3 is an empty string adb will fail when multiple
+# devices are connected to the host system.
+install_apk() {
+  local -r uninstall_package_name="${1}"
+  local -r install_apk="${2}"
+  local -r adb_device="${3}"
+  # Uninstall the package if it's already installed.
+  adb ${adb_device} uninstall "${uninstall_package_name}" 1>&2 > /dev/null || \
+    true # no error check
+
+  # Install the apk.
+  # NOTE: The following works around adb not returning an error code when
+  # it fails to install an apk.
+  echo "Install ${install_apk}" >&2
+  local -r adb_install_result=$(adb ${adb_device} install "${install_apk}")
+  echo "${adb_install_result}"
+  if echo "${adb_install_result}" | grep -qF 'Failure ['; then
+    exit 1
+  fi
+}
+
+# Launch previously installed package $1 on device $2.
+# If $2 is an empty string adb will fail when multiple devices are connected
+# to the host system.
+launch_package() {
+  (
+    # Determine the SDK version of Android on the device.
+    local -r android_sdk_version=$(
+      adb ${adb_device} shell cat system/build.prop | \
+      awk -F= '/ro.build.version.sdk/ {
+                 v=$2; sub(/[ \r\n]/, "", v); print v
+               }')
+
+    # Clear logs from previous runs.
+    # Note that logcat does not just 'tail' the logs, it dumps the entire log
+    # history.
+    adb ${adb_device} logcat -c
+
+    local finished_msg='Displayed '"${package_name}"
+    local timeout_msg='Activity destroy timeout.*'"${package_name}"
+    # Maximum time to wait before stopping log monitoring.  0 = infinity.
+    local launch_timeout=0
+    # If this is a Gingerbread device, kill log monitoring after 10 seconds.
+    if [[ $((android_sdk_version)) -le 10 ]]; then
+      launch_timeout=10
+    fi
+    # Display logcat in the background.
+    # Stop displaying the log when the app launch / execution completes or the
+    # logcat
+    (
+      adb ${adb_device} logcat | \
+        awk "
+          {
+            print \$0
+          }
+
+          /ActivityManager.*: ${finished_msg}/ {
+            exit 0
+          }
+
+          /ActivityManager.*: ${timeout_msg}/ {
+            exit 0
+          }" &
+      adb_logcat_pid=$!;
+      if [[ $((launch_timeout)) -gt 0 ]]; then
+        sleep $((launch_timeout));
+        kill ${adb_logcat_pid};
+      else
+        wait ${adb_logcat_pid};
+      fi
+    ) &
+    logcat_pid=$!
+    # Kill adb logcat if this shell exits.
+    trap "kill_process_group ${logcat_pid}" SIGINT SIGTERM EXIT
+
+    # If the SDK is newer than 10, "am" supports stopping an activity.
+    adb_stop_activity=
+    if [[ $((android_sdk_version)) -gt 10 ]]; then
+      adb_stop_activity=-S
+    fi
+
+    # Launch the activity and wait for it to complete.
+    adb ${adb_device} shell am start ${adb_stop_activity} -n \
+      ${package_name}/android.app.NativeActivity
+
+    wait "${logcat_pid}"
+  )
+}
+
+# See usage().
+main() {
+  # Parse arguments for this script.
+  local adb_device=
+  local ant_target=release
+  local disable_deploy=0
+  local disable_build=0
+  local run_debugger=0
+  local launch=1
+  local build_package=1
+  for opt; do
+    case ${opt} in
+      # NDK_DEBUG=0 tells ndk-build to build this as debuggable but to not
+      # modify the underlying code whereas NDK_DEBUG=1 also builds as debuggable
+      # but does modify the code
+      NDK_DEBUG=1) ant_target=debug ;;
+      NDK_DEBUG=0) ant_target=debug ;;
+      ADB_DEVICE*) adb_device="$(\
+        echo "${opt}" | sed -E 's/^ADB_DEVICE=([^ ]+)$/-s \1/;t;s/.*//')" ;;
+      BUILD=0) disable_build=1 ;;
+      DEPLOY=0) disable_deploy=1 ;;
+      RUN_DEBUGGER=1) run_debugger=1 ;;
+      LAUNCH=0) launch=0 ;;
+      clean) build_package=0 disable_deploy=1 launch=0 ;;
+      -h|--help|help) usage ;;
+    esac
+  done
+
+  # If a target device hasn't been specified and multiple devices are connected
+  # to the host machine, display an error.
+  local -r devices_connected=$(get_number_of_devices_connected)
+  if [[ "${adb_device}" == "" && $((devices_connected)) -gt 1 && \
+        ($((disable_deploy)) -eq 0 || $((launch)) -ne 0 || \
+         $((run_debugger)) -ne 0) ]]; then
+    if [[ $((disable_deploy)) -ne 0 ]]; then
+      echo "Deployment enabled, disable using DEPLOY=0" >&2
+    fi
+    if [[ $((launch)) -ne 0 ]]; then
+     echo "Launch enabled." >&2
+    fi
+    if [[ $((disable_deploy)) -eq 0 ]]; then
+      echo "Deployment enabled." >&2
+    fi
+    if [[ $((run_debugger)) -ne 0 ]]; then
+      echo "Debugger launch enabled." >&2
+    fi
+    echo "
+Multiple Android devices are connected to this host.  Either disable deployment
+and execution of the built .apk using:
+  \"${script_name} DEPLOY=0 LAUNCH=0\"
+
+or specify a device to deploy to using:
+  \"${script_name} ADB_DEVICE=\${device_serial}\".
+
+The Android devices connected to this machine are:
+$(adb devices -l)
+" >&2
+    exit 1
+  fi
+
+  if [[ $((disable_build)) -eq 0 ]]; then
+    # Build the native target.
+    build_native_targets "$@"
+  fi
+
+  # Get the package name from the manifest.
+  local -r package_name=$(get_package_name_from_manifest "${android_manifest}")
+  if [[ "${package_name}" == "" ]]; then
+    echo -e "No package name specified in ${android_manifest},"\
+            "skipping apk build, deploy"
+            "\nand launch steps." >&2
+    exit 0
+  fi
+  local -r package_basename=${package_name/*./}
+  local package_filename=$(get_library_name_from_manifest ${android_manifest})
+  [[ "${package_filename}" == "" ]] && package_filename="${package_basename}"
+
+  # Output apk name.
+  local -r output_apk="bin/${package_filename}-${ant_target}.apk"
+
+  if [[ $((disable_build)) -eq 0 && $((build_package)) -eq 1 ]]; then
+    # Build the apk.
+    build_apk "${output_apk}" "${package_filename}" "${ant_target}"
+  fi
+
+  # Deploy to the device.
+  if [[ $((disable_deploy)) -eq 0 ]]; then
+    install_apk "${package_name}" "${output_apk}" "${adb_device}"
+  fi
+
+  if [[ "${ant_target}" == "debug" && $((run_debugger)) -eq 1 ]]; then
+    # Start debugging.
+    ndk-gdb ${adb_device} --start
+  elif [[ $((launch)) -eq 1 ]]; then
+    launch_package "${package_name}" "${adb_device}"
+  fi
+}
+
+main "$@"
diff --git a/samples/android/jni/Android.mk b/samples/android/jni/Android.mk
index b9c7a1952..6f22d2852 100755
--- a/samples/android/jni/Android.mk
+++ b/samples/android/jni/Android.mk
@@ -23,7 +23,7 @@ include $(CLEAR_VARS)
 # Include the FlatBuffer utility function to generate header files from schemas.
 include $(FLATBUFFERS_ROOT_DIR)/android/jni/include.mk
 
-LOCAL_MODULE := sample_android_project
+LOCAL_MODULE := FlatBufferSample
 
 # Set up some useful variables to identify schema and output directories and
 # schema files.
diff --git a/samples/android/jni/main.cpp b/samples/android/jni/main.cpp
index d03655ca5..87580272f 100644
--- a/samples/android/jni/main.cpp
+++ b/samples/android/jni/main.cpp
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <android/log.h>
+
 #include "android_native_app_glue.h"
-#include "animal_generated.h"
-#include "flatbuffers/flatbuffers.h"
+#include "animal_generated.h" // Includes "flatbuffers/flatbuffers.h".
 
 void android_main(android_app *app) {
   app_dummy();
@@ -24,5 +25,19 @@ void android_main(android_app *app) {
   auto sound = builder.CreateString("Bark");
   auto animal_buffer = sample::CreateAnimal(builder, name, sound);
   builder.Finish(animal_buffer);
-}
 
+  // We now have a FlatBuffer that can be stored on disk or sent over a network.
+
+  // ...Code to store on disk or send over a network goes here...
+
+  // Instead, we're going to access it immediately, as if we just recieved this.
+
+  auto animal = sample::GetAnimal(builder.GetBufferPointer());
+
+  assert(animal->name()->str() == "Dog");
+  assert(animal->sound()->str() == "Bark");
+  (void)animal; // To silence "Unused Variable" warnings.
+
+  __android_log_print(ANDROID_LOG_INFO, "FlatBufferSample",
+      "FlatBuffer successfully created and verified.");
+}
diff --git a/samples/android/res/values/strings.xml b/samples/android/res/values/strings.xml
new file mode 100755
index 000000000..57ddaf4e1
--- /dev/null
+++ b/samples/android/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2015 Google, Inc.
+
+     This software is provided 'as-is', without any express or implied
+     warranty.  In no event will the authors be held liable for any damages
+     arising from the use of this software.
+     Permission is granted to anyone to use this software for any purpose,
+     including commercial applications, and to alter it and redistribute it
+     freely, subject to the following restrictions:
+     1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+     2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+     3. This notice may not be removed or altered from any source distribution.
+ -->
+<resources>
+    <string name="app_name">FlatBufferSample</string>
+</resources>
diff --git a/samples/android_sample.sh b/samples/android_sample.sh
new file mode 100755
index 000000000..9e746fb2a
--- /dev/null
+++ b/samples/android_sample.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Note: This script requires the Android NDK and Android SDK to be installed.
+#       It also requires an Android device to be connected for installing and
+#       running the applicaton.
+
+sampledir=$(readlink -fn `dirname $0`)
+currentdir=$(readlink -fn `pwd`)
+
+if [[ "$sampledir" != "$currentdir" ]]; then
+  echo Error: This script must be run from inside the $sampledir directory.
+  echo You executed it from the $currentdir directory.
+  exit 1
+fi
+
+# Execute `build_apk.sh` to build and run the android app.
+cd android
+./build_apk.sh
+
+# Cleanup the temporary files.
+rm build.xml local.properties proguard-project.txt project.properties
+rm -rf bin libs obj
diff --git a/samples/csharp_sample.sh b/samples/csharp_sample.sh
new file mode 100755
index 000000000..5c86f7b78
--- /dev/null
+++ b/samples/csharp_sample.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Note: This script runs on Mac and Linux. It requires `mono` to be installed
+# and `flatc` to be built (using `cmake` in the root directory).
+
+sampledir=$(cd $(dirname $BASH_SOURCE) && pwd)
+rootidr=$(cd $sampledir/.. && pwd)
+currentdir=$(pwd)
+
+if [[ "$sampledir" != "$currentdir" ]]; then
+  echo Error: This script must be run from inside the $sampledir directory.
+  echo You executed it from the $currentdir directory.
+  exit 1
+fi
+
+# Run `flatc`. Note: This requires you to compile using `cmake` from the
+# root `/flatbuffers` directory.
+if [ -e ../flatc ]; then
+  ../flatc --csharp --gen-mutable monster.fbs
+elif [ -e ../Debug/flatc ]; then
+  ../Debug/flatc --csharp --gen-mutable monster.fbs
+else
+  echo 'flatc' could not be found. Make sure to build FlatBuffers from the \
+       $rootdir directory.
+  exit 1
+fi
+
+echo Compiling and running the C# sample.
+
+# Compile and execute the sample.
+mcs SampleBinary.cs MyGame/Sample/*.cs ../net/FlatBuffers/*.cs
+mono SampleBinary.exe
+
+# Cleanup temporary files.
+rm SampleBinary.exe
+rm -rf MyGame/
diff --git a/samples/go_sample.sh b/samples/go_sample.sh
new file mode 100755
index 000000000..2a0605f20
--- /dev/null
+++ b/samples/go_sample.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Note: This script runs on Mac and Linux. It requires `go` to be installed
+# and 'flatc' to be built (using `cmake` in the root directory).
+
+sampledir=$(cd $(dirname $BASH_SOURCE) && pwd)
+rootdir=$(cd $sampledir/.. && pwd)
+currentdir=$(pwd)
+
+if [[ "$sampledir" != "$currentdir" ]]; then
+  echo Error: This script must be run from inside the $sampledir directory.
+  echo You executed it from the $currentdir directory.
+  exit 1
+fi
+
+# Run `flatc`. Note: This requires you to compile using `cmake` from the
+# root `/flatbuffers` directory.
+if [ -e ../flatc ]; then
+  ../flatc --go monster.fbs
+elif [ -e ../Debug/flatc ]; then
+  ../Debug/flatc --go monster.fbs
+else
+  echo 'flatc' could not be found. Make sure to build FlatBuffers from the \
+       $rootdir directory.
+ exit 1
+fi
+
+echo Compiling and running the Go sample.
+
+# Go requires a particular layout of files in order to link the necessary
+# packages. Copy these files to the respective directores to compile the
+# sample.
+mkdir -p ${sampledir}/go_gen/src/MyGame/Sample
+mkdir -p ${sampledir}/go_gen/src/github.com/google/flatbuffers/go
+cp MyGame/Sample/*.go ${sampledir}/go_gen/src/MyGame/Sample/
+cp ${sampledir}/../go/* ${sampledir}/go_gen/src/github.com/google/flatbuffers/go
+
+# Export the `GOPATH`, so that `go` will know which directories to search for
+# the libraries.
+export GOPATH=${sampledir}/go_gen/
+
+# Compile and execute the sample.
+go build -o go_sample sample_binary.go
+./go_sample
+
+# Clean up the temporary files.
+rm -rf MyGame/
+rm -rf ${sampledir}/go_gen/
+rm go_sample
diff --git a/samples/java_sample.sh b/samples/java_sample.sh
new file mode 100755
index 000000000..3e7ebcfe1
--- /dev/null
+++ b/samples/java_sample.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Note: This script runs on Mac and Linux. It requires `java` to be installed
+# and `flatc` to be built (using `cmake` in the root directory).
+
+sampledir=$(cd $(dirname $BASH_SOURCE) && pwd)
+rootdir=$(cd $sampledir/.. && pwd)
+currentdir=$(pwd)
+
+if [[ "$sampledir" != "$currentdir" ]]; then
+  echo Error: This script must be run from inside the $sampledir directory.
+  echo You executed it from the $currentdir directory.
+  exit 1
+fi
+
+# Run `flatc`. Note: This requires you to compile using `cmake` from the
+# root `/flatbuffers` directory.
+if [ -e ../flatc ]; then
+  ../flatc --java --gen-mutable monster.fbs
+elif [ -e ../Debug/flatc ]; then
+  ../Debug/flatc --java --gen-mutable monster.fbs
+else
+  echo 'flatc' could not be found. Make sure to build FlatBuffers from the \
+       $rootdir directory.
+  exit 1
+fi
+
+echo Compiling and running the Java sample.
+
+# Compile and execute the sample.
+javac -classpath ${sampledir}/../java:${sampledir} SampleBinary.java
+java -classpath ${sampledir}/../java:${sampledir} SampleBinary
+
+# Cleanup temporary files.
+rm -rf MyGame/
+rm ${sampledir}/../java/com/google/flatbuffers/*.class
+rm *.class
diff --git a/samples/javascript_sample.sh b/samples/javascript_sample.sh
new file mode 100755
index 000000000..794ec4b7c
--- /dev/null
+++ b/samples/javascript_sample.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Note: This script runs on Mac and Linux. It requires `Node.js` to be installed
+# and `flatc` to be built (using `cmake` in the root directory).
+
+sampledir=$(cd $(dirname $BASH_SOURCE) && pwd)
+rootdir=$(cd $sampledir/.. && pwd)
+currentdir=$(pwd)
+
+if [[ "$sampledir" != "$currentdir" ]]; then
+  echo Error: This script must be run from inside the $sampledir directory.
+  echo You executed it from the $currentdir directory.
+  exit 1
+fi
+
+# Run `flatc`. Note: This requires you to compile using `cmake` from the
+# root `/flatbuffers` directory.
+if [ -e ../flatc ]; then
+  ../flatc --js monster.fbs
+elif [ -e ../Debug/flatc ]; then
+  ../Debug/flatc --js monster.fbs
+else
+  echo 'flatc' could not be found. Make sure to build FlatBuffers from the \
+       $rootdir directory.
+  exit 1
+fi
+
+echo Running the JavaScript sample.
+
+# Execute the sample.
+node samplebinary.js
+
+# Cleanup temporary files.
+rm monster_generated.js
diff --git a/samples/monster.fbs b/samples/monster.fbs
index 2ad0c926d..247b81771 100755
--- a/samples/monster.fbs
+++ b/samples/monster.fbs
@@ -1,10 +1,10 @@
-// example IDL file
+// Example IDL file for our monster's schema.
 
 namespace MyGame.Sample;
 
 enum Color:byte { Red = 0, Green, Blue = 2 }
 
-union Any { Monster }  // add more elements..
+union Equipment { Weapon } // Optionally add more tables.
 
 struct Vec3 {
   x:float;
@@ -20,6 +20,13 @@ table Monster {
   friendly:bool = false (deprecated);
   inventory:[ubyte];
   color:Color = Blue;
+  weapons:[Weapon];
+  equipped:Equipment;
+}
+
+table Weapon {
+  name:string;
+  damage:short;
 }
 
 root_type Monster;
diff --git a/samples/monster_generated.h b/samples/monster_generated.h
deleted file mode 100644
index e27b69117..000000000
--- a/samples/monster_generated.h
+++ /dev/null
@@ -1,153 +0,0 @@
-// automatically generated by the FlatBuffers compiler, do not modify
-
-#ifndef FLATBUFFERS_GENERATED_MONSTER_MYGAME_SAMPLE_H_
-#define FLATBUFFERS_GENERATED_MONSTER_MYGAME_SAMPLE_H_
-
-#include "flatbuffers/flatbuffers.h"
-
-
-namespace MyGame {
-namespace Sample {
-
-struct Vec3;
-struct Monster;
-
-enum Color {
-  Color_Red = 0,
-  Color_Green = 1,
-  Color_Blue = 2,
-  Color_MIN = Color_Red,
-  Color_MAX = Color_Blue
-};
-
-inline const char **EnumNamesColor() {
-  static const char *names[] = { "Red", "Green", "Blue", nullptr };
-  return names;
-}
-
-inline const char *EnumNameColor(Color e) { return EnumNamesColor()[static_cast<int>(e)]; }
-
-enum Any {
-  Any_NONE = 0,
-  Any_Monster = 1,
-  Any_MIN = Any_NONE,
-  Any_MAX = Any_Monster
-};
-
-inline const char **EnumNamesAny() {
-  static const char *names[] = { "NONE", "Monster", nullptr };
-  return names;
-}
-
-inline const char *EnumNameAny(Any e) { return EnumNamesAny()[static_cast<int>(e)]; }
-
-inline bool VerifyAny(flatbuffers::Verifier &verifier, const void *union_obj, Any type);
-
-MANUALLY_ALIGNED_STRUCT(4) Vec3 FLATBUFFERS_FINAL_CLASS {
- private:
-  float x_;
-  float y_;
-  float z_;
-
- public:
-  Vec3(float _x, float _y, float _z)
-    : x_(flatbuffers::EndianScalar(_x)), y_(flatbuffers::EndianScalar(_y)), z_(flatbuffers::EndianScalar(_z)) { }
-
-  float x() const { return flatbuffers::EndianScalar(x_); }
-  void mutate_x(float _x) { flatbuffers::WriteScalar(&x_, _x); }
-  float y() const { return flatbuffers::EndianScalar(y_); }
-  void mutate_y(float _y) { flatbuffers::WriteScalar(&y_, _y); }
-  float z() const { return flatbuffers::EndianScalar(z_); }
-  void mutate_z(float _z) { flatbuffers::WriteScalar(&z_, _z); }
-};
-STRUCT_END(Vec3, 12);
-
-struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  enum {
-    VT_POS = 4,
-    VT_MANA = 6,
-    VT_HP = 8,
-    VT_NAME = 10,
-    VT_INVENTORY = 14,
-    VT_COLOR = 16
-  };
-  const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
-  Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
-  int16_t mana() const { return GetField<int16_t>(VT_MANA, 150); }
-  bool mutate_mana(int16_t _mana) { return SetField(VT_MANA, _mana); }
-  int16_t hp() const { return GetField<int16_t>(VT_HP, 100); }
-  bool mutate_hp(int16_t _hp) { return SetField(VT_HP, _hp); }
-  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
-  flatbuffers::String *mutable_name() { return GetPointer<flatbuffers::String *>(VT_NAME); }
-  const flatbuffers::Vector<uint8_t> *inventory() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); }
-  flatbuffers::Vector<uint8_t> *mutable_inventory() { return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); }
-  Color color() const { return static_cast<Color>(GetField<int8_t>(VT_COLOR, 2)); }
-  bool mutate_color(Color _color) { return SetField(VT_COLOR, static_cast<int8_t>(_color)); }
-  bool Verify(flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<Vec3>(verifier, VT_POS) &&
-           VerifyField<int16_t>(verifier, VT_MANA) &&
-           VerifyField<int16_t>(verifier, VT_HP) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
-           verifier.Verify(name()) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, VT_INVENTORY) &&
-           verifier.Verify(inventory()) &&
-           VerifyField<int8_t>(verifier, VT_COLOR) &&
-           verifier.EndTable();
-  }
-};
-
-struct MonsterBuilder {
-  flatbuffers::FlatBufferBuilder &fbb_;
-  flatbuffers::uoffset_t start_;
-  void add_pos(const Vec3 *pos) { fbb_.AddStruct(Monster::VT_POS, pos); }
-  void add_mana(int16_t mana) { fbb_.AddElement<int16_t>(Monster::VT_MANA, mana, 150); }
-  void add_hp(int16_t hp) { fbb_.AddElement<int16_t>(Monster::VT_HP, hp, 100); }
-  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(Monster::VT_NAME, name); }
-  void add_inventory(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory) { fbb_.AddOffset(Monster::VT_INVENTORY, inventory); }
-  void add_color(Color color) { fbb_.AddElement<int8_t>(Monster::VT_COLOR, static_cast<int8_t>(color), 2); }
-  MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
-  MonsterBuilder &operator=(const MonsterBuilder &);
-  flatbuffers::Offset<Monster> Finish() {
-    auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 7));
-    return o;
-  }
-};
-
-inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder &_fbb,
-   const Vec3 *pos = 0,
-   int16_t mana = 150,
-   int16_t hp = 100,
-   flatbuffers::Offset<flatbuffers::String> name = 0,
-   flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory = 0,
-   Color color = Color_Blue) {
-  MonsterBuilder builder_(_fbb);
-  builder_.add_inventory(inventory);
-  builder_.add_name(name);
-  builder_.add_pos(pos);
-  builder_.add_hp(hp);
-  builder_.add_mana(mana);
-  builder_.add_color(color);
-  return builder_.Finish();
-}
-
-inline bool VerifyAny(flatbuffers::Verifier &verifier, const void *union_obj, Any type) {
-  switch (type) {
-    case Any_NONE: return true;
-    case Any_Monster: return verifier.VerifyTable(reinterpret_cast<const Monster *>(union_obj));
-    default: return false;
-  }
-}
-
-inline const MyGame::Sample::Monster *GetMonster(const void *buf) { return flatbuffers::GetRoot<MyGame::Sample::Monster>(buf); }
-
-inline Monster *GetMutableMonster(void *buf) { return flatbuffers::GetMutableRoot<Monster>(buf); }
-
-inline bool VerifyMonsterBuffer(flatbuffers::Verifier &verifier) { return verifier.VerifyBuffer<MyGame::Sample::Monster>(); }
-
-inline void FinishMonsterBuffer(flatbuffers::FlatBufferBuilder &fbb, flatbuffers::Offset<MyGame::Sample::Monster> root) { fbb.Finish(root); }
-
-}  // namespace Sample
-}  // namespace MyGame
-
-#endif  // FLATBUFFERS_GENERATED_MONSTER_MYGAME_SAMPLE_H_
diff --git a/samples/monsterdata.json b/samples/monsterdata.json
index 06bb57af9..8d669146d 100755
--- a/samples/monsterdata.json
+++ b/samples/monsterdata.json
@@ -4,6 +4,6 @@
     y: 2,
     z: 3
   },
-  hp: 80,
-  name: "MyMonster"
+  hp: 300,
+  name: "Orc"
 }
diff --git a/samples/php_sample.sh b/samples/php_sample.sh
new file mode 100755
index 000000000..8a55e2a05
--- /dev/null
+++ b/samples/php_sample.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Note: This script runs on Mac and Linux. It requires `php` to be installed
+# and `flatc` to be built (using `cmake` in the root directory).
+
+sampledir=$(cd $(dirname $BASH_SOURCE) && pwd)
+rootdir=$(cd $sampledir/.. && pwd)
+currentdir=$(pwd)
+
+if [[ "$sampledir" != "$currentdir" ]]; then
+  echo Error: This script must be run from inside the $sampledir directory.
+  echo You executed it from the $currentdir directory.
+  exit 1
+fi
+
+# Run `flatc`. Note: This requires you to compile using `cmake` from the
+# root `/flatbuffers` directory.
+if [ -e ../flatc ]; then
+  ../flatc --php monster.fbs
+elif [ -e ../Debug/flatc ]; then
+  ../Debug/flatc --php monster.fbs
+else
+  echo 'flatc' could not be found. Make sure to build FlatBuffers from the \
+        $rootdir directory.
+  exit 1
+fi
+
+echo Running the PHP sample.
+
+# Execute the sample.
+php SampleBinary.php
+
+# Clean up temporary files.
+rm -rf MyGame/
diff --git a/samples/python_sample.sh b/samples/python_sample.sh
new file mode 100755
index 000000000..9148c7d81
--- /dev/null
+++ b/samples/python_sample.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Note: This script runs on Mac and Linux. It requires `python` to be installed
+# and `flatc` to be built (using `cmake` in the root directory).
+
+sampledir=$(cd $(dirname $BASH_SOURCE) && pwd)
+rootdir=$(cd $sampledir/.. && pwd)
+currentdir=$(pwd)
+
+if [[ "$sampledir" != "$currentdir" ]]; then
+  echo Error: This script must be run from inside the $sampledir directory.
+  echo You executed it from the $currentdir directory.
+  exit 1
+fi
+
+# Run `flatc`. Note: This requires you to compile using `cmake` from the
+# root `/flatbuffers` directory.
+if [ -e ../flatc ]; then
+  ../flatc --python monster.fbs
+elif [ -e ../Debug/flatc ]; then
+  ../Debug/flatc --python monster.fbs
+else
+  echo 'flatc' could not be found. Make sure to build FlatBuffers from the \
+       $rootdir directory.
+  exit 1
+fi
+
+echo Running the Python sample.
+
+# Execute the sample.
+python sample_binary.py
+
+# Clean up the temporary files.
+rm -rf MyGame
diff --git a/samples/sample_binary.cpp b/samples/sample_binary.cpp
index 3b6d0fbe4..5b2f603a0 100644
--- a/samples/sample_binary.cpp
+++ b/samples/sample_binary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Google Inc. All rights reserved.
+ * Copyright 2015 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#include "flatbuffers/flatbuffers.h"
-
-#include "monster_generated.h"
+#include "monster_generated.h" // Already includes "flatbuffers/flatbuffers.h".
 
 using namespace MyGame::Sample;
 
@@ -26,7 +24,25 @@ int main(int /*argc*/, const char * /*argv*/[]) {
   // Build up a serialized buffer algorithmically:
   flatbuffers::FlatBufferBuilder builder;
 
-  auto vec = Vec3(1, 2, 3);
+  // First, lets serialize some weapons for the Monster: A 'sword' and an 'axe'.
+  auto weapon_one_name = builder.CreateString("Sword");
+  short weapon_one_damage = 3;
+
+  auto weapon_two_name = builder.CreateString("Axe");
+  short weapon_two_damage = 5;
+
+  // Use the `CreateWeapon` shortcut to create Weapons with all fields set.
+  auto sword = CreateWeapon(builder, weapon_one_name, weapon_one_damage);
+  auto axe = CreateWeapon(builder, weapon_two_name, weapon_two_damage);
+
+  // Create a FlatBuffer's `vector` from the `std::vector`.
+  std::vector<flatbuffers::Offset<Weapon>> weapons_vector;
+  weapons_vector.push_back(sword);
+  weapons_vector.push_back(axe);
+  auto weapons = builder.CreateVector(weapons_vector);
+
+  // Second, serialize the rest of the objects needed by the Monster.
+  auto position = Vec3(1.0f, 2.0f, 3.0f);
 
   auto name = builder.CreateString("MyMonster");
 
@@ -34,31 +50,53 @@ int main(int /*argc*/, const char * /*argv*/[]) {
   auto inventory = builder.CreateVector(inv_data, 10);
 
   // Shortcut for creating monster with all fields set:
-  auto mloc = CreateMonster(builder, &vec, 150, 80, name, inventory,
-                            Color_Blue);
+  auto orc = CreateMonster(builder, &position, 150, 80, name, inventory,
+                           Color_Red, weapons, Equipment_Weapon, axe.Union());
 
-  builder.Finish(mloc);
-  // We now have a FlatBuffer we can store or send somewhere.
+  builder.Finish(orc); // Serialize the root of the object.
+
+  // We now have a FlatBuffer we can store on disk or send over a network.
 
   // ** file/network code goes here :) **
   // access builder.GetBufferPointer() for builder.GetSize() bytes
 
-  // Instead, we're going to access it straight away.
+  // Instead, we're going to access it right away (as if we just received it).
+
   // Get access to the root:
   auto monster = GetMonster(builder.GetBufferPointer());
 
+  // Get and test some scalar types from the FlatBuffer.
   assert(monster->hp() == 80);
   assert(monster->mana() == 150);  // default
   assert(monster->name()->str() == "MyMonster");
 
+  // Get and test a field of the FlatBuffer's `struct`.
   auto pos = monster->pos();
   assert(pos);
-  assert(pos->z() == 3);
+  assert(pos->z() == 3.0f);
   (void)pos;
 
+  // Get a test an element from the `inventory` FlatBuffer's `vector`.
   auto inv = monster->inventory();
   assert(inv);
   assert(inv->Get(9) == 9);
   (void)inv;
+
+  // Get and test the `weapons` FlatBuffers's `vector`.
+  std::string expected_weapon_names[] = {"Sword", "Axe"};
+  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]);
+    assert(weps->Get(i)->damage() == expected_weapon_damages[i]);
+  }
+
+  // Get and test the `Equipment` union (`equipped` field).
+  assert(monster->equipped_type() == Equipment_Weapon);
+  auto equipped = static_cast<const Weapon*>(monster->equipped());
+  assert(equipped->name()->str() == "Axe");
+  assert(equipped->damage() == 5);
+
+  printf("The FlatBuffer was successfully created and verified!\n");
 }
 
diff --git a/samples/sample_binary.go b/samples/sample_binary.go
new file mode 100644
index 000000000..7a36e6a8a
--- /dev/null
+++ b/samples/sample_binary.go
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2015 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// To run, use the `go_sample.sh` script.
+
+package main
+
+import (
+        flatbuffers "github.com/google/flatbuffers/go"
+        "fmt"
+        "strconv"
+        sample "MyGame/Sample"
+)
+
+// Example how to use Flatbuffers to create and read binary buffers.
+func main() {
+        builder := flatbuffers.NewBuilder(0)
+
+        // Create some weapons for our Monster ("Sword" and "Axe").
+        weaponOne := builder.CreateString("Sword")
+        weaponTwo := builder.CreateString("Axe")
+
+        sample.WeaponStart(builder)
+        sample.WeaponAddName(builder, weaponOne)
+        sample.WeaponAddDamage(builder, 3)
+        sword := sample.WeaponEnd(builder)
+
+        sample.WeaponStart(builder)
+        sample.WeaponAddName(builder, weaponTwo)
+        sample.WeaponAddDamage(builder, 5)
+        axe := sample.WeaponEnd(builder)
+
+        // Serialize the FlatBuffer data.
+        name := builder.CreateString("Orc")
+
+        sample.MonsterStartInventoryVector(builder, 10)
+        // Note: Since we prepend the bytes, this loop iterates in reverse.
+        for i := 9; i >= 0; i-- {
+                builder.PrependByte(byte(i))
+        }
+        inv := builder.EndVector(10)
+
+        sample.MonsterStartWeaponsVector(builder, 2)
+        // Note: Since we prepend the weapons, prepend in reverse order.
+        builder.PrependUOffsetT(axe)
+        builder.PrependUOffsetT(sword)
+        weapons := builder.EndVector(2)
+
+        pos := sample.CreateVec3(builder, 1.0, 2.0, 3.0)
+
+        sample.MonsterStart(builder)
+        sample.MonsterAddPos(builder, pos)
+        sample.MonsterAddHp(builder, 300)
+        sample.MonsterAddName(builder, name)
+        sample.MonsterAddInventory(builder, inv)
+        sample.MonsterAddColor(builder, sample.ColorRed)
+        sample.MonsterAddWeapons(builder, weapons)
+        sample.MonsterAddEquippedType(builder, sample.EquipmentWeapon)
+        sample.MonsterAddEquipped(builder, axe)
+        orc := sample.MonsterEnd(builder)
+
+        builder.Finish(orc)
+
+        // We now have a FlatBuffer that we could store on disk or send over a network.
+
+        // ...Saving to file or sending over a network code goes here...
+
+        // Instead, we are going to access this buffer right away (as if we just received it).
+
+        buf := builder.FinishedBytes()
+
+        // Note: We use `0` for the offset here, since we got the data using the
+        // `builder.FinishedBytes()` method. This simulates the data you would store/receive in your
+        // FlatBuffer. If you wanted to read from the `builder.Bytes` directly, you would need to
+        // pass in the offset of `builder.Head()`, as the builder actually constructs the buffer
+        // backwards.
+        monster := sample.GetRootAsMonster(buf, 0)
+
+        // Note: We did not set the `mana` field explicitly, so we get the
+        // default value.
+        assert(monster.Mana() == 150, "`monster.Mana()`", strconv.Itoa(int(monster.Mana())), "150")
+        assert(monster.Hp() == 300, "`monster.Hp()`", strconv.Itoa(int(monster.Hp())), "300")
+        assert(string(monster.Name()) == "Orc", "`string(monster.Name())`", string(monster.Name()),
+               "\"Orc\"")
+        assert(monster.Color() == sample.ColorRed, "`monster.Color()`",
+               strconv.Itoa(int(monster.Color())), strconv.Itoa(int(sample.ColorRed)))
+
+        // Note: Whenever you access a new object, like in `Pos()`, a new temporary accessor object
+        // gets created. If your code is very performance sensitive, you can pass in a pointer to an
+        // existing `Vec3` instead of `nil`. This allows you to reuse it across many calls to reduce
+        // the amount of object allocation/garbage collection.
+        assert(monster.Pos(nil).X() == 1.0, "`monster.Pos(nil).X()`",
+               strconv.FormatFloat(float64(monster.Pos(nil).X()), 'f', 1, 32), "1.0")
+        assert(monster.Pos(nil).Y() == 2.0, "`monster.Pos(nil).Y()`",
+               strconv.FormatFloat(float64(monster.Pos(nil).Y()), 'f', 1, 32), "2.0")
+        assert(monster.Pos(nil).Z() == 3.0, "`monster.Pos(nil).Z()`",
+               strconv.FormatFloat(float64(monster.Pos(nil).Z()), 'f', 1, 32), "3.0")
+
+        // For vectors, like `Inventory`, they have a method suffixed with 'Length' that can be used
+        // to query the length of the vector. You can index the vector by passing an index value
+        // into the accessor.
+        for i := 0; i < monster.InventoryLength(); i++ {
+                assert(monster.Inventory(i) == byte(i), "`monster.Inventory(i)`",
+                       strconv.Itoa(int(monster.Inventory(i))), strconv.Itoa(int(byte(i))))
+        }
+
+        expectedWeaponNames := []string{"Sword", "Axe"}
+        expectedWeaponDamages := []int{3, 5}
+        weapon := new(sample.Weapon)  // We need a `sample.Weapon` to pass into `monster.Weapons()`
+                                      // to capture the output of that function.
+        for i := 0; i < monster.WeaponsLength(); i++ {
+                if monster.Weapons(weapon, i) {
+                        assert(string(weapon.Name()) == expectedWeaponNames[i], "`weapon.Name()`",
+                               string(weapon.Name()), expectedWeaponNames[i])
+                        assert(int(weapon.Damage()) == expectedWeaponDamages[i],
+                               "`weapon.Damage()`", strconv.Itoa(int(weapon.Damage())),
+                               strconv.Itoa(expectedWeaponDamages[i]))
+                }
+        }
+
+        // For FlatBuffer `union`s, you can get the type of the union, as well as the union
+        // data itself.
+        assert(monster.EquippedType() == sample.EquipmentWeapon, "`monster.EquippedType()`",
+               strconv.Itoa(int(monster.EquippedType())), strconv.Itoa(int(sample.EquipmentWeapon)))
+
+        unionTable := new(flatbuffers.Table)
+        if monster.Equipped(unionTable) {
+                // An example of how you can appropriately convert the table depending on the
+                // FlatBuffer `union` type. You could add `else if` and `else` clauses to handle
+                // other FlatBuffer `union` types for this field. (Similarly, this could be
+                // done in a switch statement.)
+                if monster.EquippedType() == sample.EquipmentWeapon {
+                        unionWeapon := new(sample.Weapon)
+                        unionWeapon.Init(unionTable.Bytes, unionTable.Pos)
+
+                        assert(string(unionWeapon.Name()) == "Axe", "`unionWeapon.Name()`",
+                               string(unionWeapon.Name()), "Axe")
+                        assert(int(unionWeapon.Damage()) == 5, "`unionWeapon.Damage()`",
+                               strconv.Itoa(int(unionWeapon.Damage())), strconv.Itoa(5))
+                }
+        }
+
+        fmt.Printf("The FlatBuffer was successfully created and verified!\n")
+}
+
+// A helper function to print out if an assertion failed.
+func assert(assertPassed bool, codeExecuted string, actualValue string, expectedValue string) {
+        if assertPassed == false {
+                panic("Assert failed! " + codeExecuted + " (" + actualValue +
+                      ") was not equal to " + expectedValue + ".")
+        }
+}
diff --git a/samples/sample_binary.py b/samples/sample_binary.py
new file mode 100644
index 000000000..96711fb45
--- /dev/null
+++ b/samples/sample_binary.py
@@ -0,0 +1,137 @@
+#!/usr/bin/python
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# To run this file, use `python_sample.sh`.
+
+# Append paths to the `flatbuffers` and `MyGame` modules. This is necessary
+# to facilitate executing this script in the `samples` folder, and to root
+# folder (where it gets placed when using `cmake`).
+import os
+import sys
+sys.path.append(os.path.join(os.path.dirname(__file__), '../python'))
+
+import flatbuffers
+import MyGame.Sample.Color
+import MyGame.Sample.Equipment
+import MyGame.Sample.Monster
+import MyGame.Sample.Vec3
+import MyGame.Sample.Weapon
+
+# Example of how to use FlatBuffers to create and read binary buffers.
+
+def main():
+  builder = flatbuffers.Builder(0)
+
+  # Create some weapons for our Monster ('Sword' and 'Axe').
+  weapon_one = builder.CreateString('Sword')
+  weapon_two = builder.CreateString('Axe')
+
+  MyGame.Sample.Weapon.WeaponStart(builder)
+  MyGame.Sample.Weapon.WeaponAddName(builder, weapon_one)
+  MyGame.Sample.Weapon.WeaponAddDamage(builder, 3)
+  sword = MyGame.Sample.Weapon.WeaponEnd(builder)
+
+  MyGame.Sample.Weapon.WeaponStart(builder)
+  MyGame.Sample.Weapon.WeaponAddName(builder, weapon_two)
+  MyGame.Sample.Weapon.WeaponAddDamage(builder, 5)
+  axe = MyGame.Sample.Weapon.WeaponEnd(builder)
+
+  # Serialize the FlatBuffer data.
+  name = builder.CreateString('Orc')
+
+  MyGame.Sample.Monster.MonsterStartInventoryVector(builder, 10)
+  # Note: Since we prepend the bytes, this loop iterates in reverse order.
+  for i in reversed(range(0, 10)):
+    builder.PrependByte(i)
+  inv = builder.EndVector(10)
+
+  MyGame.Sample.Monster.MonsterStartWeaponsVector(builder, 2)
+  # Note: Since we prepend the data, prepend the weapons in reverse order.
+  builder.PrependUOffsetTRelative(axe)
+  builder.PrependUOffsetTRelative(sword)
+  weapons = builder.EndVector(2)
+
+  pos = MyGame.Sample.Vec3.CreateVec3(builder, 1.0, 2.0, 3.0)
+
+  MyGame.Sample.Monster.MonsterStart(builder)
+  MyGame.Sample.Monster.MonsterAddPos(builder, pos)
+  MyGame.Sample.Monster.MonsterAddHp(builder, 300)
+  MyGame.Sample.Monster.MonsterAddName(builder, name)
+  MyGame.Sample.Monster.MonsterAddInventory(builder, inv)
+  MyGame.Sample.Monster.MonsterAddColor(builder,
+                                        MyGame.Sample.Color.Color().Red)
+  MyGame.Sample.Monster.MonsterAddWeapons(builder, weapons)
+  MyGame.Sample.Monster.MonsterAddEquippedType(
+      builder, MyGame.Sample.Equipment.Equipment().Weapon)
+  MyGame.Sample.Monster.MonsterAddEquipped(builder, axe)
+  orc = MyGame.Sample.Monster.MonsterEnd(builder)
+
+  builder.Finish(orc)
+
+  # We now have a FlatBuffer that we could store on disk or send over a network.
+
+  # ...Saving to file or sending over a network code goes here...
+
+  # Instead, we are going to access this buffer right away (as if we just
+  # received it).
+
+  buf = builder.Output()
+
+  # Note: We use `0` for the offset here, since we got the data using the
+  # `builder.Output()` method. This simulates the data you would store/receive
+  # in your FlatBuffer. If you wanted to read from the `builder.Bytes` directly,
+  # you would need to pass in the offset of `builder.Head()`, as the builder
+  # actually constructs the buffer backwards.
+  monster = MyGame.Sample.Monster.Monster.GetRootAsMonster(buf, 0)
+
+  # Note: We did not set the `Mana` field explicitly, so we get a default value.
+  assert monster.Mana() == 150
+  assert monster.Hp() == 300
+  assert monster.Name() == 'Orc'
+  assert monster.Color() == MyGame.Sample.Color.Color().Red
+  assert monster.Pos().X() == 1.0
+  assert monster.Pos().Y() == 2.0
+  assert monster.Pos().Z() == 3.0
+
+  # Get and test the `inventory` FlatBuffer `vector`.
+  for i in xrange(monster.InventoryLength()):
+    assert monster.Inventory(i) == i
+
+  # Get and test the `weapons` FlatBuffer `vector` of `table`s.
+  expected_weapon_names = ['Sword', 'Axe']
+  expected_weapon_damages = [3, 5]
+  for i in xrange(monster.WeaponsLength()):
+    assert monster.Weapons(i).Name() == expected_weapon_names[i]
+    assert monster.Weapons(i).Damage() == expected_weapon_damages[i]
+
+  # Get and test the `equipped` FlatBuffer `union`.
+  assert monster.EquippedType() == MyGame.Sample.Equipment.Equipment().Weapon
+
+  # An example of how you can appropriately convert the table depending on the
+  # FlatBuffer `union` type. You could add `elif` and `else` clauses to handle
+  # the other FlatBuffer `union` types for this field.
+  if monster.EquippedType() == MyGame.Sample.Equipment.Equipment().Weapon:
+    # `monster.Equipped()` returns a `flatbuffers.Table`, which can be used
+    # to initialize a `MyGame.Sample.Weapon.Weapon()`, in this case.
+    union_weapon = MyGame.Sample.Weapon.Weapon()
+    union_weapon.Init(monster.Equipped().Bytes, monster.Equipped().Pos)
+
+    assert union_weapon.Name() == "Axe"
+    assert union_weapon.Damage() == 5
+
+  print 'The FlatBuffer was successfully created and verified!'
+
+if __name__ == '__main__':
+  main()
diff --git a/samples/sample_text.cpp b/samples/sample_text.cpp
index e1a3bf7e7..557077d4b 100644
--- a/samples/sample_text.cpp
+++ b/samples/sample_text.cpp
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-#include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
 
-#include "monster_generated.h"
+#include "monster_generated.h" // Already includes "flatbuffers/flatbuffers.h".
 
 using namespace MyGame::Sample;
 
@@ -52,4 +51,6 @@ int main(int /*argc*/, const char * /*argv*/[]) {
   if (jsongen != jsonfile) {
     printf("%s----------------\n%s", jsongen.c_str(), jsonfile.c_str());
   }
+
+  printf("The FlatBuffer has been parsed from JSON successfully.\n");
 }
diff --git a/samples/samplebinary.js b/samples/samplebinary.js
new file mode 100644
index 000000000..9c8c90892
--- /dev/null
+++ b/samples/samplebinary.js
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// To run, use the `javascript_sample.sh` script.
+
+var assert = require('assert');
+var flatbuffers = require('../js/flatbuffers').flatbuffers;
+var MyGame = require('./monster_generated').MyGame;
+
+// Example how to use FlatBuffers to create and read binary buffers.
+function main() {
+  var builder = new flatbuffers.Builder(0);
+
+  // Create some weapons for our Monster ('Sword' and 'Axe').
+  var weaponOne = builder.createString('Sword');
+  var weaponTwo = builder.createString('Axe');
+
+  MyGame.Sample.Weapon.startWeapon(builder);
+  MyGame.Sample.Weapon.addName(builder, weaponOne);
+  MyGame.Sample.Weapon.addDamage(builder, 3);
+  var sword = MyGame.Sample.Weapon.endWeapon(builder);
+
+  MyGame.Sample.Weapon.startWeapon(builder);
+  MyGame.Sample.Weapon.addName(builder, weaponTwo);
+  MyGame.Sample.Weapon.addDamage(builder, 5);
+  var axe = MyGame.Sample.Weapon.endWeapon(builder);
+
+  // Serialize the FlatBuffer data.
+  var name = builder.createString('Orc');
+
+  var treasure = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+  var inv = MyGame.Sample.Monster.createInventoryVector(builder, treasure);
+
+  var weaps = [sword, axe];
+  var weapons = MyGame.Sample.Monster.createWeaponsVector(builder, weaps);
+
+  var pos = MyGame.Sample.Vec3.createVec3(builder, 1.0, 2.0, 3.0);
+
+  MyGame.Sample.Monster.startMonster(builder);
+  MyGame.Sample.Monster.addPos(builder, pos);
+  MyGame.Sample.Monster.addHp(builder, 300);
+  MyGame.Sample.Monster.addColor(builder, MyGame.Sample.Color.Red)
+  MyGame.Sample.Monster.addName(builder, name);
+  MyGame.Sample.Monster.addInventory(builder, inv);
+  MyGame.Sample.Monster.addWeapons(builder, weapons);
+  MyGame.Sample.Monster.addEquippedType(builder, MyGame.Sample.Equipment.Weapon);
+  MyGame.Sample.Monster.addEquipped(builder, weaps[1]);
+  var orc = MyGame.Sample.Monster.endMonster(builder);
+
+  builder.finish(orc); // You may also call 'MyGame.Example.Monster.finishMonsterBuffer(builder, orc);'.
+
+  // We now have a FlatBuffer that can be stored on disk or sent over a network.
+
+  // ...Code to store to disk or send over a network goes here...
+
+  // Instead, we are going to access it right away, as if we just received it.
+
+  var buf = builder.dataBuffer();
+
+  // Get access to the root:
+  var monster = MyGame.Sample.Monster.getRootAsMonster(buf);
+
+  // Note: We did not set the `mana` field explicitly, so we get back the default value.
+  assert.equal(monster.mana(), 150);
+  assert.equal(monster.hp(), 300);
+  assert.equal(monster.name(), 'Orc');
+  assert.equal(monster.color(), MyGame.Sample.Color.Red);
+  assert.equal(monster.pos().x(), 1.0);
+  assert.equal(monster.pos().y(), 2.0);
+  assert.equal(monster.pos().z(), 3.0);
+
+  // Get and test the `inventory` FlatBuffer `vector`.
+  for (var i = 0; i < monster.inventoryLength(); i++) {
+    assert.equal(monster.inventory(i), i);
+  }
+
+  // Get and test the `weapons` FlatBuffer `vector` of `table`s.
+  var expectedWeaponNames = ['Sword', 'Axe'];
+  var expectedWeaponDamages = [3, 5];
+  for (var i = 0; i < monster.weaponsLength(); i++) {
+    assert.equal(monster.weapons(i).name(), expectedWeaponNames[i]);
+    assert.equal(monster.weapons(i).damage(), expectedWeaponDamages[i]);
+  }
+
+  // Get and test the `equipped` FlatBuffer `union`.
+  assert.equal(monster.equippedType(), MyGame.Sample.Equipment.Weapon);
+  assert.equal(monster.equipped(new MyGame.Sample.Weapon()).name(), 'Axe');
+  assert.equal(monster.equipped(new MyGame.Sample.Weapon()).damage(), 5);
+
+  console.log('The FlatBuffer was successfully created and verified!');
+}
+
+main();
diff --git a/tests/FlatBuffers.Test/Resources/monsterdata_test.mon b/tests/FlatBuffers.Test/Resources/monsterdata_test.mon
new file mode 100644
index 0000000000000000000000000000000000000000..2bf6d15865519c67c53427e86969f817c9ce35b1
GIT binary patch
literal 288
zcmZ=@U|{g|_X}oVFk|pwPyq7e7$ktC2oMW1@Gx*NumD-Off-QB1&DosxCf$)aR!jy
z0cHmP$p(8M;Q&NH3<DevObo0HY%ng6W&+|0AkKiY<rp*=xWKM31G)hM@Vf-62ugw6
u1yT>fZbhjnAYoPz!N|l65(BYIQj1HBkl2PmHYX7KR{G}W6_=zI0oedd5E4`X

literal 0
HcmV?d00001


From 0ece042162b45937919b4babc79ee651acda6e3a Mon Sep 17 00:00:00 2001
From: Mark Klara <mrhappyasthma@google.com>
Date: Tue, 19 Jan 2016 15:27:47 -0800
Subject: [PATCH 063/185] Silenced unused variable warnings.

When built for release, builds were failing with unused
variable warnings, since they were only used in `assert()`
calls.

I added explicit void casting to any potentially unused variables.

Change-Id: I9947ba46891fdda5aa925caa950642dedd4e009f
---
 samples/sample_binary.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/samples/sample_binary.cpp b/samples/sample_binary.cpp
index 5b2f603a0..4c5f01709 100644
--- a/samples/sample_binary.cpp
+++ b/samples/sample_binary.cpp
@@ -90,12 +90,15 @@ int main(int /*argc*/, const char * /*argv*/[]) {
     assert(weps->Get(i)->name()->str() == expected_weapon_names[i]);
     assert(weps->Get(i)->damage() == expected_weapon_damages[i]);
   }
+  (void)expected_weapon_names;
+  (void)expected_weapon_damages;
 
   // Get and test the `Equipment` union (`equipped` field).
   assert(monster->equipped_type() == Equipment_Weapon);
   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");
 }

From fff4590faf2a0dd57e741bb6ee4efbc7e7667a36 Mon Sep 17 00:00:00 2001
From: Oli Wilkinson <Oli Wilkinson>
Date: Wed, 20 Jan 2016 17:15:29 +0000
Subject: [PATCH 064/185] Implemented ForceDefaults option on C#
 FlatBufferBuilder.

Tested on: Windows, Unit Tests
---
 docs/source/Tutorial.md                       |   3 -
 net/FlatBuffers/FlatBufferBuilder.cs          | 129 ++++++++-
 .../FlatBufferBuilderTests.cs                 | 249 ++++++++++++++++++
 .../FlatBuffers.Test/FlatBuffers.Test.csproj  |   1 +
 4 files changed, 366 insertions(+), 16 deletions(-)
 create mode 100644 tests/FlatBuffers.Test/FlatBufferBuilderTests.cs

diff --git a/docs/source/Tutorial.md b/docs/source/Tutorial.md
index fcc208a3b..74941be8c 100644
--- a/docs/source/Tutorial.md
+++ b/docs/source/Tutorial.md
@@ -1644,9 +1644,6 @@ One way to solve this is to call `ForceDefaults` on a FlatBufferBuilder to
 force all fields you set to actually be written. This, of course, increases the
 size of the buffer somewhat, but this may be acceptable for a mutable buffer.
 
-<div class="language-csharp">
-  **Note: `ForceDefaults` is not yet implemented in C#.**
-</div>
 
 ## JSON with FlatBuffers
 
diff --git a/net/FlatBuffers/FlatBufferBuilder.cs b/net/FlatBuffers/FlatBufferBuilder.cs
index 1f9f9d5f3..c320ea8cc 100644
--- a/net/FlatBuffers/FlatBufferBuilder.cs
+++ b/net/FlatBuffers/FlatBufferBuilder.cs
@@ -77,6 +77,15 @@ namespace FlatBuffers
             _vectorNumElems = 0;
         }
 
+        /// <summary>
+        /// Gets and sets a Boolean to disable the optimization when serializing
+        /// default values to a Table.
+        /// 
+        /// In order to save space, fields that are set to their default value
+        /// don't get serialized into the buffer. 
+        /// </summary>
+        public bool ForceDefaults { get; set; }
+
         /// @cond FLATBUFFERS_INTERNAL
 
         public int Offset { get { return _bb.Length - _space; } }
@@ -332,19 +341,113 @@ namespace FlatBuffers
             _vtable[voffset] = Offset;
         }
 
-        // Add a scalar to a table at `o` into its vtable, with value `x` and default `d`
-        public void AddBool(int o, bool x, bool d) { if (x != d) { AddBool(x); Slot(o); } }
-        public void AddSbyte(int o, sbyte x, sbyte d) { if (x != d) { AddSbyte(x); Slot(o); } }
-        public void AddByte(int o, byte x, byte d) { if (x != d) { AddByte(x); Slot(o); } }
-        public void AddShort(int o, short x, int d) { if (x != d) { AddShort(x); Slot(o); } }
-        public void AddUshort(int o, ushort x, ushort d) { if (x != d) { AddUshort(x); Slot(o); } }
-        public void AddInt(int o, int x, int d) { if (x != d) { AddInt(x); Slot(o); } }
-        public void AddUint(int o, uint x, uint d) { if (x != d) { AddUint(x); Slot(o); } }
-        public void AddLong(int o, long x, long d) { if (x != d) { AddLong(x); Slot(o); } }
-        public void AddUlong(int o, ulong x, ulong d) { if (x != d) { AddUlong(x); Slot(o); } }
-        public void AddFloat(int o, float x, double d) { if (x != d) { AddFloat(x); Slot(o); } }
-        public void AddDouble(int o, double x, double d) { if (x != d) { AddDouble(x); Slot(o); } }
-        public void AddOffset(int o, int x, int d) { if (x != d) { AddOffset(x); Slot(o); } }
+        /// <summary>
+        /// Adds a Boolean to the Table at index `o` in its vtable using the value `x` and default `d`
+        /// </summary>
+        /// <param name="o">The index into the vtable</param>
+        /// <param name="x">The value to put into the buffer. If the value is equal to the default
+        /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
+        /// <param name="d">The default value to compare the value against</param>
+        public void AddBool(int o, bool x, bool d) { if (ForceDefaults || x != d) { AddBool(x); Slot(o); } }
+        
+        /// <summary>
+        /// Adds a SByte to the Table at index `o` in its vtable using the value `x` and default `d`
+        /// </summary>
+        /// <param name="o">The index into the vtable</param>
+        /// <param name="x">The value to put into the buffer. If the value is equal to the default
+        /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
+        /// <param name="d">The default value to compare the value against</param>
+        public void AddSbyte(int o, sbyte x, sbyte d) { if (ForceDefaults || x != d) { AddSbyte(x); Slot(o); } }
+        
+        /// <summary>
+        /// Adds a Byte to the Table at index `o` in its vtable using the value `x` and default `d`
+        /// </summary>
+        /// <param name="o">The index into the vtable</param>
+        /// <param name="x">The value to put into the buffer. If the value is equal to the default
+        /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
+        /// <param name="d">The default value to compare the value against</param>
+        public void AddByte(int o, byte x, byte d) { if (ForceDefaults || x != d) { AddByte(x); Slot(o); } }
+
+        /// <summary>
+        /// Adds a Int16 to the Table at index `o` in its vtable using the value `x` and default `d`
+        /// </summary>
+        /// <param name="o">The index into the vtable</param>
+        /// <param name="x">The value to put into the buffer. If the value is equal to the default
+        /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
+        /// <param name="d">The default value to compare the value against</param>
+        public void AddShort(int o, short x, int d) { if (ForceDefaults || x != d) { AddShort(x); Slot(o); } }
+
+        /// <summary>
+        /// Adds a UInt16 to the Table at index `o` in its vtable using the value `x` and default `d`
+        /// </summary>
+        /// <param name="o">The index into the vtable</param>
+        /// <param name="x">The value to put into the buffer. If the value is equal to the default
+        /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
+        /// <param name="d">The default value to compare the value against</param>
+        public void AddUshort(int o, ushort x, ushort d) { if (ForceDefaults || x != d) { AddUshort(x); Slot(o); } }
+
+        /// <summary>
+        /// Adds an Int32 to the Table at index `o` in its vtable using the value `x` and default `d`
+        /// </summary>
+        /// <param name="o">The index into the vtable</param>
+        /// <param name="x">The value to put into the buffer. If the value is equal to the default
+        /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
+        /// <param name="d">The default value to compare the value against</param>
+        public void AddInt(int o, int x, int d) { if (ForceDefaults || x != d) { AddInt(x); Slot(o); } }
+
+        /// <summary>
+        /// Adds a UInt32 to the Table at index `o` in its vtable using the value `x` and default `d`
+        /// </summary>
+        /// <param name="o">The index into the vtable</param>
+        /// <param name="x">The value to put into the buffer. If the value is equal to the default
+        /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
+        /// <param name="d">The default value to compare the value against</param>
+        public void AddUint(int o, uint x, uint d) { if (ForceDefaults || x != d) { AddUint(x); Slot(o); } }
+
+        /// <summary>
+        /// Adds an Int64 to the Table at index `o` in its vtable using the value `x` and default `d`
+        /// </summary>
+        /// <param name="o">The index into the vtable</param>
+        /// <param name="x">The value to put into the buffer. If the value is equal to the default
+        /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
+        /// <param name="d">The default value to compare the value against</param>
+        public void AddLong(int o, long x, long d) { if (ForceDefaults || x != d) { AddLong(x); Slot(o); } }
+
+        /// <summary>
+        /// Adds a UInt64 to the Table at index `o` in its vtable using the value `x` and default `d`
+        /// </summary>
+        /// <param name="o">The index into the vtable</param>
+        /// <param name="x">The value to put into the buffer. If the value is equal to the default
+        /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
+        /// <param name="d">The default value to compare the value against</param>
+        public void AddUlong(int o, ulong x, ulong d) { if (ForceDefaults || x != d) { AddUlong(x); Slot(o); } }
+
+        /// <summary>
+        /// Adds a Single to the Table at index `o` in its vtable using the value `x` and default `d`
+        /// </summary>
+        /// <param name="o">The index into the vtable</param>
+        /// <param name="x">The value to put into the buffer. If the value is equal to the default
+        /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
+        /// <param name="d">The default value to compare the value against</param>
+        public void AddFloat(int o, float x, double d) { if (ForceDefaults || x != d) { AddFloat(x); Slot(o); } }
+
+        /// <summary>
+        /// Adds a Double to the Table at index `o` in its vtable using the value `x` and default `d`
+        /// </summary>
+        /// <param name="o">The index into the vtable</param>
+        /// <param name="x">The value to put into the buffer. If the value is equal to the default
+        /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
+        /// <param name="d">The default value to compare the value against</param>
+        public void AddDouble(int o, double x, double d) { if (ForceDefaults || x != d) { AddDouble(x); Slot(o); } }
+
+        /// <summary>
+        /// Adds a buffer offset to the Table at index `o` in its vtable using the value `x` and default `d`
+        /// </summary>
+        /// <param name="o">The index into the vtable</param>
+        /// <param name="x">The value to put into the buffer. If the value is equal to the default
+        /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
+        /// <param name="d">The default value to compare the value against</param>
+        public void AddOffset(int o, int x, int d) { if (ForceDefaults || x != d) { AddOffset(x); Slot(o); } }
         /// @endcond
 
         /// <summary>
diff --git a/tests/FlatBuffers.Test/FlatBufferBuilderTests.cs b/tests/FlatBuffers.Test/FlatBufferBuilderTests.cs
new file mode 100644
index 000000000..529c813b3
--- /dev/null
+++ b/tests/FlatBuffers.Test/FlatBufferBuilderTests.cs
@@ -0,0 +1,249 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace FlatBuffers.Test
+{
+    [FlatBuffersTestClass]
+    public class FlatBufferBuilderTests
+    {
+        private FlatBufferBuilder CreateBuffer(bool forceDefaults = true)
+        {
+            var fbb = new FlatBufferBuilder(16) {ForceDefaults = forceDefaults};
+            fbb.StartObject(1);
+            return fbb;
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WithForceDefaults_WhenAddBool_AndDefaultValue_OffsetIncreasesBySize()
+        {
+            var fbb = CreateBuffer();
+            var storedOffset = fbb.Offset;
+            fbb.AddBool(0, false, false);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(sizeof(bool), endOffset-storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WithForceDefaults_WhenAddSByte_AndDefaultValue_OffsetIncreasesBySize()
+        {
+            var fbb = CreateBuffer();
+            var storedOffset = fbb.Offset;
+            fbb.AddSbyte(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(sizeof(sbyte), endOffset - storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WithForceDefaults_WhenAddByte_AndDefaultValue_OffsetIncreasesBySize()
+        {
+            var fbb = CreateBuffer();
+            var storedOffset = fbb.Offset;
+            fbb.AddByte(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(sizeof(byte), endOffset - storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WithForceDefaults_WhenAddShort_AndDefaultValue_OffsetIncreasesBySize()
+        {
+            var fbb = CreateBuffer();
+            var storedOffset = fbb.Offset;
+            fbb.AddShort(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(sizeof(short), endOffset - storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WithForceDefaults_WhenAddUShort_AndDefaultValue_OffsetIncreasesBySize()
+        {
+            var fbb = CreateBuffer();
+            var storedOffset = fbb.Offset;
+            fbb.AddUshort(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(sizeof(ushort), endOffset - storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WithForceDefaults_WhenAddInt_AndDefaultValue_OffsetIncreasesBySize()
+        {
+            var fbb = CreateBuffer();
+            var storedOffset = fbb.Offset;
+            fbb.AddInt(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(sizeof(int), endOffset - storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WithForceDefaults_WhenAddUInt_AndDefaultValue_OffsetIncreasesBySize()
+        {
+            var fbb = CreateBuffer();
+            var storedOffset = fbb.Offset;
+            fbb.AddUint(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(sizeof(uint), endOffset - storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WithForceDefaults_WhenAddLong_AndDefaultValue_OffsetIncreasesBySize()
+        {
+            var fbb = CreateBuffer();
+            var storedOffset = fbb.Offset;
+            fbb.AddLong(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(sizeof(long), endOffset - storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WithForceDefaults_WhenAddULong_AndDefaultValue_OffsetIncreasesBySize()
+        {
+            var fbb = CreateBuffer();
+            var storedOffset = fbb.Offset;
+            fbb.AddUlong(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(sizeof(ulong), endOffset - storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WithForceDefaults_WhenAddFloat_AndDefaultValue_OffsetIncreasesBySize()
+        {
+            var fbb = CreateBuffer();
+            var storedOffset = fbb.Offset;
+            fbb.AddFloat(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(sizeof(float), endOffset - storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WithForceDefaults_WhenAddDouble_AndDefaultValue_OffsetIncreasesBySize()
+        {
+            var fbb = CreateBuffer();
+            var storedOffset = fbb.Offset;
+            fbb.AddDouble(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(sizeof(double), endOffset - storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WhenAddBool_AndDefaultValue_OffsetIsUnchanged()
+        {
+            var fbb = CreateBuffer(false);
+            var storedOffset = fbb.Offset;
+            fbb.AddBool(0, false, false);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(endOffset, storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WhenAddSByte_AndDefaultValue_OffsetIsUnchanged()
+        {
+            var fbb = CreateBuffer(false);
+            var storedOffset = fbb.Offset;
+            fbb.AddSbyte(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(endOffset, storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WhenAddByte_AndDefaultValue_OffsetIsUnchanged()
+        {
+            var fbb = CreateBuffer(false);
+            var storedOffset = fbb.Offset;
+            fbb.AddByte(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(endOffset, storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WhenAddShort_AndDefaultValue_OffsetIsUnchanged()
+        {
+            var fbb = CreateBuffer(false);
+            var storedOffset = fbb.Offset;
+            fbb.AddShort(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(endOffset, storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WhenAddUShort_AndDefaultValue_OffsetIsUnchanged()
+        {
+            var fbb = CreateBuffer(false);
+            var storedOffset = fbb.Offset;
+            fbb.AddUshort(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(endOffset, storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WhenAddInt_AndDefaultValue_OffsetIsUnchanged()
+        {
+            var fbb = CreateBuffer(false);
+            var storedOffset = fbb.Offset;
+            fbb.AddInt(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(endOffset, storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WhenAddUInt_AndDefaultValue_OffsetIsUnchanged()
+        {
+            var fbb = CreateBuffer(false);
+            var storedOffset = fbb.Offset;
+            fbb.AddUint(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(endOffset, storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WhenAddLong_AndDefaultValue_OffsetIsUnchanged()
+        {
+            var fbb = CreateBuffer(false);
+            var storedOffset = fbb.Offset;
+            fbb.AddLong(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(endOffset, storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WhenAddULong_AndDefaultValue_OffsetIsUnchanged()
+        {
+            var fbb = CreateBuffer(false);
+            var storedOffset = fbb.Offset;
+            fbb.AddUlong(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(endOffset, storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WhenAddFloat_AndDefaultValue_OffsetIsUnchanged()
+        {
+            var fbb = CreateBuffer(false);
+            var storedOffset = fbb.Offset;
+            fbb.AddFloat(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(endOffset, storedOffset);
+        }
+
+        [FlatBuffersTestMethod]
+        public void FlatBufferBuilder_WhenAddDouble_AndDefaultValue_OffsetIsUnchanged()
+        {
+            var fbb = CreateBuffer(false);
+            var storedOffset = fbb.Offset;
+            fbb.AddDouble(0, 0, 0);
+            var endOffset = fbb.Offset;
+            Assert.AreEqual(endOffset, storedOffset);
+        }
+    }
+}
diff --git a/tests/FlatBuffers.Test/FlatBuffers.Test.csproj b/tests/FlatBuffers.Test/FlatBuffers.Test.csproj
index 13b1faaee..4055fa6ab 100644
--- a/tests/FlatBuffers.Test/FlatBuffers.Test.csproj
+++ b/tests/FlatBuffers.Test/FlatBuffers.Test.csproj
@@ -91,6 +91,7 @@
     </Compile>
     <Compile Include="Assert.cs" />
     <Compile Include="ByteBufferTests.cs" />
+    <Compile Include="FlatBufferBuilderTests.cs" />
     <Compile Include="FlatBuffersFuzzTests.cs" />
     <Compile Include="FlatBuffersTestClassAttribute.cs" />
     <Compile Include="FlatBuffersTestMethodAttribute.cs" />

From 112a619ec1ec4833182e416e074fef14ed7ccb55 Mon Sep 17 00:00:00 2001
From: Oli Wilkinson <Oli Wilkinson>
Date: Wed, 20 Jan 2016 18:44:44 +0000
Subject: [PATCH 065/185] Disabled assignment operator of TableKeyComparator;
 was causing warning C4512 on VS2010 and thus causing the build to fail.

---
 include/flatbuffers/flatbuffers.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 8f4ff7563..14a055e8b 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -938,6 +938,9 @@ FLATBUFFERS_FINAL_CLASS
       return table_a->KeyCompareLessThan(table_b);
     }
     vector_downward& buf_;
+
+  private:
+    TableKeyComparator& operator= (const TableKeyComparator&);
   };
   /// @endcond
 

From 519dcdd0b2dbdec00e72a6be1894b850ce419955 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 20 Jan 2016 13:04:03 -0800
Subject: [PATCH 066/185] Fixed Python unit test breakage.

Test was testing for a field to be None, even though it is populated
in one particular instance.

Change-Id: Id19848d01498d4c0a684efdb2bf49ff12c5b6758
Tested: on Linux.
---
 tests/py_test.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/py_test.py b/tests/py_test.py
index cce317989..5828841a0 100644
--- a/tests/py_test.py
+++ b/tests/py_test.py
@@ -152,8 +152,6 @@ def CheckReadBuffer(buf, offset):
     asserter(monster.Testarrayofstring(0) == b"test1")
     asserter(monster.Testarrayofstring(1) == b"test2")
 
-    asserter(monster.Enemy() is None)
-
     asserter(monster.TestarrayoftablesLength() == 0)
     asserter(monster.TestnestedflatbufferLength() == 0)
     asserter(monster.Testempty() is None)
@@ -1274,7 +1272,7 @@ def BenchmarkMakeMonsterFromGeneratedCode(count, length):
 
 def backward_compatible_run_tests(**kwargs):
     if PY_VERSION < (2, 6):
-        sys.stderr.write("Python version less than 2.6 are not supported") 
+        sys.stderr.write("Python version less than 2.6 are not supported")
         sys.stderr.flush()
         return False
 
@@ -1287,7 +1285,7 @@ def backward_compatible_run_tests(**kwargs):
                 return False
         return True
 
-    # python2.7 and above let us not exit once unittest.main is run: 
+    # python2.7 and above let us not exit once unittest.main is run:
     kwargs['exit'] = False
     kwargs['verbosity'] = 0
     ret = unittest.main(**kwargs)

From 9a54c44742705c6360f73051c53455cbba67d83c Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 20 Jan 2016 18:09:53 -0800
Subject: [PATCH 067/185] Re-Added accidentally deleted sample generated file.

Change-Id: Ie3b31719f7b133ec4aea64f00f2029566558cb18
Tested: Linux.
---
 samples/monster_generated.h | 202 ++++++++++++++++++++++++++++++++++++
 1 file changed, 202 insertions(+)
 create mode 100644 samples/monster_generated.h

diff --git a/samples/monster_generated.h b/samples/monster_generated.h
new file mode 100644
index 000000000..cf45bbb91
--- /dev/null
+++ b/samples/monster_generated.h
@@ -0,0 +1,202 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+#ifndef FLATBUFFERS_GENERATED_MONSTER_MYGAME_SAMPLE_H_
+#define FLATBUFFERS_GENERATED_MONSTER_MYGAME_SAMPLE_H_
+
+#include "flatbuffers/flatbuffers.h"
+
+
+namespace MyGame {
+namespace Sample {
+
+struct Vec3;
+struct Monster;
+struct Weapon;
+
+enum Color {
+  Color_Red = 0,
+  Color_Green = 1,
+  Color_Blue = 2,
+  Color_MIN = Color_Red,
+  Color_MAX = Color_Blue
+};
+
+inline const char **EnumNamesColor() {
+  static const char *names[] = { "Red", "Green", "Blue", nullptr };
+  return names;
+}
+
+inline const char *EnumNameColor(Color e) { return EnumNamesColor()[static_cast<int>(e)]; }
+
+enum Equipment {
+  Equipment_NONE = 0,
+  Equipment_Weapon = 1,
+  Equipment_MIN = Equipment_NONE,
+  Equipment_MAX = Equipment_Weapon
+};
+
+inline const char **EnumNamesEquipment() {
+  static const char *names[] = { "NONE", "Weapon", nullptr };
+  return names;
+}
+
+inline const char *EnumNameEquipment(Equipment e) { return EnumNamesEquipment()[static_cast<int>(e)]; }
+
+inline bool VerifyEquipment(flatbuffers::Verifier &verifier, const void *union_obj, Equipment type);
+
+MANUALLY_ALIGNED_STRUCT(4) Vec3 FLATBUFFERS_FINAL_CLASS {
+ private:
+  float x_;
+  float y_;
+  float z_;
+
+ public:
+  Vec3(float _x, float _y, float _z)
+    : x_(flatbuffers::EndianScalar(_x)), y_(flatbuffers::EndianScalar(_y)), z_(flatbuffers::EndianScalar(_z)) { }
+
+  float x() const { return flatbuffers::EndianScalar(x_); }
+  float y() const { return flatbuffers::EndianScalar(y_); }
+  float z() const { return flatbuffers::EndianScalar(z_); }
+};
+STRUCT_END(Vec3, 12);
+
+struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  enum {
+    VT_POS = 4,
+    VT_MANA = 6,
+    VT_HP = 8,
+    VT_NAME = 10,
+    VT_INVENTORY = 14,
+    VT_COLOR = 16,
+    VT_WEAPONS = 18,
+    VT_EQUIPPED_TYPE = 20,
+    VT_EQUIPPED = 22
+  };
+  const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
+  int16_t mana() const { return GetField<int16_t>(VT_MANA, 150); }
+  int16_t hp() const { return GetField<int16_t>(VT_HP, 100); }
+  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
+  const flatbuffers::Vector<uint8_t> *inventory() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); }
+  Color color() const { return static_cast<Color>(GetField<int8_t>(VT_COLOR, 2)); }
+  const flatbuffers::Vector<flatbuffers::Offset<Weapon>> *weapons() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Weapon>> *>(VT_WEAPONS); }
+  Equipment equipped_type() const { return static_cast<Equipment>(GetField<uint8_t>(VT_EQUIPPED_TYPE, 0)); }
+  const void *equipped() const { return GetPointer<const void *>(VT_EQUIPPED); }
+  bool Verify(flatbuffers::Verifier &verifier) const {
+    return VerifyTableStart(verifier) &&
+           VerifyField<Vec3>(verifier, VT_POS) &&
+           VerifyField<int16_t>(verifier, VT_MANA) &&
+           VerifyField<int16_t>(verifier, VT_HP) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
+           verifier.Verify(name()) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_INVENTORY) &&
+           verifier.Verify(inventory()) &&
+           VerifyField<int8_t>(verifier, VT_COLOR) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_WEAPONS) &&
+           verifier.Verify(weapons()) &&
+           verifier.VerifyVectorOfTables(weapons()) &&
+           VerifyField<uint8_t>(verifier, VT_EQUIPPED_TYPE) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_EQUIPPED) &&
+           VerifyEquipment(verifier, equipped(), equipped_type()) &&
+           verifier.EndTable();
+  }
+};
+
+struct MonsterBuilder {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_pos(const Vec3 *pos) { fbb_.AddStruct(Monster::VT_POS, pos); }
+  void add_mana(int16_t mana) { fbb_.AddElement<int16_t>(Monster::VT_MANA, mana, 150); }
+  void add_hp(int16_t hp) { fbb_.AddElement<int16_t>(Monster::VT_HP, hp, 100); }
+  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(Monster::VT_NAME, name); }
+  void add_inventory(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory) { fbb_.AddOffset(Monster::VT_INVENTORY, inventory); }
+  void add_color(Color color) { fbb_.AddElement<int8_t>(Monster::VT_COLOR, static_cast<int8_t>(color), 2); }
+  void add_weapons(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Weapon>>> weapons) { fbb_.AddOffset(Monster::VT_WEAPONS, weapons); }
+  void add_equipped_type(Equipment equipped_type) { fbb_.AddElement<uint8_t>(Monster::VT_EQUIPPED_TYPE, static_cast<uint8_t>(equipped_type), 0); }
+  void add_equipped(flatbuffers::Offset<void> equipped) { fbb_.AddOffset(Monster::VT_EQUIPPED, equipped); }
+  MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
+  MonsterBuilder &operator=(const MonsterBuilder &);
+  flatbuffers::Offset<Monster> Finish() {
+    auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 10));
+    return o;
+  }
+};
+
+inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder &_fbb,
+   const Vec3 *pos = 0,
+   int16_t mana = 150,
+   int16_t hp = 100,
+   flatbuffers::Offset<flatbuffers::String> name = 0,
+   flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory = 0,
+   Color color = Color_Blue,
+   flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Weapon>>> weapons = 0,
+   Equipment equipped_type = Equipment_NONE,
+   flatbuffers::Offset<void> equipped = 0) {
+  MonsterBuilder builder_(_fbb);
+  builder_.add_equipped(equipped);
+  builder_.add_weapons(weapons);
+  builder_.add_inventory(inventory);
+  builder_.add_name(name);
+  builder_.add_pos(pos);
+  builder_.add_hp(hp);
+  builder_.add_mana(mana);
+  builder_.add_equipped_type(equipped_type);
+  builder_.add_color(color);
+  return builder_.Finish();
+}
+
+struct Weapon FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  enum {
+    VT_NAME = 4,
+    VT_DAMAGE = 6
+  };
+  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
+  int16_t damage() const { return GetField<int16_t>(VT_DAMAGE, 0); }
+  bool Verify(flatbuffers::Verifier &verifier) const {
+    return VerifyTableStart(verifier) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
+           verifier.Verify(name()) &&
+           VerifyField<int16_t>(verifier, VT_DAMAGE) &&
+           verifier.EndTable();
+  }
+};
+
+struct WeaponBuilder {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(Weapon::VT_NAME, name); }
+  void add_damage(int16_t damage) { fbb_.AddElement<int16_t>(Weapon::VT_DAMAGE, damage, 0); }
+  WeaponBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
+  WeaponBuilder &operator=(const WeaponBuilder &);
+  flatbuffers::Offset<Weapon> Finish() {
+    auto o = flatbuffers::Offset<Weapon>(fbb_.EndTable(start_, 2));
+    return o;
+  }
+};
+
+inline flatbuffers::Offset<Weapon> CreateWeapon(flatbuffers::FlatBufferBuilder &_fbb,
+   flatbuffers::Offset<flatbuffers::String> name = 0,
+   int16_t damage = 0) {
+  WeaponBuilder builder_(_fbb);
+  builder_.add_name(name);
+  builder_.add_damage(damage);
+  return builder_.Finish();
+}
+
+inline bool VerifyEquipment(flatbuffers::Verifier &verifier, const void *union_obj, Equipment type) {
+  switch (type) {
+    case Equipment_NONE: return true;
+    case Equipment_Weapon: return verifier.VerifyTable(reinterpret_cast<const Weapon *>(union_obj));
+    default: return false;
+  }
+}
+
+inline const MyGame::Sample::Monster *GetMonster(const void *buf) { return flatbuffers::GetRoot<MyGame::Sample::Monster>(buf); }
+
+inline bool VerifyMonsterBuffer(flatbuffers::Verifier &verifier) { return verifier.VerifyBuffer<MyGame::Sample::Monster>(); }
+
+inline void FinishMonsterBuffer(flatbuffers::FlatBufferBuilder &fbb, flatbuffers::Offset<MyGame::Sample::Monster> root) { fbb.Finish(root); }
+
+}  // namespace Sample
+}  // namespace MyGame
+
+#endif  // FLATBUFFERS_GENERATED_MONSTER_MYGAME_SAMPLE_H_

From dbf670237125947bf50457786a79ec95b1a3605e Mon Sep 17 00:00:00 2001
From: Oli Wilkinson <Oli Wilkinson>
Date: Thu, 21 Jan 2016 15:30:13 +0000
Subject: [PATCH 068/185] Added support for C# partial class generation when
 the `csharp_partial` attribute is used on a table/struct.

---
 include/flatbuffers/idl.h                       |  1 +
 src/idl_gen_general.cpp                         | 10 +++++++++-
 tests/MyGame/Example/TestSimpleTableWithEnum.cs |  2 +-
 tests/monster_test.fbs                          |  2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index 25d381f8f..e16d3ca90 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -403,6 +403,7 @@ class Parser {
     known_attributes_.insert("bit_flags");
     known_attributes_.insert("original_order");
     known_attributes_.insert("nested_flatbuffer");
+    known_attributes_.insert("csharp_partial");
   }
 
   ~Parser() {
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index c8dbd1d95..e663ddb52 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -659,7 +659,15 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
   //   int o = __offset(offset); return o != 0 ? bb.getType(o + i) : default;
   // }
   GenComment(struct_def.doc_comment, code_ptr, &lang.comment_config);
-  code += std::string("public ") + lang.unsubclassable_decl;
+  code += "public ";
+  if (lang.language == IDLOptions::kCSharp &&
+      struct_def.attributes.Lookup("csharp_partial")) {
+    // generate a partial class for this C# struct/table
+    code += "partial ";
+  }
+  else {
+    code += lang.unsubclassable_decl;
+  }
   code += "class " + struct_def.name + lang.inheritance_marker;
   code += struct_def.fixed ? "Struct" : "Table";
   code += " {\n";
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.cs b/tests/MyGame/Example/TestSimpleTableWithEnum.cs
index daaa0b97a..c1bf571f8 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.cs
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.cs
@@ -6,7 +6,7 @@ namespace MyGame.Example
 using System;
 using FlatBuffers;
 
-public sealed class TestSimpleTableWithEnum : Table {
+public partial class TestSimpleTableWithEnum : Table {
   public static TestSimpleTableWithEnum GetRootAsTestSimpleTableWithEnum(ByteBuffer _bb) { return GetRootAsTestSimpleTableWithEnum(_bb, new TestSimpleTableWithEnum()); }
   public static TestSimpleTableWithEnum GetRootAsTestSimpleTableWithEnum(ByteBuffer _bb, TestSimpleTableWithEnum obj) { return (obj.__init(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
   public TestSimpleTableWithEnum __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
diff --git a/tests/monster_test.fbs b/tests/monster_test.fbs
index 6fe5f25db..27f35f3a1 100755
--- a/tests/monster_test.fbs
+++ b/tests/monster_test.fbs
@@ -12,7 +12,7 @@ union Any { Monster, TestSimpleTableWithEnum }  // TODO: add more elements
 
 struct Test { a:short; b:byte; }
 
-table TestSimpleTableWithEnum {
+table TestSimpleTableWithEnum (csharp_partial) {
   color: Color = Green;
 }
 

From 8b4c0b94dc61051a4aa0533ecf20ebbed0433667 Mon Sep 17 00:00:00 2001
From: Mandar <01.mandar@gmail.com>
Date: Fri, 22 Jan 2016 22:27:47 +0530
Subject: [PATCH 069/185] Update readme.md

---
 readme.md | 52 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/readme.md b/readme.md
index eb3b565cd..91a2b38ce 100755
--- a/readme.md
+++ b/readme.md
@@ -1,36 +1,49 @@
-FlatBuffers Version 1.2.0
+![logo](http://google.github.io/flatbuffers/fpl_logo_small.png) FlatBuffers [![Build Status](https://travis-ci.org/google/flatbuffers.svg?branch=master)](https://travis-ci.org/google/flatbuffers) 
+===========
+**FlatBuffers** is an efficient cross platform serialization library for games and 
+other memory constrained apps. It allows you to directly access serialized data without 
+unpacking/parsing it first, while still having great forwards/backwards compatibility. 
 
-# Welcome to FlatBuffers!
+**Go to our [landing page][] to browse our documentation.**
 
-## Build Status
+## Supported operating systems
+* Android
+* Windows
+* MacOS X
+* Linux
+ 
+## Supported programming languages
+* C++
+* C#
+* Go
+* Java
+* JavaScript
+* PHP
+* Python
+* C (in progress)
+* Ruby (in progress)
 
-- Travis: [![Build Status](https://travis-ci.org/google/flatbuffers.svg?branch=master)](https://travis-ci.org/google/flatbuffers)
 
-----
+## Contribution 
+* [FlatBuffers Google Group][] to discuss FlatBuffers with other developers and users.
+* [FlatBuffers Issues Tracker][] to submit an issue.
+* [stackoverflow.com][] with [`flatbuffers` tag][] for any questions regarding FlatBuffers.
 
-FlatBuffers is a serialization library for games and other memory constrained
-apps. Go to our [landing page][] to browse our documentation.
-
-FlatBuffers allows you to directly access serialized data without
-unpacking/parsing it first, while still having great forwards/backwards
-compatibility. FlatBuffers can be built for many different systems (Android,
-Windows, OS X, Linux), see `docs/html/index.html`
-
-Discuss FlatBuffers with other developers and users on the
-[FlatBuffers Google Group][]. File issues on the [FlatBuffers Issues Tracker][]
-or post your questions to [stackoverflow.com][] using the [`flatbuffers` tag][].
-
-To contribute to this project, see [CONTRIBUTING][].
+*To contribute to this project,* see [CONTRIBUTING][].
 
+## Integration
 For applications on Google Play that integrate this tool, usage is tracked.
 This tracking is done automatically using the embedded version string
-(flatbuffer_version_string), and helps us continue to optimize it. Aside from
+(**`flatbuffer_version_string`**), and helps us continue to optimize it. Aside from
 consuming a few extra bytes in your application binary, it shouldn't affect
 your application at all.  We use this information to let us know if FlatBuffers
 is useful and if we should continue to invest in it. Since this is open
 source, you are free to remove the version string but we would appreciate if
 you would leave it in.
 
+## Licensing
+*Flatbuffers* is licensed under the Apache License, Version 2.0. See [LICENSE][] for the full license text.
+
 <br>
 
    [CONTRIBUTING]: http://github.com/google/flatbuffers/blob/master/CONTRIBUTING
@@ -39,3 +52,4 @@ you would leave it in.
    [FlatBuffers Issues Tracker]: http://github.com/google/flatbuffers/issues
    [stackoverflow.com]: http://www.stackoverflow.com
    [landing page]: http://google.github.io/flatbuffers
+   [LICENSE]: https://github.com/google/flatbuffers/blob/master/LICENSE.txt

From e43d127effaa901b6d38e63030181f90e5455c26 Mon Sep 17 00:00:00 2001
From: Eddie Scholtz <eascholtz@gmail.com>
Date: Fri, 29 Jan 2016 15:01:54 -0800
Subject: [PATCH 070/185] Add -v --version arg support to the flatc command.

---
 src/flatc.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/flatc.cpp b/src/flatc.cpp
index fa8bdf343..f42baba20 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -19,6 +19,8 @@
 #include "flatbuffers/util.h"
 #include <limits>
 
+#define FLATC_VERSION "1.2.0"
+
 static void Error(const std::string &err, bool usage = false,
                   bool show_exe_name = true);
 
@@ -97,6 +99,7 @@ static void Error(const std::string &err, bool usage, bool show_exe_name) {
       "  -o PATH         Prefix PATH to all generated files.\n"
       "  -I PATH         Search for includes in the specified path.\n"
       "  -M              Print make rules for generated files.\n"
+      "  -v, --version   Print the version number of flatc and exit.\n"
       "  --strict-json   Strict JSON: field names must be / will be quoted,\n"
       "                  no trailing commas in tables/vectors.\n"
       "  --defaults-json Output fields whose value is the default when\n"
@@ -188,6 +191,9 @@ int main(int argc, const char *argv[]) {
         schema_binary = true;
       } else if(arg == "-M") {
         print_make_rules = true;
+      } else if(arg == "-v" || arg == "--version") {
+        printf("flatc version %s\n", FLATC_VERSION);
+        exit(0);
       } else {
         for (size_t i = 0; i < num_generators; ++i) {
           if (arg == generators[i].generator_opt_long ||

From 757d830f4e2ab71e18fc77251065ddfc157cd597 Mon Sep 17 00:00:00 2001
From: Mandar <01.mandar@gmail.com>
Date: Tue, 2 Feb 2016 00:18:00 +0530
Subject: [PATCH 071/185] Updated text in section "Supported programming
 languages"

---
 readme.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 91a2b38ce..4806f9d07 100755
--- a/readme.md
+++ b/readme.md
@@ -20,9 +20,8 @@ unpacking/parsing it first, while still having great forwards/backwards compatib
 * JavaScript
 * PHP
 * Python
-* C (in progress)
-* Ruby (in progress)
 
+*and many more in progress...*
 
 ## Contribution 
 * [FlatBuffers Google Group][] to discuss FlatBuffers with other developers and users.

From 0b3cd33e550fabdcde76739d40abf9c6c55f7fa3 Mon Sep 17 00:00:00 2001
From: Eddie Scholtz <eascholtz@gmail.com>
Date: Mon, 1 Feb 2016 13:43:05 -0800
Subject: [PATCH 072/185] Add __DATE__ to FLATC_VERSION based on PR feedback.

---
 src/flatc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/flatc.cpp b/src/flatc.cpp
index f42baba20..d66239c32 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -19,7 +19,7 @@
 #include "flatbuffers/util.h"
 #include <limits>
 
-#define FLATC_VERSION "1.2.0"
+#define FLATC_VERSION "1.2.0 (" __DATE__ ")"
 
 static void Error(const std::string &err, bool usage = false,
                   bool show_exe_name = true);

From ac655b3ff0ab9a7901f03c0b2a21e57e0e564b79 Mon Sep 17 00:00:00 2001
From: Eddie Scholtz <eascholtz@gmail.com>
Date: Mon, 1 Feb 2016 13:54:09 -0800
Subject: [PATCH 073/185] Remove -v as option for printing version # (based on
 PR feedback).

---
 src/flatc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/flatc.cpp b/src/flatc.cpp
index d66239c32..a49361246 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -99,7 +99,7 @@ static void Error(const std::string &err, bool usage, bool show_exe_name) {
       "  -o PATH         Prefix PATH to all generated files.\n"
       "  -I PATH         Search for includes in the specified path.\n"
       "  -M              Print make rules for generated files.\n"
-      "  -v, --version   Print the version number of flatc and exit.\n"
+      "  --version       Print the version number of flatc and exit.\n"
       "  --strict-json   Strict JSON: field names must be / will be quoted,\n"
       "                  no trailing commas in tables/vectors.\n"
       "  --defaults-json Output fields whose value is the default when\n"
@@ -191,7 +191,7 @@ int main(int argc, const char *argv[]) {
         schema_binary = true;
       } else if(arg == "-M") {
         print_make_rules = true;
-      } else if(arg == "-v" || arg == "--version") {
+      } else if(arg == "--version") {
         printf("flatc version %s\n", FLATC_VERSION);
         exit(0);
       } else {

From 38662548c74f8c844ca30c99f5753cd8309b2d08 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 3 Feb 2016 10:52:33 -0800
Subject: [PATCH 074/185] Bumped version to 1.3.0

Change-Id: I080041e533153b2bb2db53f030761852e95c88fa
---
 src/flatc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/flatc.cpp b/src/flatc.cpp
index a49361246..c0696dd46 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -19,7 +19,7 @@
 #include "flatbuffers/util.h"
 #include <limits>
 
-#define FLATC_VERSION "1.2.0 (" __DATE__ ")"
+#define FLATC_VERSION "1.3.0 (" __DATE__ ")"
 
 static void Error(const std::string &err, bool usage = false,
                   bool show_exe_name = true);

From a88cf317fdc2c69ec891d9dd48da8fa33ad5d5f5 Mon Sep 17 00:00:00 2001
From: rw <me@rwinslow.com>
Date: Mon, 8 Feb 2016 14:15:02 -0800
Subject: [PATCH 075/185] Python: remove ctypes dependency in runtime library.

---
 python/flatbuffers/encode.py       | 2 --
 python/flatbuffers/number_types.py | 2 --
 2 files changed, 4 deletions(-)

diff --git a/python/flatbuffers/encode.py b/python/flatbuffers/encode.py
index 2f3be266d..1aa9230e3 100644
--- a/python/flatbuffers/encode.py
+++ b/python/flatbuffers/encode.py
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import ctypes
-
 from . import number_types as N
 from . import packer
 from .compat import memoryview_type
diff --git a/python/flatbuffers/number_types.py b/python/flatbuffers/number_types.py
index 9d42591f5..a9605deec 100644
--- a/python/flatbuffers/number_types.py
+++ b/python/flatbuffers/number_types.py
@@ -12,10 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import ctypes
 import collections
 import struct
-from ctypes import sizeof
 
 from . import packer
 

From d779308b3e48124dae91896700bf3cc12b5251e3 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 10 Feb 2016 11:25:31 -0800
Subject: [PATCH 076/185] Fixed enum declaration values being parsed as int.

This caused values in the uint range to be made negative values.

Change-Id: Ia4284747f48508b589c034ff3aae0d141e96eb3c
Tested: on Linux.
---
 src/idl_parser.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index a133b75cb..622a1f61b 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -1082,7 +1082,7 @@ CheckedError Parser::ParseEnum(bool is_union, EnumDef **dest) {
       }
       if (Is('=')) {
         NEXT();
-        ev.value = atoi(attribute_.c_str());
+        ev.value = StringToInt(attribute_.c_str());
         EXPECT(kTokenIntegerConstant);
         if (!opts.proto_mode && prevsize &&
             enum_def.vals.vec[prevsize - 1]->value >= ev.value)
@@ -1146,7 +1146,7 @@ CheckedError Parser::CheckClash(std::vector<FieldDef*> &fields,
   }
   return NoError();
 }
-    
+
 static bool compareFieldDefs(const FieldDef *a, const FieldDef *b) {
   auto a_id = atoi(a->attributes.Lookup("id")->constant.c_str());
   auto b_id = atoi(b->attributes.Lookup("id")->constant.c_str());
@@ -1307,7 +1307,7 @@ CheckedError Parser::ParseProtoDecl() {
     if (Is(';')) NEXT();
     // Protobuf allows them to be specified in any order, so sort afterwards.
     auto &v = enum_def->vals.vec;
-    std::sort(v.begin(), v.end(), compareEnumVals);    
+    std::sort(v.begin(), v.end(), compareEnumVals);
 
     // Temp: remove any duplicates, as .fbs files can't handle them.
     for (auto it = v.begin(); it != v.end(); ) {

From 697cad702719b80e16fd10aef418eaec80b424b9 Mon Sep 17 00:00:00 2001
From: maurice barnum <msb@yahoo-inc.com>
Date: Thu, 11 Feb 2016 00:03:53 +0000
Subject: [PATCH 077/185] fix gcc-4.4 build: -Werror=unused-result is not
 supported

---
 CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 511860802..e8449caa8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,11 @@ if(APPLE)
     "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
 elseif(CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra -Werror=shadow -Wunused-result -Werror=unused-result")
+    "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra -Werror=shadow")
+  if (GCC_VERSION VERSION_GREATER 4.4)
+    set(CMAKE_CXX_FLAGS
+      "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result")
+  endif()
 elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   set(CMAKE_CXX_FLAGS
       "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror -Wextra")

From 2f5d7ae64580c016f66a4c442b3bafb6e31a926d Mon Sep 17 00:00:00 2001
From: Robert Nix <mischanix@gmail.com>
Date: Fri, 12 Feb 2016 12:12:54 -0600
Subject: [PATCH 078/185] Fix javascript unicode test

The generated buffer should be tested for semantic equivalence
to the correct buffer, instead of being tested for bytewise
equality.
---
 tests/JavaScriptTest.js | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/tests/JavaScriptTest.js b/tests/JavaScriptTest.js
index 8eb50f3c5..0f4f23351 100644
--- a/tests/JavaScriptTest.js
+++ b/tests/JavaScriptTest.js
@@ -122,21 +122,23 @@ function testUnicode() {
   var json = JSON.parse(fs.readFileSync('unicode_test.json', 'utf8'));
 
   // Test reading
-  var bb = new flatbuffers.ByteBuffer(new Uint8Array(correct));
-  var monster = MyGame.Example.Monster.getRootAsMonster(bb);
-  assert.strictEqual(monster.name(), json.name);
-  assert.deepEqual(new Buffer(monster.name(flatbuffers.Encoding.UTF8_BYTES)), new Buffer(json.name));
-  assert.strictEqual(monster.testarrayoftablesLength(), json.testarrayoftables.length);
-  json.testarrayoftables.forEach(function(table, i) {
-    var value = monster.testarrayoftables(i);
-    assert.strictEqual(value.name(), table.name);
-    assert.deepEqual(new Buffer(value.name(flatbuffers.Encoding.UTF8_BYTES)), new Buffer(table.name));
-  });
-  assert.strictEqual(monster.testarrayofstringLength(), json.testarrayofstring.length);
-  json.testarrayofstring.forEach(function(string, i) {
-    assert.strictEqual(monster.testarrayofstring(i), string);
-    assert.deepEqual(new Buffer(monster.testarrayofstring(i, flatbuffers.Encoding.UTF8_BYTES)), new Buffer(string));
-  });
+  function testReadingUnicode(bb) {
+    var monster = MyGame.Example.Monster.getRootAsMonster(bb);
+    assert.strictEqual(monster.name(), json.name);
+    assert.deepEqual(new Buffer(monster.name(flatbuffers.Encoding.UTF8_BYTES)), new Buffer(json.name));
+    assert.strictEqual(monster.testarrayoftablesLength(), json.testarrayoftables.length);
+    json.testarrayoftables.forEach(function(table, i) {
+      var value = monster.testarrayoftables(i);
+      assert.strictEqual(value.name(), table.name);
+      assert.deepEqual(new Buffer(value.name(flatbuffers.Encoding.UTF8_BYTES)), new Buffer(table.name));
+    });
+    assert.strictEqual(monster.testarrayofstringLength(), json.testarrayofstring.length);
+    json.testarrayofstring.forEach(function(string, i) {
+      assert.strictEqual(monster.testarrayofstring(i), string);
+      assert.deepEqual(new Buffer(monster.testarrayofstring(i, flatbuffers.Encoding.UTF8_BYTES)), new Buffer(string));
+    });
+  }
+  testReadingUnicode(new flatbuffers.ByteBuffer(new Uint8Array(correct)));
 
   // Test writing
   var fbb = new flatbuffers.Builder();
@@ -156,7 +158,7 @@ function testUnicode() {
   MyGame.Example.Monster.addTestarrayoftables(fbb, testarrayoftablesOffset);
   MyGame.Example.Monster.addName(fbb, name);
   MyGame.Example.Monster.finishMonsterBuffer(fbb, MyGame.Example.Monster.endMonster(fbb));
-  assert.deepEqual(new Buffer(fbb.asUint8Array()), correct);
+  testReadingUnicode(new flatbuffers.ByteBuffer(fbb.asUint8Array()));
 }
 
 var __imul = Math.imul ? Math.imul : function(a, b) {

From 9d92aeb182527989cd943fd1998d8669eea7d70d Mon Sep 17 00:00:00 2001
From: Robert Nix <mischanix@gmail.com>
Date: Fri, 12 Feb 2016 12:27:28 -0600
Subject: [PATCH 079/185] Add helper for javascript typed arrays

For scalar vector fields, emit an Array helper that
returns a typed array view of the underlying bytes buffer.
---
 src/idl_gen_js.cpp              | 14 +++++++++++++-
 tests/JavaScriptTest.js         |  7 +++++++
 tests/monster_test_generated.js | 24 ++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp
index 7efc39571..995364a6f 100644
--- a/src/idl_gen_js.cpp
+++ b/src/idl_gen_js.cpp
@@ -511,12 +511,24 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
     }
     code += "};\n\n";
 
-    // Emit a length helper
+    // Emit vector helpers
     if (field.value.type.base_type == BASE_TYPE_VECTOR) {
+      // Emit a length helper
       GenDocComment(code_ptr, "@returns {number}");
       code += object_name + ".prototype." + MakeCamel(field.name, false);
       code += "Length = function() {\n" + offset_prefix;
       code += "this.bb.__vector_len(this.bb_pos + offset) : 0;\n};\n\n";
+
+      // For scalar types, emit a typed array helper
+      auto vectorType = field.value.type.VectorType();
+      if (IsScalar(vectorType.base_type)) {
+        GenDocComment(code_ptr, "@returns {" + GenType(vectorType) + "Array}");
+        code += object_name + ".prototype." + MakeCamel(field.name, false);
+        code += "Array = function() {\n" + offset_prefix;
+        code += "new " + GenType(vectorType) + "Array(this.bb.bytes().buffer, "
+          "this.bb.__vector(this.bb_pos + offset), "
+          "this.bb.__vector_len(this.bb_pos + offset)) : null;\n};\n\n";
+      }
     }
   }
 
diff --git a/tests/JavaScriptTest.js b/tests/JavaScriptTest.js
index 0f4f23351..4661f8700 100644
--- a/tests/JavaScriptTest.js
+++ b/tests/JavaScriptTest.js
@@ -105,6 +105,13 @@ function testBuffer(bb) {
   }
   assert.strictEqual(invsum, 10);
 
+  var invsum2 = 0;
+  var invArr = monster.inventoryArray();
+  for (var i = 0; i < invArr.length; i++) {
+    invsum2 += invArr[i];
+  }
+  assert.strictEqual(invsum2, 10);
+
   var test_0 = monster.test4(0);
   var test_1 = monster.test4(1);
   assert.strictEqual(monster.test4Length(), 2);
diff --git a/tests/monster_test_generated.js b/tests/monster_test_generated.js
index 9d0f48b09..bafc1eb80 100644
--- a/tests/monster_test_generated.js
+++ b/tests/monster_test_generated.js
@@ -447,6 +447,14 @@ MyGame.Example.Monster.prototype.inventoryLength = function() {
   return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0;
 };
 
+/**
+ * @returns {Uint8Array}
+ */
+MyGame.Example.Monster.prototype.inventoryArray = function() {
+  var offset = this.bb.__offset(this.bb_pos, 14);
+  return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null;
+};
+
 /**
  * @returns {MyGame.Example.Color}
  */
@@ -555,6 +563,14 @@ MyGame.Example.Monster.prototype.testnestedflatbufferLength = function() {
   return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0;
 };
 
+/**
+ * @returns {Uint8Array}
+ */
+MyGame.Example.Monster.prototype.testnestedflatbufferArray = function() {
+  var offset = this.bb.__offset(this.bb_pos, 30);
+  return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null;
+};
+
 /**
  * @param {MyGame.Example.Stat=} obj
  * @returns {MyGame.Example.Stat}
@@ -653,6 +669,14 @@ MyGame.Example.Monster.prototype.testarrayofboolsLength = function() {
   return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0;
 };
 
+/**
+ * @returns {Int8Array}
+ */
+MyGame.Example.Monster.prototype.testarrayofboolsArray = function() {
+  var offset = this.bb.__offset(this.bb_pos, 52);
+  return offset ? new Int8Array(this.bb.bytes().buffer, this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null;
+};
+
 /**
  * @param {flatbuffers.Builder} builder
  */

From 20c0082ee5bfeeecaa443c001a89934e9448ffa4 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Fri, 12 Feb 2016 16:20:33 -0800
Subject: [PATCH 080/185] Fixed namespace code generation for C++

The code generator was assuming all declarations for the current
file sit in the same namepace. Now uses the "on demand" namespace
switching we had for the forward declarations.

Also fixed a bug related to namespace lookup.

Change-Id: Ib54a3efbc752cbb9590302fa0707c0c73448db3d
Tested: on Linux.
---
 src/idl_gen_cpp.cpp                           | 454 +++++++++---------
 src/idl_parser.cpp                            |  11 +
 tests/monster_test_generated.h                |   6 +
 .../NamespaceA/SecondTableInA.cs              |  33 ++
 .../NamespaceA/SecondTableInA.go              |  32 ++
 .../NamespaceA/SecondTableInA.java            |  33 ++
 .../NamespaceA/SecondTableInA.php             |  82 ++++
 .../NamespaceA/SecondTableInA.py              |  27 ++
 tests/namespace_test/NamespaceA/TableInC.cs   |  38 ++
 tests/namespace_test/NamespaceA/TableInC.go   |  46 ++
 tests/namespace_test/NamespaceA/TableInC.java |  38 ++
 tests/namespace_test/NamespaceA/TableInC.php  | 100 ++++
 tests/namespace_test/NamespaceA/TableInC.py   |  39 ++
 .../NamespaceA/TableInFirstNS.cs              |   4 +-
 .../namespace_test1_generated.h               |   6 +-
 tests/namespace_test/namespace_test2.fbs      |  14 +
 .../namespace_test2_generated.h               | 101 ++++
 .../namespace_test2_generated.js              | 159 ++++++
 18 files changed, 1000 insertions(+), 223 deletions(-)
 create mode 100644 tests/namespace_test/NamespaceA/SecondTableInA.cs
 create mode 100644 tests/namespace_test/NamespaceA/SecondTableInA.go
 create mode 100644 tests/namespace_test/NamespaceA/SecondTableInA.java
 create mode 100644 tests/namespace_test/NamespaceA/SecondTableInA.php
 create mode 100644 tests/namespace_test/NamespaceA/SecondTableInA.py
 create mode 100644 tests/namespace_test/NamespaceA/TableInC.cs
 create mode 100644 tests/namespace_test/NamespaceA/TableInC.go
 create mode 100644 tests/namespace_test/NamespaceA/TableInC.java
 create mode 100644 tests/namespace_test/NamespaceA/TableInC.php
 create mode 100644 tests/namespace_test/NamespaceA/TableInC.py

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index d5dfb57e4..eb5093461 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -23,11 +23,15 @@
 namespace flatbuffers {
 namespace cpp {
 
+// This tracks the current namespace so we can insert namespace declarations.
+// TODO(wvo): this needs to be moved into a code generator context object.
+static const Namespace *code_generator_cur_name_space = nullptr;
+
 // Ensure that a type is prefixed with its namespace whenever it is used
 // outside of its namespace.
-static std::string WrapInNameSpace(const Parser &parser, const Namespace *ns,
+static std::string WrapInNameSpace(const Namespace *ns,
                                    const std::string &name) {
-  if (parser.namespaces_.back() != ns) {
+  if (code_generator_cur_name_space != ns) {
     std::string qualified_name;
     for (auto it = ns->components.begin();
              it != ns->components.end(); ++it) {
@@ -39,9 +43,8 @@ static std::string WrapInNameSpace(const Parser &parser, const Namespace *ns,
   }
 }
 
-static std::string WrapInNameSpace(const Parser &parser,
-                                   const Definition &def) {
-  return WrapInNameSpace(parser, def.defined_namespace, def.name);
+static std::string WrapInNameSpace(const Definition &def) {
+  return WrapInNameSpace(def.defined_namespace, def.name);
 }
 
 // Translates a qualified name in flatbuffer text format to the same name in
@@ -58,8 +61,7 @@ static std::string TranslateNameSpace(const std::string &qualified_name) {
 
 
 // Return a C++ type from the table in idl.h
-static std::string GenTypeBasic(const Parser &parser, const Type &type,
-                                bool user_facing_type) {
+static std::string GenTypeBasic(const Type &type, bool user_facing_type) {
   static const char *ctypename[] = {
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
       #CTYPE,
@@ -67,7 +69,7 @@ static std::string GenTypeBasic(const Parser &parser, const Type &type,
     #undef FLATBUFFERS_TD
   };
   if (user_facing_type) {
-    if (type.enum_def) return WrapInNameSpace(parser, *type.enum_def);
+    if (type.enum_def) return WrapInNameSpace(*type.enum_def);
     if (type.base_type == BASE_TYPE_BOOL) return "bool";
   }
   return ctypename[type.base_type];
@@ -86,7 +88,7 @@ static std::string GenTypePointer(const Parser &parser, const Type &type) {
       return "flatbuffers::Vector<" +
              GenTypeWire(parser, type.VectorType(), "", false) + ">";
     case BASE_TYPE_STRUCT: {
-      return WrapInNameSpace(parser, *type.struct_def);
+      return WrapInNameSpace(*type.struct_def);
     }
     case BASE_TYPE_UNION:
       // fall through
@@ -100,7 +102,7 @@ static std::string GenTypePointer(const Parser &parser, const Type &type) {
 static std::string GenTypeWire(const Parser &parser, const Type &type,
                                const char *postfix, bool user_facing_type) {
   return IsScalar(type.base_type)
-    ? GenTypeBasic(parser, type, user_facing_type) + postfix
+    ? GenTypeBasic(type, user_facing_type) + postfix
     : IsStruct(type)
       ? "const " + GenTypePointer(parser, type) + " *"
       : "flatbuffers::Offset<" + GenTypePointer(parser, type) + ">" + postfix;
@@ -110,7 +112,7 @@ static std::string GenTypeWire(const Parser &parser, const Type &type,
 // serialized size.
 static std::string GenTypeSize(const Parser &parser, const Type &type) {
   return IsScalar(type.base_type)
-    ? GenTypeBasic(parser, type, false)
+    ? GenTypeBasic(type, false)
     : IsStruct(type)
       ? GenTypePointer(parser, type)
       : "flatbuffers::uoffset_t";
@@ -122,7 +124,7 @@ static std::string GenTypeGet(const Parser &parser, const Type &type,
                               const char *afterbasic, const char *beforeptr,
                               const char *afterptr, bool user_facing_type) {
   return IsScalar(type.base_type)
-    ? GenTypeBasic(parser, type, user_facing_type) + afterbasic
+    ? GenTypeBasic(type, user_facing_type) + afterbasic
     : beforeptr + GenTypePointer(parser, type) + afterptr;
 }
 
@@ -148,16 +150,20 @@ static std::string GetEnumVal(const EnumDef &enum_def, const EnumVal &enum_val,
   }
 }
 
+std::string EnumSignature(EnumDef &enum_def) {
+  return "inline bool Verify" + enum_def.name +
+         "(flatbuffers::Verifier &verifier, " +
+         "const void *union_obj, " + enum_def.name + " type)";
+}
+
 // Generate an enum declaration and an enum string lookup table.
 static void GenEnum(const Parser &parser, EnumDef &enum_def,
-                    std::string *code_ptr, std::string *code_ptr_post) {
-  if (enum_def.generated) return;
+                    std::string *code_ptr) {
   std::string &code = *code_ptr;
-  std::string &code_post = *code_ptr_post;
   GenComment(enum_def.doc_comment, code_ptr, nullptr);
   code += GenEnumDecl(enum_def, parser.opts);
   if (parser.opts.scoped_enums)
-    code += " : " + GenTypeBasic(parser, enum_def.underlying_type, false);
+    code += " : " + GenTypeBasic(enum_def.underlying_type, false);
   code += " {\n";
   EnumVal *minv = nullptr, *maxv = nullptr;
   for (auto it = enum_def.vals.vec.begin();
@@ -208,45 +214,47 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
   }
 
   if (enum_def.is_union) {
-    // Generate a verifier function for this union that can be called by the
-    // table verifier functions. It uses a switch case to select a specific
-    // verifier function to call, this should be safe even if the union type
-    // has been corrupted, since the verifiers will simply fail when called
-    // on the wrong type.
-    auto signature = "inline bool Verify" + enum_def.name +
-                     "(flatbuffers::Verifier &verifier, " +
-                     "const void *union_obj, " + enum_def.name + " type)";
-    code += signature + ";\n\n";
-    code_post += signature + " {\n  switch (type) {\n";
-    for (auto it = enum_def.vals.vec.begin();
-         it != enum_def.vals.vec.end();
-         ++it) {
-      auto &ev = **it;
-      code_post += "    case " + GetEnumVal(enum_def, ev, parser.opts);
-      if (!ev.value) {
-        code_post += ": return true;\n";  // "NONE" enum value.
-      } else {
-        code_post += ": return verifier.VerifyTable(reinterpret_cast<const ";
-        code_post += WrapInNameSpace(parser, *ev.struct_def);
-        code_post += " *>(union_obj));\n";
-      }
-    }
-    code_post += "    default: return false;\n  }\n}\n\n";
+    code += EnumSignature(enum_def) + ";\n\n";
   }
 }
 
+static void GenEnumPost(const Parser &parser, EnumDef &enum_def,
+                    std::string *code_ptr_post) {
+  // Generate a verifier function for this union that can be called by the
+  // table verifier functions. It uses a switch case to select a specific
+  // verifier function to call, this should be safe even if the union type
+  // has been corrupted, since the verifiers will simply fail when called
+  // on the wrong type.
+  std::string &code_post = *code_ptr_post;
+  code_post += EnumSignature(enum_def) + " {\n  switch (type) {\n";
+  for (auto it = enum_def.vals.vec.begin();
+       it != enum_def.vals.vec.end();
+       ++it) {
+    auto &ev = **it;
+    code_post += "    case " + GetEnumVal(enum_def, ev, parser.opts);
+    if (!ev.value) {
+      code_post += ": return true;\n";  // "NONE" enum value.
+    } else {
+      code_post += ": return verifier.VerifyTable(reinterpret_cast<const ";
+      code_post += WrapInNameSpace(*ev.struct_def);
+      code_post += " *>(union_obj));\n";
+    }
+  }
+  code_post += "    default: return false;\n  }\n}\n\n";
+}
+
 // Generates a value with optionally a cast applied if the field has a
 // different underlying type from its interface type (currently only the
 // case for enums. "from" specify the direction, true meaning from the
 // underlying type to the interface type.
-std::string GenUnderlyingCast(const Parser &parser, const FieldDef &field,
-                              bool from, const std::string &val) {
+std::string GenUnderlyingCast(const FieldDef &field, bool from,
+                              const std::string &val) {
   if (from && field.value.type.base_type == BASE_TYPE_BOOL) {
     return val + " != 0";
   } else if ((field.value.type.enum_def &&
               IsScalar(field.value.type.base_type)) ||
              field.value.type.base_type == BASE_TYPE_BOOL) {
-    return "static_cast<" + GenTypeBasic(parser, field.value.type, from) +
+    return "static_cast<" + GenTypeBasic(field.value.type, from) +
            ">(" + val + ")";
   } else {
     return val;
@@ -262,9 +270,7 @@ std::string GenFieldOffsetName(const FieldDef &field) {
 // Generate an accessor struct, builder structs & function for a table.
 static void GenTable(const Parser &parser, StructDef &struct_def,
                      std::string *code_ptr) {
-  if (struct_def.generated) return;
   std::string &code = *code_ptr;
-
   // Generate an accessor struct, with methods of the form:
   // type name() const { return GetField<type>(offset, defaultval); }
   GenComment(struct_def.doc_comment, code_ptr, nullptr);
@@ -281,7 +287,7 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
       auto &field = **it;
       if (!field.deprecated) {  // Deprecated fields won't be accessible.
         if (!is_first_field) {
-          // Add trailing comma and newline to previous element. Don't add trailing comma to 
+          // Add trailing comma and newline to previous element. Don't add trailing comma to
           // last element since older versions of gcc complain about this.
           code += ",\n";
         } else {
@@ -317,19 +323,19 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
       if (IsScalar(field.value.type.base_type))
         call += ", " + field.value.constant;
       call += ")";
-      code += GenUnderlyingCast(parser, field, true, call);
+      code += GenUnderlyingCast(field, true, call);
       code += "; }\n";
       if (parser.opts.mutable_buffer) {
         if (is_scalar) {
           code += "  bool mutate_" + field.name + "(";
-          code += GenTypeBasic(parser, field.value.type, true);
+          code += GenTypeBasic(field.value.type, true);
           code += " _" + field.name + ") { return SetField(" + offsetstr + ", ";
-          code += GenUnderlyingCast(parser, field, false, "_" + field.name);
+          code += GenUnderlyingCast(field, false, "_" + field.name);
           code += "); }\n";
         } else {
           auto type = GenTypeGet(parser, field.value.type, " ", "", " *", true);
           code += "  " + type + "mutable_" + field.name + "() { return ";
-          code += GenUnderlyingCast(parser, field, true,
+          code += GenUnderlyingCast(field, true,
                                     accessor + type + ">(" + offsetstr + ")");
           code += "; }\n";
         }
@@ -366,7 +372,7 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
             code += GenTypeGet(parser, field.value.type, " ", "const ", " *",
                                true);
           } else {
-            code += GenTypeBasic(parser, field.value.type, false);
+            code += GenTypeBasic(field.value.type, false);
           }
           code += " val) const { return " + field.name + "() < val ? -1 : ";
           code += field.name + "() > val; }\n";
@@ -452,7 +458,7 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
         code += "Offset";
       }
       code += "(" + struct_def.name + "::" + GenFieldOffsetName(field) + ", ";
-      code += GenUnderlyingCast(parser, field, false, field.name);
+      code += GenUnderlyingCast(field, false, field.name);
       if (IsScalar(field.value.type.base_type))
         code += ", " + field.value.constant;
       code += "); }\n";
@@ -495,12 +501,11 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
         auto ev = field.value.type.enum_def->ReverseLookup(
            static_cast<int>(StringToInt(field.value.constant.c_str())), false);
         if (ev) {
-          code += WrapInNameSpace(parser,
-                                  field.value.type.enum_def->defined_namespace,
+          code += WrapInNameSpace(field.value.type.enum_def->defined_namespace,
                                   GetEnumVal(*field.value.type.enum_def, *ev,
                                              parser.opts));
         } else {
-          code += GenUnderlyingCast(parser, field, true, field.value.constant);
+          code += GenUnderlyingCast(field, true, field.value.constant);
         }
       } else if (field.value.type.base_type == BASE_TYPE_BOOL) {
         code += field.value.constant == "0" ? "false" : "true";
@@ -527,10 +532,10 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
   code += "  return builder_.Finish();\n}\n\n";
 }
 
-static void GenPadding(const FieldDef &field,
-            std::string &code,
-            int &padding_id,
-            const std::function<void (int bits, std::string &code, int &padding_id)> &f) {
+static void GenPadding(const FieldDef &field, std::string &code,
+                       int &padding_id,
+                       const std::function<void (int bits, std::string &code,
+                                                 int &padding_id)> &f) {
   if (field.padding) {
     for (int i = 0; i < 4; i++)
       if (static_cast<int>(field.padding) & (1 << i))
@@ -598,7 +603,7 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
     code += field.name + "_(";
     if (IsScalar(field.value.type.base_type)) {
       code += "flatbuffers::EndianScalar(";
-      code += GenUnderlyingCast(parser, field, false, "_" + field.name);
+      code += GenUnderlyingCast(field, false, "_" + field.name);
       code += "))";
     } else {
       code += "_" + field.name + ")";
@@ -627,7 +632,7 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
     code += "  " + GenTypeGet(parser, field.value.type, " ", "const ", " &",
                               true);
     code += field.name + "() const { return ";
-    code += GenUnderlyingCast(parser, field, true,
+    code += GenUnderlyingCast(field, true,
       is_scalar
         ? "flatbuffers::EndianScalar(" + field.name + "_)"
         : field.name + "_");
@@ -635,10 +640,10 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
     if (parser.opts.mutable_buffer) {
       if (is_scalar) {
         code += "  void mutate_" + field.name + "(";
-        code += GenTypeBasic(parser, field.value.type, true);
+        code += GenTypeBasic(field.value.type, true);
         code += " _" + field.name + ") { flatbuffers::WriteScalar(&";
         code += field.name + "_, ";
-        code += GenUnderlyingCast(parser, field, false, "_" + field.name);
+        code += GenUnderlyingCast(field, false, "_" + field.name);
         code += "); }\n";
       } else {
         code += "  ";
@@ -652,18 +657,35 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
   code += NumToString(struct_def.bytesize) + ");\n\n";
 }
 
-void GenerateNestedNameSpaces(Namespace *ns, std::string *code_ptr) {
+void GenerateNestedNameSpaces(const Namespace *ns, std::string *code_ptr) {
   for (auto it = ns->components.begin(); it != ns->components.end(); ++it) {
     *code_ptr += "namespace " + *it + " {\n";
   }
 }
 
-void CloseNestedNameSpaces(Namespace *ns, std::string *code_ptr) {
+void CloseNestedNameSpaces(const Namespace *ns, std::string *code_ptr) {
   for (auto it = ns->components.rbegin(); it != ns->components.rend(); ++it) {
     *code_ptr += "}  // namespace " + *it + "\n";
   }
 }
 
+void CheckNameSpace(const Definition &def, std::string *code_ptr) {
+  // Set up the correct namespace. Only open a namespace if
+  // the existing one is different.
+  // TODO: this could be done more intelligently, by sorting to
+  // namespace path and only opening/closing what is necessary, but that's
+  // quite a bit more complexity.
+  if (code_generator_cur_name_space != def.defined_namespace) {
+    if (code_generator_cur_name_space) {
+      CloseNestedNameSpaces(code_generator_cur_name_space, code_ptr);
+      if (code_generator_cur_name_space->components.size()) *code_ptr += "\n";
+    }
+    GenerateNestedNameSpaces(def.defined_namespace, code_ptr);
+    code_generator_cur_name_space = def.defined_namespace;
+    if (code_generator_cur_name_space->components.size()) *code_ptr += "\n";
+  }
+}
+
 }  // namespace cpp
 
 struct IsAlnum {
@@ -676,182 +698,178 @@ struct IsAlnum {
 // and tables) and output them to a single file.
 std::string GenerateCPP(const Parser &parser,
                         const std::string &file_name) {
+  // Check if we have any code to generate at all, to avoid an empty header.
+  for (auto it = parser.enums_.vec.begin(); it != parser.enums_.vec.end();
+       ++it) {
+    if (!(*it)->generated) goto generate_code;
+  }
+  for (auto it = parser.structs_.vec.begin(); it != parser.structs_.vec.end();
+       ++it) {
+    if (!(*it)->generated) goto generate_code;
+  }
+  // No code to generate, exit:
+  return std::string();
+
+  generate_code:
+
   using namespace cpp;
 
-  // Generate code for all the enum declarations.
-  std::string enum_code, enum_code_post;
-  for (auto it = parser.enums_.vec.begin();
-       it != parser.enums_.vec.end(); ++it) {
-    GenEnum(parser, **it, &enum_code, &enum_code_post);
+  std::string code;
+  code = "// automatically generated by the FlatBuffers compiler,"
+         " do not modify\n\n";
+
+  // Generate include guard.
+  std::string include_guard_ident = file_name;
+  // Remove any non-alpha-numeric characters that may appear in a filename.
+  include_guard_ident.erase(
+    std::remove_if(include_guard_ident.begin(),
+                   include_guard_ident.end(),
+                   IsAlnum()),
+    include_guard_ident.end());
+  std::string include_guard = "FLATBUFFERS_GENERATED_" + include_guard_ident;
+  include_guard += "_";
+  // For further uniqueness, also add the namespace.
+  auto name_space = parser.namespaces_.back();
+  for (auto it = name_space->components.begin();
+           it != name_space->components.end(); ++it) {
+    include_guard += *it + "_";
   }
+  include_guard += "H_";
+  std::transform(include_guard.begin(), include_guard.end(),
+                 include_guard.begin(), ::toupper);
+  code += "#ifndef " + include_guard + "\n";
+  code += "#define " + include_guard + "\n\n";
+
+  code += "#include \"flatbuffers/flatbuffers.h\"\n\n";
+
+  if (parser.opts.include_dependence_headers) {
+    int num_includes = 0;
+    for (auto it = parser.included_files_.begin();
+         it != parser.included_files_.end(); ++it) {
+      auto basename = flatbuffers::StripPath(
+                        flatbuffers::StripExtension(it->first));
+      if (basename != file_name) {
+        code += "#include \"" + basename + "_generated.h\"\n";
+        num_includes++;
+      }
+    }
+    if (num_includes) code += "\n";
+  }
+
+  assert(!code_generator_cur_name_space);
 
   // Generate forward declarations for all structs/tables, since they may
   // have circular references.
-  std::string forward_decl_code_same_namespace;
-  std::string forward_decl_code_other_namespace;
-  Namespace *cur_name_space = nullptr;
   for (auto it = parser.structs_.vec.begin();
        it != parser.structs_.vec.end(); ++it) {
     auto &struct_def = **it;
-    auto decl = "struct " + struct_def.name + ";\n";
-    if (struct_def.defined_namespace == parser.namespaces_.back()) {
-      forward_decl_code_same_namespace += decl;
-    } else {
-      // Wrap this decl in the correct namespace. Only open a namespace if
-      // the adjacent one is different.
-      // TODO: this could be done more intelligently, by sorting to
-      // namespace path and only opening/closing what is necessary, but that's
-      // quite a bit more complexity.
-      if (cur_name_space != struct_def.defined_namespace) {
-        if (cur_name_space) {
-          CloseNestedNameSpaces(cur_name_space,
-                                &forward_decl_code_other_namespace);
-        }
-        GenerateNestedNameSpaces(struct_def.defined_namespace,
-                                 &forward_decl_code_other_namespace);
-        cur_name_space = struct_def.defined_namespace;
-      }
-      forward_decl_code_other_namespace += decl;
-    }
+    CheckNameSpace(struct_def, &code);
+    code += "struct " + struct_def.name + ";\n\n";
   }
-  if (cur_name_space) {
-    CloseNestedNameSpaces(cur_name_space,
-                          &forward_decl_code_other_namespace);
+
+  // Generate code for all the enum declarations.
+  for (auto it = parser.enums_.vec.begin();
+       it != parser.enums_.vec.end(); ++it) {
+    auto &enum_def = **it;
+    if (!enum_def.generated) {
+      CheckNameSpace(**it, &code);
+      GenEnum(parser, **it, &code);
+    }
   }
 
   // Generate code for all structs, then all tables.
-  std::string decl_code;
   for (auto it = parser.structs_.vec.begin();
        it != parser.structs_.vec.end(); ++it) {
-    if ((**it).fixed) GenStruct(parser, **it, &decl_code);
+    auto &struct_def = **it;
+    if (struct_def.fixed && !struct_def.generated) {
+      CheckNameSpace(struct_def, &code);
+      GenStruct(parser, struct_def, &code);
+    }
   }
   for (auto it = parser.structs_.vec.begin();
        it != parser.structs_.vec.end(); ++it) {
-    if (!(**it).fixed) GenTable(parser, **it, &decl_code);
+    auto &struct_def = **it;
+    if (!struct_def.fixed && !struct_def.generated) {
+      CheckNameSpace(struct_def, &code);
+      GenTable(parser, struct_def, &code);
+    }
   }
 
-  // Only output file-level code if there were any declarations.
-  if (enum_code.length() || decl_code.length()) {
-    std::string code;
-    code = "// automatically generated by the FlatBuffers compiler,"
-           " do not modify\n\n";
-
-    // Generate include guard.
-    std::string include_guard_ident = file_name;
-    // Remove any non-alpha-numeric characters that may appear in a filename.
-    include_guard_ident.erase(
-      std::remove_if(include_guard_ident.begin(),
-                     include_guard_ident.end(),
-                     IsAlnum()),
-      include_guard_ident.end());
-    std::string include_guard = "FLATBUFFERS_GENERATED_" + include_guard_ident;
-    include_guard += "_";
-    // For further uniqueness, also add the namespace.
-    auto name_space = parser.namespaces_.back();
-    for (auto it = name_space->components.begin();
-             it != name_space->components.end(); ++it) {
-      include_guard += *it + "_";
+  // Generate code for union verifiers.
+  for (auto it = parser.enums_.vec.begin();
+       it != parser.enums_.vec.end(); ++it) {
+    auto &enum_def = **it;
+    if (enum_def.is_union && !enum_def.generated) {
+      CheckNameSpace(enum_def, &code);
+      GenEnumPost(parser, enum_def, &code);
     }
-    include_guard += "H_";
-    std::transform(include_guard.begin(), include_guard.end(),
-                   include_guard.begin(), ::toupper);
-    code += "#ifndef " + include_guard + "\n";
-    code += "#define " + include_guard + "\n\n";
-
-    code += "#include \"flatbuffers/flatbuffers.h\"\n\n";
-
-    if (parser.opts.include_dependence_headers) {
-      int num_includes = 0;
-      for (auto it = parser.included_files_.begin();
-           it != parser.included_files_.end(); ++it) {
-        auto basename = flatbuffers::StripPath(
-                          flatbuffers::StripExtension(it->first));
-        if (basename != file_name) {
-          code += "#include \"" + basename + "_generated.h\"\n";
-          num_includes++;
-        }
-      }
-      if (num_includes) code += "\n";
-    }
-
-    code += forward_decl_code_other_namespace;
-    code += "\n";
-
-    GenerateNestedNameSpaces(name_space, &code);
-    code += "\n";
-
-    code += forward_decl_code_same_namespace;
-    code += "\n";
-
-    // Output the main declaration code from above.
-    code += enum_code;
-    code += decl_code;
-    code += enum_code_post;
-
-    // Generate convenient global helper functions:
-    if (parser.root_struct_def_) {
-      auto &name = parser.root_struct_def_->name;
-      std::string qualified_name =
-          parser.namespaces_.back()->GetFullyQualifiedName(name);
-      std::string cpp_qualified_name = TranslateNameSpace(qualified_name);
-
-      // The root datatype accessor:
-      code += "inline const " + cpp_qualified_name + " *Get";
-      code += name;
-      code += "(const void *buf) { return flatbuffers::GetRoot<";
-      code += cpp_qualified_name + ">(buf); }\n\n";
-      if (parser.opts.mutable_buffer) {
-        code += "inline " + name + " *GetMutable";
-        code += name;
-        code += "(void *buf) { return flatbuffers::GetMutableRoot<";
-        code += name + ">(buf); }\n\n";
-      }
-
-      // The root verifier:
-      code += "inline bool Verify";
-      code += name;
-      code += "Buffer(flatbuffers::Verifier &verifier) { "
-              "return verifier.VerifyBuffer<";
-      code += cpp_qualified_name + ">(); }\n\n";
-
-      if (parser.file_identifier_.length()) {
-        // Return the identifier
-        code += "inline const char *" + name;
-        code += "Identifier() { return \"" + parser.file_identifier_;
-        code += "\"; }\n\n";
-
-        // Check if a buffer has the identifier.
-        code += "inline bool " + name;
-        code += "BufferHasIdentifier(const void *buf) { return flatbuffers::";
-        code += "BufferHasIdentifier(buf, ";
-        code += name + "Identifier()); }\n\n";
-      }
-
-      if (parser.file_extension_.length()) {
-        // Return the extension
-        code += "inline const char *" + name;
-        code += "Extension() { return \"" + parser.file_extension_;
-        code += "\"; }\n\n";
-      }
-
-      // Finish a buffer with a given root object:
-      code += "inline void Finish" + name;
-      code += "Buffer(flatbuffers::FlatBufferBuilder &fbb, flatbuffers::Offset<";
-      code += cpp_qualified_name + "> root) { fbb.Finish(root";
-      if (parser.file_identifier_.length())
-        code += ", " + name + "Identifier()";
-      code += "); }\n\n";
-    }
-
-    CloseNestedNameSpaces(name_space, &code);
-
-    // Close the include guard.
-    code += "\n#endif  // " + include_guard + "\n";
-
-    return code;
   }
 
-  return std::string();
+  // Generate convenient global helper functions:
+  if (parser.root_struct_def_) {
+    CheckNameSpace(*parser.root_struct_def_, &code);
+    auto &name = parser.root_struct_def_->name;
+    std::string qualified_name =
+        parser.namespaces_.back()->GetFullyQualifiedName(name);
+    std::string cpp_qualified_name = TranslateNameSpace(qualified_name);
+
+    // The root datatype accessor:
+    code += "inline const " + cpp_qualified_name + " *Get";
+    code += name;
+    code += "(const void *buf) { return flatbuffers::GetRoot<";
+    code += cpp_qualified_name + ">(buf); }\n\n";
+    if (parser.opts.mutable_buffer) {
+      code += "inline " + name + " *GetMutable";
+      code += name;
+      code += "(void *buf) { return flatbuffers::GetMutableRoot<";
+      code += name + ">(buf); }\n\n";
+    }
+
+    // The root verifier:
+    code += "inline bool Verify";
+    code += name;
+    code += "Buffer(flatbuffers::Verifier &verifier) { "
+            "return verifier.VerifyBuffer<";
+    code += cpp_qualified_name + ">(); }\n\n";
+
+    if (parser.file_identifier_.length()) {
+      // Return the identifier
+      code += "inline const char *" + name;
+      code += "Identifier() { return \"" + parser.file_identifier_;
+      code += "\"; }\n\n";
+
+      // Check if a buffer has the identifier.
+      code += "inline bool " + name;
+      code += "BufferHasIdentifier(const void *buf) { return flatbuffers::";
+      code += "BufferHasIdentifier(buf, ";
+      code += name + "Identifier()); }\n\n";
+    }
+
+    if (parser.file_extension_.length()) {
+      // Return the extension
+      code += "inline const char *" + name;
+      code += "Extension() { return \"" + parser.file_extension_;
+      code += "\"; }\n\n";
+    }
+
+    // Finish a buffer with a given root object:
+    code += "inline void Finish" + name;
+    code += "Buffer(flatbuffers::FlatBufferBuilder &fbb, flatbuffers::Offset<";
+    code += cpp_qualified_name + "> root) { fbb.Finish(root";
+    if (parser.file_identifier_.length())
+      code += ", " + name + "Identifier()";
+    code += "); }\n\n";
+  }
+
+  assert(code_generator_cur_name_space);
+  CloseNestedNameSpaces(code_generator_cur_name_space, &code);
+
+  code_generator_cur_name_space = nullptr;
+
+  // Close the include guard.
+  code += "\n#endif  // " + include_guard + "\n";
+
+  return code;
 }
 
 static std::string GeneratedFileName(const std::string &path,
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 622a1f61b..adbd79edc 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -981,15 +981,26 @@ CheckedError Parser::ParseSingleValue(Value &e) {
 StructDef *Parser::LookupCreateStruct(const std::string &name,
                                       bool create_if_new, bool definition) {
   std::string qualified_name = namespaces_.back()->GetFullyQualifiedName(name);
+  // See if it exists pre-declared by an unqualified use.
   auto struct_def = structs_.Lookup(name);
   if (struct_def && struct_def->predecl) {
     if (definition) {
+      // Make sure it has the current namespace, and is registered under its
+      // qualified name.
       struct_def->defined_namespace = namespaces_.back();
       structs_.Move(name, qualified_name);
     }
     return struct_def;
   }
+  // See if it exists pre-declared by an qualified use.
   struct_def = structs_.Lookup(qualified_name);
+  if (struct_def && struct_def->predecl) {
+    if (definition) {
+      // Make sure it has the current namespace.
+      struct_def->defined_namespace = namespaces_.back();
+    }
+    return struct_def;
+  }
   if (!definition) {
     // Search thru parent namespaces.
     for (size_t components = namespaces_.back()->components.size();
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index a42fa4be5..a7f02ffe7 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -7,7 +7,9 @@
 
 namespace MyGame {
 namespace OtherNameSpace {
+
 struct Unused;
+
 }  // namespace OtherNameSpace
 }  // namespace MyGame
 
@@ -15,9 +17,13 @@ namespace MyGame {
 namespace Example {
 
 struct Test;
+
 struct TestSimpleTableWithEnum;
+
 struct Vec3;
+
 struct Stat;
+
 struct Monster;
 
 enum Color {
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.cs b/tests/namespace_test/NamespaceA/SecondTableInA.cs
new file mode 100644
index 000000000..11bf90fd7
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.cs
@@ -0,0 +1,33 @@
+// automatically generated, do not modify
+
+namespace NamespaceA
+{
+
+using System;
+using FlatBuffers;
+
+public sealed class SecondTableInA : Table {
+  public static SecondTableInA GetRootAsSecondTableInA(ByteBuffer _bb) { return GetRootAsSecondTableInA(_bb, new SecondTableInA()); }
+  public static SecondTableInA GetRootAsSecondTableInA(ByteBuffer _bb, SecondTableInA obj) { return (obj.__init(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
+  public SecondTableInA __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+  public NamespaceC.TableInC ReferToC { get { return GetReferToC(new NamespaceC.TableInC()); } }
+  public NamespaceC.TableInC GetReferToC(NamespaceC.TableInC obj) { int o = __offset(4); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
+
+  public static Offset<SecondTableInA> CreateSecondTableInA(FlatBufferBuilder builder,
+      Offset<NamespaceC.TableInC> refer_to_cOffset = default(Offset<NamespaceC.TableInC>)) {
+    builder.StartObject(1);
+    SecondTableInA.AddReferToC(builder, refer_to_cOffset);
+    return SecondTableInA.EndSecondTableInA(builder);
+  }
+
+  public static void StartSecondTableInA(FlatBufferBuilder builder) { builder.StartObject(1); }
+  public static void AddReferToC(FlatBufferBuilder builder, Offset<NamespaceC.TableInC> referToCOffset) { builder.AddOffset(0, referToCOffset.Value, 0); }
+  public static Offset<SecondTableInA> EndSecondTableInA(FlatBufferBuilder builder) {
+    int o = builder.EndObject();
+    return new Offset<SecondTableInA>(o);
+  }
+};
+
+
+}
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.go b/tests/namespace_test/NamespaceA/SecondTableInA.go
new file mode 100644
index 000000000..78514388a
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.go
@@ -0,0 +1,32 @@
+// automatically generated, do not modify
+
+package NamespaceA
+
+import (
+	flatbuffers "github.com/google/flatbuffers/go"
+)
+type SecondTableInA struct {
+	_tab flatbuffers.Table
+}
+
+func (rcv *SecondTableInA) Init(buf []byte, i flatbuffers.UOffsetT) {
+	rcv._tab.Bytes = buf
+	rcv._tab.Pos = i
+}
+
+func (rcv *SecondTableInA) ReferToC(obj *TableInC) *TableInC {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
+	if o != 0 {
+		x := rcv._tab.Indirect(o + rcv._tab.Pos)
+		if obj == nil {
+			obj = new(TableInC)
+		}
+		obj.Init(rcv._tab.Bytes, x)
+		return obj
+	}
+	return nil
+}
+
+func SecondTableInAStart(builder *flatbuffers.Builder) { builder.StartObject(1) }
+func SecondTableInAAddReferToC(builder *flatbuffers.Builder, referToC flatbuffers.UOffsetT) { builder.PrependUOffsetTSlot(0, flatbuffers.UOffsetT(referToC), 0) }
+func SecondTableInAEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT { return builder.EndObject() }
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.java b/tests/namespace_test/NamespaceA/SecondTableInA.java
new file mode 100644
index 000000000..b1fa7a7e0
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.java
@@ -0,0 +1,33 @@
+// automatically generated, do not modify
+
+package NamespaceA;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class SecondTableInA extends Table {
+  public static SecondTableInA getRootAsSecondTableInA(ByteBuffer _bb) { return getRootAsSecondTableInA(_bb, new SecondTableInA()); }
+  public static SecondTableInA getRootAsSecondTableInA(ByteBuffer _bb, SecondTableInA obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__init(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public SecondTableInA __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+  public NamespaceC.TableInC referToC() { return referToC(new NamespaceC.TableInC()); }
+  public NamespaceC.TableInC referToC(NamespaceC.TableInC obj) { int o = __offset(4); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
+
+  public static int createSecondTableInA(FlatBufferBuilder builder,
+      int refer_to_cOffset) {
+    builder.startObject(1);
+    SecondTableInA.addReferToC(builder, refer_to_cOffset);
+    return SecondTableInA.endSecondTableInA(builder);
+  }
+
+  public static void startSecondTableInA(FlatBufferBuilder builder) { builder.startObject(1); }
+  public static void addReferToC(FlatBufferBuilder builder, int referToCOffset) { builder.addOffset(0, referToCOffset, 0); }
+  public static int endSecondTableInA(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+};
+
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.php b/tests/namespace_test/NamespaceA/SecondTableInA.php
new file mode 100644
index 000000000..78dc27f53
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.php
@@ -0,0 +1,82 @@
+<?php
+// automatically generated, do not modify
+
+namespace NamespaceA;
+
+use \Google\FlatBuffers\Struct;
+use \Google\FlatBuffers\Table;
+use \Google\FlatBuffers\ByteBuffer;
+use \Google\FlatBuffers\FlatBufferBuilder;
+
+class SecondTableInA extends Table
+{
+    /**
+     * @param ByteBuffer $bb
+     * @return SecondTableInA
+     */
+    public static function getRootAsSecondTableInA(ByteBuffer $bb)
+    {
+        $obj = new SecondTableInA();
+        return ($obj->init($bb->getInt($bb->getPosition()) + $bb->getPosition(), $bb));
+    }
+
+    /**
+     * @param int $_i offset
+     * @param ByteBuffer $_bb
+     * @return SecondTableInA
+     **/
+    public function init($_i, ByteBuffer $_bb)
+    {
+        $this->bb_pos = $_i;
+        $this->bb = $_bb;
+        return $this;
+    }
+
+    public function getReferToC()
+    {
+        $obj = new TableInC();
+        $o = $this->__offset(4);
+        return $o != 0 ? $obj->init($this->__indirect($o + $this->bb_pos), $this->bb) : 0;
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return void
+     */
+    public static function startSecondTableInA(FlatBufferBuilder $builder)
+    {
+        $builder->StartObject(1);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return SecondTableInA
+     */
+    public static function createSecondTableInA(FlatBufferBuilder $builder, $refer_to_c)
+    {
+        $builder->startObject(1);
+        self::addReferToC($builder, $refer_to_c);
+        $o = $builder->endObject();
+        return $o;
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param int
+     * @return void
+     */
+    public static function addReferToC(FlatBufferBuilder $builder, $referToC)
+    {
+        $builder->addOffsetX(0, $referToC, 0);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return int table offset
+     */
+    public static function endSecondTableInA(FlatBufferBuilder $builder)
+    {
+        $o = $builder->endObject();
+        return $o;
+    }
+}
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.py b/tests/namespace_test/NamespaceA/SecondTableInA.py
new file mode 100644
index 000000000..f70153947
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.py
@@ -0,0 +1,27 @@
+# automatically generated, do not modify
+
+# namespace: NamespaceA
+
+import flatbuffers
+
+class SecondTableInA(object):
+    __slots__ = ['_tab']
+
+    # SecondTableInA
+    def Init(self, buf, pos):
+        self._tab = flatbuffers.table.Table(buf, pos)
+
+    # SecondTableInA
+    def ReferToC(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
+        if o != 0:
+            x = self._tab.Indirect(o + self._tab.Pos)
+            from .TableInC import TableInC
+            obj = TableInC()
+            obj.Init(self._tab.Bytes, x)
+            return obj
+        return None
+
+def SecondTableInAStart(builder): builder.StartObject(1)
+def SecondTableInAAddReferToC(builder, referToC): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(referToC), 0)
+def SecondTableInAEnd(builder): return builder.EndObject()
diff --git a/tests/namespace_test/NamespaceA/TableInC.cs b/tests/namespace_test/NamespaceA/TableInC.cs
new file mode 100644
index 000000000..19576df11
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/TableInC.cs
@@ -0,0 +1,38 @@
+// automatically generated, do not modify
+
+namespace NamespaceA
+{
+
+using System;
+using FlatBuffers;
+
+public sealed class TableInC : Table {
+  public static TableInC GetRootAsTableInC(ByteBuffer _bb) { return GetRootAsTableInC(_bb, new TableInC()); }
+  public static TableInC GetRootAsTableInC(ByteBuffer _bb, TableInC obj) { return (obj.__init(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
+  public TableInC __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+  public NamespaceA.TableInFirstNS ReferToA1 { get { return GetReferToA1(new NamespaceA.TableInFirstNS()); } }
+  public NamespaceA.TableInFirstNS GetReferToA1(NamespaceA.TableInFirstNS obj) { int o = __offset(4); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
+  public SecondTableInA ReferToA2 { get { return GetReferToA2(new SecondTableInA()); } }
+  public SecondTableInA GetReferToA2(SecondTableInA obj) { int o = __offset(6); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
+
+  public static Offset<NamespaceC.TableInC> CreateTableInC(FlatBufferBuilder builder,
+      Offset<NamespaceA.TableInFirstNS> refer_to_a1Offset = default(Offset<NamespaceA.TableInFirstNS>),
+      Offset<SecondTableInA> refer_to_a2Offset = default(Offset<SecondTableInA>)) {
+    builder.StartObject(2);
+    TableInC.AddReferToA2(builder, refer_to_a2Offset);
+    TableInC.AddReferToA1(builder, refer_to_a1Offset);
+    return TableInC.EndTableInC(builder);
+  }
+
+  public static void StartTableInC(FlatBufferBuilder builder) { builder.StartObject(2); }
+  public static void AddReferToA1(FlatBufferBuilder builder, Offset<NamespaceA.TableInFirstNS> referToA1Offset) { builder.AddOffset(0, referToA1Offset.Value, 0); }
+  public static void AddReferToA2(FlatBufferBuilder builder, Offset<SecondTableInA> referToA2Offset) { builder.AddOffset(1, referToA2Offset.Value, 0); }
+  public static Offset<NamespaceC.TableInC> EndTableInC(FlatBufferBuilder builder) {
+    int o = builder.EndObject();
+    return new Offset<NamespaceC.TableInC>(o);
+  }
+};
+
+
+}
diff --git a/tests/namespace_test/NamespaceA/TableInC.go b/tests/namespace_test/NamespaceA/TableInC.go
new file mode 100644
index 000000000..535493f64
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/TableInC.go
@@ -0,0 +1,46 @@
+// automatically generated, do not modify
+
+package NamespaceA
+
+import (
+	flatbuffers "github.com/google/flatbuffers/go"
+)
+type TableInC struct {
+	_tab flatbuffers.Table
+}
+
+func (rcv *TableInC) Init(buf []byte, i flatbuffers.UOffsetT) {
+	rcv._tab.Bytes = buf
+	rcv._tab.Pos = i
+}
+
+func (rcv *TableInC) ReferToA1(obj *TableInFirstNS) *TableInFirstNS {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
+	if o != 0 {
+		x := rcv._tab.Indirect(o + rcv._tab.Pos)
+		if obj == nil {
+			obj = new(TableInFirstNS)
+		}
+		obj.Init(rcv._tab.Bytes, x)
+		return obj
+	}
+	return nil
+}
+
+func (rcv *TableInC) ReferToA2(obj *SecondTableInA) *SecondTableInA {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
+	if o != 0 {
+		x := rcv._tab.Indirect(o + rcv._tab.Pos)
+		if obj == nil {
+			obj = new(SecondTableInA)
+		}
+		obj.Init(rcv._tab.Bytes, x)
+		return obj
+	}
+	return nil
+}
+
+func TableInCStart(builder *flatbuffers.Builder) { builder.StartObject(2) }
+func TableInCAddReferToA1(builder *flatbuffers.Builder, referToA1 flatbuffers.UOffsetT) { builder.PrependUOffsetTSlot(0, flatbuffers.UOffsetT(referToA1), 0) }
+func TableInCAddReferToA2(builder *flatbuffers.Builder, referToA2 flatbuffers.UOffsetT) { builder.PrependUOffsetTSlot(1, flatbuffers.UOffsetT(referToA2), 0) }
+func TableInCEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT { return builder.EndObject() }
diff --git a/tests/namespace_test/NamespaceA/TableInC.java b/tests/namespace_test/NamespaceA/TableInC.java
new file mode 100644
index 000000000..36e3cf192
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/TableInC.java
@@ -0,0 +1,38 @@
+// automatically generated, do not modify
+
+package NamespaceA;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class TableInC extends Table {
+  public static TableInC getRootAsTableInC(ByteBuffer _bb) { return getRootAsTableInC(_bb, new TableInC()); }
+  public static TableInC getRootAsTableInC(ByteBuffer _bb, TableInC obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__init(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public TableInC __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+  public NamespaceA.TableInFirstNS referToA1() { return referToA1(new NamespaceA.TableInFirstNS()); }
+  public NamespaceA.TableInFirstNS referToA1(NamespaceA.TableInFirstNS obj) { int o = __offset(4); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
+  public SecondTableInA referToA2() { return referToA2(new SecondTableInA()); }
+  public SecondTableInA referToA2(SecondTableInA obj) { int o = __offset(6); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
+
+  public static int createTableInC(FlatBufferBuilder builder,
+      int refer_to_a1Offset,
+      int refer_to_a2Offset) {
+    builder.startObject(2);
+    TableInC.addReferToA2(builder, refer_to_a2Offset);
+    TableInC.addReferToA1(builder, refer_to_a1Offset);
+    return TableInC.endTableInC(builder);
+  }
+
+  public static void startTableInC(FlatBufferBuilder builder) { builder.startObject(2); }
+  public static void addReferToA1(FlatBufferBuilder builder, int referToA1Offset) { builder.addOffset(0, referToA1Offset, 0); }
+  public static void addReferToA2(FlatBufferBuilder builder, int referToA2Offset) { builder.addOffset(1, referToA2Offset, 0); }
+  public static int endTableInC(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+};
+
diff --git a/tests/namespace_test/NamespaceA/TableInC.php b/tests/namespace_test/NamespaceA/TableInC.php
new file mode 100644
index 000000000..e02226235
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/TableInC.php
@@ -0,0 +1,100 @@
+<?php
+// automatically generated, do not modify
+
+namespace NamespaceA;
+
+use \Google\FlatBuffers\Struct;
+use \Google\FlatBuffers\Table;
+use \Google\FlatBuffers\ByteBuffer;
+use \Google\FlatBuffers\FlatBufferBuilder;
+
+class TableInC extends Table
+{
+    /**
+     * @param ByteBuffer $bb
+     * @return TableInC
+     */
+    public static function getRootAsTableInC(ByteBuffer $bb)
+    {
+        $obj = new TableInC();
+        return ($obj->init($bb->getInt($bb->getPosition()) + $bb->getPosition(), $bb));
+    }
+
+    /**
+     * @param int $_i offset
+     * @param ByteBuffer $_bb
+     * @return TableInC
+     **/
+    public function init($_i, ByteBuffer $_bb)
+    {
+        $this->bb_pos = $_i;
+        $this->bb = $_bb;
+        return $this;
+    }
+
+    public function getReferToA1()
+    {
+        $obj = new TableInFirstNS();
+        $o = $this->__offset(4);
+        return $o != 0 ? $obj->init($this->__indirect($o + $this->bb_pos), $this->bb) : 0;
+    }
+
+    public function getReferToA2()
+    {
+        $obj = new SecondTableInA();
+        $o = $this->__offset(6);
+        return $o != 0 ? $obj->init($this->__indirect($o + $this->bb_pos), $this->bb) : 0;
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return void
+     */
+    public static function startTableInC(FlatBufferBuilder $builder)
+    {
+        $builder->StartObject(2);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return TableInC
+     */
+    public static function createTableInC(FlatBufferBuilder $builder, $refer_to_a1, $refer_to_a2)
+    {
+        $builder->startObject(2);
+        self::addReferToA1($builder, $refer_to_a1);
+        self::addReferToA2($builder, $refer_to_a2);
+        $o = $builder->endObject();
+        return $o;
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param int
+     * @return void
+     */
+    public static function addReferToA1(FlatBufferBuilder $builder, $referToA1)
+    {
+        $builder->addOffsetX(0, $referToA1, 0);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param int
+     * @return void
+     */
+    public static function addReferToA2(FlatBufferBuilder $builder, $referToA2)
+    {
+        $builder->addOffsetX(1, $referToA2, 0);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return int table offset
+     */
+    public static function endTableInC(FlatBufferBuilder $builder)
+    {
+        $o = $builder->endObject();
+        return $o;
+    }
+}
diff --git a/tests/namespace_test/NamespaceA/TableInC.py b/tests/namespace_test/NamespaceA/TableInC.py
new file mode 100644
index 000000000..bc101a7e3
--- /dev/null
+++ b/tests/namespace_test/NamespaceA/TableInC.py
@@ -0,0 +1,39 @@
+# automatically generated, do not modify
+
+# namespace: NamespaceA
+
+import flatbuffers
+
+class TableInC(object):
+    __slots__ = ['_tab']
+
+    # TableInC
+    def Init(self, buf, pos):
+        self._tab = flatbuffers.table.Table(buf, pos)
+
+    # TableInC
+    def ReferToA1(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
+        if o != 0:
+            x = self._tab.Indirect(o + self._tab.Pos)
+            from .TableInFirstNS import TableInFirstNS
+            obj = TableInFirstNS()
+            obj.Init(self._tab.Bytes, x)
+            return obj
+        return None
+
+    # TableInC
+    def ReferToA2(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
+        if o != 0:
+            x = self._tab.Indirect(o + self._tab.Pos)
+            from .SecondTableInA import SecondTableInA
+            obj = SecondTableInA()
+            obj.Init(self._tab.Bytes, x)
+            return obj
+        return None
+
+def TableInCStart(builder): builder.StartObject(2)
+def TableInCAddReferToA1(builder, referToA1): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(referToA1), 0)
+def TableInCAddReferToA2(builder, referToA2): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(referToA2), 0)
+def TableInCEnd(builder): return builder.EndObject()
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.cs b/tests/namespace_test/NamespaceA/TableInFirstNS.cs
index 21a12cf59..a5f6ee27c 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.cs
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.cs
@@ -22,9 +22,9 @@ public sealed class TableInFirstNS : Table {
   public static void AddFooTable(FlatBufferBuilder builder, Offset<NamespaceA.NamespaceB.TableInNestedNS> fooTableOffset) { builder.AddOffset(0, fooTableOffset.Value, 0); }
   public static void AddFooEnum(FlatBufferBuilder builder, NamespaceA.NamespaceB.EnumInNestedNS fooEnum) { builder.AddSbyte(1, (sbyte)fooEnum, 0); }
   public static void AddFooStruct(FlatBufferBuilder builder, Offset<NamespaceA.NamespaceB.StructInNestedNS> fooStructOffset) { builder.AddStruct(2, fooStructOffset.Value, 0); }
-  public static Offset<TableInFirstNS> EndTableInFirstNS(FlatBufferBuilder builder) {
+  public static Offset<NamespaceA.TableInFirstNS> EndTableInFirstNS(FlatBufferBuilder builder) {
     int o = builder.EndObject();
-    return new Offset<TableInFirstNS>(o);
+    return new Offset<NamespaceA.TableInFirstNS>(o);
   }
 };
 
diff --git a/tests/namespace_test/namespace_test1_generated.h b/tests/namespace_test/namespace_test1_generated.h
index 241c2cfe6..9e10eb4c1 100644
--- a/tests/namespace_test/namespace_test1_generated.h
+++ b/tests/namespace_test/namespace_test1_generated.h
@@ -5,19 +5,19 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-
 namespace NamespaceA {
 namespace NamespaceB {
 
 struct TableInNestedNS;
+
 struct StructInNestedNS;
 
 enum EnumInNestedNS {
   EnumInNestedNS_A = 0,
   EnumInNestedNS_B = 1,
   EnumInNestedNS_C = 2,
-  EnumInNestedNS_MIN_VAL = EnumInNestedNS_A,
-  EnumInNestedNS_MAX_VAL = EnumInNestedNS_C
+  EnumInNestedNS_MIN = EnumInNestedNS_A,
+  EnumInNestedNS_MAX = EnumInNestedNS_C
 };
 
 inline const char **EnumNamesEnumInNestedNS() {
diff --git a/tests/namespace_test/namespace_test2.fbs b/tests/namespace_test/namespace_test2.fbs
index 59b9bb2a1..11d7deadc 100644
--- a/tests/namespace_test/namespace_test2.fbs
+++ b/tests/namespace_test/namespace_test2.fbs
@@ -8,3 +8,17 @@ table TableInFirstNS
 	foo_enum:NamespaceB.EnumInNestedNS;
 	foo_struct:NamespaceB.StructInNestedNS;
 }
+
+// Test switching namespaces inside a file.
+namespace NamespaceC;
+
+table TableInC {
+    refer_to_a1:NamespaceA.TableInFirstNS;
+    refer_to_a2:NamespaceA.SecondTableInA;
+}
+
+namespace NamespaceA;
+
+table SecondTableInA {
+    refer_to_c:NamespaceC.TableInC;
+}
diff --git a/tests/namespace_test/namespace_test2_generated.h b/tests/namespace_test/namespace_test2_generated.h
index 5075894e1..1831454c2 100644
--- a/tests/namespace_test/namespace_test2_generated.h
+++ b/tests/namespace_test/namespace_test2_generated.h
@@ -9,8 +9,11 @@
 
 namespace NamespaceA {
 namespace NamespaceB {
+
 struct TableInNestedNS;
+
 struct StructInNestedNS;
+
 }  // namespace NamespaceB
 }  // namespace NamespaceA
 
@@ -18,6 +21,22 @@ namespace NamespaceA {
 
 struct TableInFirstNS;
 
+}  // namespace NamespaceA
+
+namespace NamespaceC {
+
+struct TableInC;
+
+}  // namespace NamespaceC
+
+namespace NamespaceA {
+
+struct SecondTableInA;
+
+}  // namespace NamespaceA
+
+namespace NamespaceA {
+
 struct TableInFirstNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum {
     VT_FOO_TABLE = 4,
@@ -67,4 +86,86 @@ inline flatbuffers::Offset<TableInFirstNS> CreateTableInFirstNS(flatbuffers::Fla
 
 }  // namespace NamespaceA
 
+namespace NamespaceC {
+
+struct TableInC FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  enum {
+    VT_REFER_TO_A1 = 4,
+    VT_REFER_TO_A2 = 6
+  };
+  const NamespaceA::TableInFirstNS *refer_to_a1() const { return GetPointer<const NamespaceA::TableInFirstNS *>(VT_REFER_TO_A1); }
+  NamespaceA::TableInFirstNS *mutable_refer_to_a1() { return GetPointer<NamespaceA::TableInFirstNS *>(VT_REFER_TO_A1); }
+  const NamespaceA::SecondTableInA *refer_to_a2() const { return GetPointer<const NamespaceA::SecondTableInA *>(VT_REFER_TO_A2); }
+  NamespaceA::SecondTableInA *mutable_refer_to_a2() { return GetPointer<NamespaceA::SecondTableInA *>(VT_REFER_TO_A2); }
+  bool Verify(flatbuffers::Verifier &verifier) const {
+    return VerifyTableStart(verifier) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_REFER_TO_A1) &&
+           verifier.VerifyTable(refer_to_a1()) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_REFER_TO_A2) &&
+           verifier.VerifyTable(refer_to_a2()) &&
+           verifier.EndTable();
+  }
+};
+
+struct TableInCBuilder {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_refer_to_a1(flatbuffers::Offset<NamespaceA::TableInFirstNS> refer_to_a1) { fbb_.AddOffset(TableInC::VT_REFER_TO_A1, refer_to_a1); }
+  void add_refer_to_a2(flatbuffers::Offset<NamespaceA::SecondTableInA> refer_to_a2) { fbb_.AddOffset(TableInC::VT_REFER_TO_A2, refer_to_a2); }
+  TableInCBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
+  TableInCBuilder &operator=(const TableInCBuilder &);
+  flatbuffers::Offset<TableInC> Finish() {
+    auto o = flatbuffers::Offset<TableInC>(fbb_.EndTable(start_, 2));
+    return o;
+  }
+};
+
+inline flatbuffers::Offset<TableInC> CreateTableInC(flatbuffers::FlatBufferBuilder &_fbb,
+   flatbuffers::Offset<NamespaceA::TableInFirstNS> refer_to_a1 = 0,
+   flatbuffers::Offset<NamespaceA::SecondTableInA> refer_to_a2 = 0) {
+  TableInCBuilder builder_(_fbb);
+  builder_.add_refer_to_a2(refer_to_a2);
+  builder_.add_refer_to_a1(refer_to_a1);
+  return builder_.Finish();
+}
+
+}  // namespace NamespaceC
+
+namespace NamespaceA {
+
+struct SecondTableInA FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  enum {
+    VT_REFER_TO_C = 4
+  };
+  const NamespaceC::TableInC *refer_to_c() const { return GetPointer<const NamespaceC::TableInC *>(VT_REFER_TO_C); }
+  NamespaceC::TableInC *mutable_refer_to_c() { return GetPointer<NamespaceC::TableInC *>(VT_REFER_TO_C); }
+  bool Verify(flatbuffers::Verifier &verifier) const {
+    return VerifyTableStart(verifier) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_REFER_TO_C) &&
+           verifier.VerifyTable(refer_to_c()) &&
+           verifier.EndTable();
+  }
+};
+
+struct SecondTableInABuilder {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_refer_to_c(flatbuffers::Offset<NamespaceC::TableInC> refer_to_c) { fbb_.AddOffset(SecondTableInA::VT_REFER_TO_C, refer_to_c); }
+  SecondTableInABuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
+  SecondTableInABuilder &operator=(const SecondTableInABuilder &);
+  flatbuffers::Offset<SecondTableInA> Finish() {
+    auto o = flatbuffers::Offset<SecondTableInA>(fbb_.EndTable(start_, 1));
+    return o;
+  }
+};
+
+inline flatbuffers::Offset<SecondTableInA> CreateSecondTableInA(flatbuffers::FlatBufferBuilder &_fbb,
+   flatbuffers::Offset<NamespaceC::TableInC> refer_to_c = 0) {
+  SecondTableInABuilder builder_(_fbb);
+  builder_.add_refer_to_c(refer_to_c);
+  return builder_.Finish();
+}
+
+}  // namespace NamespaceA
+
 #endif  // FLATBUFFERS_GENERATED_NAMESPACETEST2_NAMESPACEA_H_
diff --git a/tests/namespace_test/namespace_test2_generated.js b/tests/namespace_test/namespace_test2_generated.js
index e99d77573..c1953705e 100644
--- a/tests/namespace_test/namespace_test2_generated.js
+++ b/tests/namespace_test/namespace_test2_generated.js
@@ -10,6 +10,11 @@ var NamespaceA = NamespaceA || {};
 */
 NamespaceA.NamespaceB = NamespaceA.NamespaceB || {};
 
+/**
+ * @const
+*/
+var NamespaceC = NamespaceC || {};
+
 /**
  * @constructor
  */
@@ -111,5 +116,159 @@ NamespaceA.TableInFirstNS.endTableInFirstNS = function(builder) {
   return offset;
 };
 
+/**
+ * @constructor
+ */
+NamespaceC.TableInC = function() {
+  /**
+   * @type {flatbuffers.ByteBuffer}
+   */
+  this.bb = null;
+
+  /**
+   * @type {number}
+   */
+  this.bb_pos = 0;
+};
+
+/**
+ * @param {number} i
+ * @param {flatbuffers.ByteBuffer} bb
+ * @returns {NamespaceC.TableInC}
+ */
+NamespaceC.TableInC.prototype.__init = function(i, bb) {
+  this.bb_pos = i;
+  this.bb = bb;
+  return this;
+};
+
+/**
+ * @param {flatbuffers.ByteBuffer} bb
+ * @param {NamespaceC.TableInC=} obj
+ * @returns {NamespaceC.TableInC}
+ */
+NamespaceC.TableInC.getRootAsTableInC = function(bb, obj) {
+  return (obj || new NamespaceC.TableInC).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+};
+
+/**
+ * @param {NamespaceA.TableInFirstNS=} obj
+ * @returns {NamespaceA.TableInFirstNS}
+ */
+NamespaceC.TableInC.prototype.referToA1 = function(obj) {
+  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;
+};
+
+/**
+ * @param {NamespaceA.SecondTableInA=} obj
+ * @returns {NamespaceA.SecondTableInA}
+ */
+NamespaceC.TableInC.prototype.referToA2 = function(obj) {
+  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;
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ */
+NamespaceC.TableInC.startTableInC = function(builder) {
+  builder.startObject(2);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {flatbuffers.Offset} referToA1Offset
+ */
+NamespaceC.TableInC.addReferToA1 = function(builder, referToA1Offset) {
+  builder.addFieldOffset(0, referToA1Offset, 0);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {flatbuffers.Offset} referToA2Offset
+ */
+NamespaceC.TableInC.addReferToA2 = function(builder, referToA2Offset) {
+  builder.addFieldOffset(1, referToA2Offset, 0);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @returns {flatbuffers.Offset}
+ */
+NamespaceC.TableInC.endTableInC = function(builder) {
+  var offset = builder.endObject();
+  return offset;
+};
+
+/**
+ * @constructor
+ */
+NamespaceA.SecondTableInA = function() {
+  /**
+   * @type {flatbuffers.ByteBuffer}
+   */
+  this.bb = null;
+
+  /**
+   * @type {number}
+   */
+  this.bb_pos = 0;
+};
+
+/**
+ * @param {number} i
+ * @param {flatbuffers.ByteBuffer} bb
+ * @returns {NamespaceA.SecondTableInA}
+ */
+NamespaceA.SecondTableInA.prototype.__init = function(i, bb) {
+  this.bb_pos = i;
+  this.bb = bb;
+  return this;
+};
+
+/**
+ * @param {flatbuffers.ByteBuffer} bb
+ * @param {NamespaceA.SecondTableInA=} obj
+ * @returns {NamespaceA.SecondTableInA}
+ */
+NamespaceA.SecondTableInA.getRootAsSecondTableInA = function(bb, obj) {
+  return (obj || new NamespaceA.SecondTableInA).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+};
+
+/**
+ * @param {NamespaceC.TableInC=} obj
+ * @returns {NamespaceC.TableInC}
+ */
+NamespaceA.SecondTableInA.prototype.referToC = function(obj) {
+  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;
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ */
+NamespaceA.SecondTableInA.startSecondTableInA = function(builder) {
+  builder.startObject(1);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {flatbuffers.Offset} referToCOffset
+ */
+NamespaceA.SecondTableInA.addReferToC = function(builder, referToCOffset) {
+  builder.addFieldOffset(0, referToCOffset, 0);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @returns {flatbuffers.Offset}
+ */
+NamespaceA.SecondTableInA.endSecondTableInA = function(builder) {
+  var offset = builder.endObject();
+  return offset;
+};
+
 // Exports for Node.js and RequireJS
 this.NamespaceA = NamespaceA;
+this.NamespaceC = NamespaceC;

From 9a76ce8a65d330ea84de9a92c4c62d714ef75800 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 22 Feb 2016 11:33:14 -0800
Subject: [PATCH 081/185] Disabled broken biicode builds on Travis for the
 moment.

Change-Id: I834e6da091ea704a3fe599a5b99f338d29cd3bf1
---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7c3fd3480..bee81694b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,9 @@ env:
   matrix:
     - BUILD_TYPE=Debug BIICODE=false
     - BUILD_TYPE=Release BIICODE=false
-    - BUILD_TYPE=Release BIICODE=true
-    - BUILD_TYPE=Debug BIICODE=true
+    # biicode .deb files no longer available.
+    # - BUILD_TYPE=Release BIICODE=true
+    # - BUILD_TYPE=Debug BIICODE=true
   global:
     - GCC_VERSION="4.9"
 

From cbab26673b99b0a5dff9907fbe08e1efc211f1ff Mon Sep 17 00:00:00 2001
From: Nalinichandra Penke <chandrapenke@gmail.com>
Date: Mon, 22 Feb 2016 14:27:08 -0600
Subject: [PATCH 082/185] Fix #3775: Skip unknown field names if they're quoted

---
 src/idl_parser.cpp | 6 +++++-
 tests/test.cpp     | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index adbd79edc..263f6509a 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -1557,8 +1557,12 @@ CheckedError Parser::SkipJsonObject() {
   for (;;) {
     if ((!opts.strict_json || !fieldn) && Is('}')) break;
 
-    if (!Is(kTokenStringConstant))
+    if (!Is(kTokenStringConstant)) {
       EXPECT(opts.strict_json ? kTokenStringConstant : kTokenIdentifier);
+    }
+    else {
+      NEXT();
+    }
 
     EXPECT(':');
     ECHECK(SkipAnyJsonValue());
diff --git a/tests/test.cpp b/tests/test.cpp
index fce249e99..42d9e3ce1 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -830,10 +830,13 @@ void UnknownFieldsTest() {
   TEST_EQ(parser.Parse("table T { str:string; i:int;}"
                        "root_type T;"
                        "{ str:\"test\","
+                       "unknown_string:\"test\","
+                       "\"unknown_string\":\"test\","
                        "unknown_int:10,"
                        "unknown_float:1.0,"
                        "unknown_array: [ 1, 2, 3, 4],"
                        "unknown_object: { i: 10 },"
+                       "\"unknown_object\": { \"i\": 10 },"
                        "i:10}"), true);
 
   std::string jsongen;

From 31b30335f6336989216bcdb7dd1178cd08021684 Mon Sep 17 00:00:00 2001
From: Evan Wallace <evan.exe@gmail.com>
Date: Thu, 25 Feb 2016 01:06:16 -0800
Subject: [PATCH 083/185] Fix #3773: Generated JS now avoids the flatbuffers
 object

---
 js/flatbuffers.js               | 32 ++++++++++++++++++++++
 src/idl_gen_js.cpp              | 20 +++++++-------
 tests/JavaScriptTest.js         | 47 +++++++++++++++++++++++++++++++++
 tests/monster_test_generated.js | 20 +++++++-------
 4 files changed, 98 insertions(+), 21 deletions(-)

diff --git a/js/flatbuffers.js b/js/flatbuffers.js
index f3c483425..6c3d15cc8 100644
--- a/js/flatbuffers.js
+++ b/js/flatbuffers.js
@@ -88,6 +88,16 @@ flatbuffers.Long = function(low, high) {
   this.high = high | 0;
 };
 
+/**
+ * @param {number} high
+ * @param {number} low
+ * @returns {flatbuffers.Long}
+ */
+flatbuffers.Long.create = function(low, high) {
+  // Special-case zero to avoid GC overhead for default values
+  return low == 0 && high == 0 ? flatbuffers.Long.ZERO : new flatbuffers.Long(low, high);
+};
+
 /**
  * @returns {number}
  */
@@ -751,6 +761,17 @@ flatbuffers.Builder.prototype.createString = function(s) {
   }
   return this.endVector();
 };
+
+/**
+ * A helper function to avoid generated code depending on this file directly.
+ *
+ * @param {number} low
+ * @param {number} high
+ * @returns {flatbuffers.Long}
+ */
+flatbuffers.Builder.prototype.createLong = function(low, high) {
+  return flatbuffers.Long.create(low, high);
+};
 ////////////////////////////////////////////////////////////////////////////////
 /// @cond FLATBUFFERS_INTERNAL
 /**
@@ -1101,6 +1122,17 @@ flatbuffers.ByteBuffer.prototype.__has_identifier = function(ident) {
   return true;
 };
 
+/**
+ * A helper function to avoid generated code depending on this file directly.
+ *
+ * @param {number} low
+ * @param {number} high
+ * @returns {flatbuffers.Long}
+ */
+flatbuffers.ByteBuffer.prototype.createLong = function(low, high) {
+  return flatbuffers.Long.create(low, high);
+};
+
 // Exports for Node.js and RequireJS
 this.flatbuffers = flatbuffers;
 
diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp
index 7efc39571..f31d70f5a 100644
--- a/src/idl_gen_js.cpp
+++ b/src/idl_gen_js.cpp
@@ -189,7 +189,7 @@ static std::string GenGetter(const Type &type, const std::string &arguments) {
   }
 }
 
-static std::string GenDefaultValue(const Value &value) {
+static 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)) {
@@ -205,13 +205,11 @@ static std::string GenDefaultValue(const Value &value) {
       return "null";
 
     case BASE_TYPE_LONG:
-    case BASE_TYPE_ULONG:
-      if (value.constant != "0") {
-        int64_t constant = StringToInt(value.constant.c_str());
-        return "new flatbuffers.Long(" + NumToString((int32_t)constant) +
-          ", " + NumToString((int32_t)(constant >> 32)) + ")";
-      }
-      return "flatbuffers.Long.ZERO";
+    case BASE_TYPE_ULONG: {
+      int64_t constant = StringToInt(value.constant.c_str());
+      return context + ".createLong(" + NumToString((int32_t)constant) +
+        ", " + NumToString((int32_t)(constant >> 32)) + ")";
+    }
 
     default:
       return value.constant;
@@ -417,7 +415,7 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
           index += ", optionalEncoding";
         }
         code += offset_prefix + GenGetter(field.value.type,
-          "(" + index + ")") + " : " + GenDefaultValue(field.value);
+          "(" + index + ")") + " : " + GenDefaultValue(field.value, "this.bb");
         code += ";\n";
       }
     }
@@ -485,7 +483,7 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
             code += "false";
           } else if (field.value.type.element == BASE_TYPE_LONG ||
               field.value.type.element == BASE_TYPE_ULONG) {
-            code += "flatbuffers.Long.ZERO";
+            code += "this.bb.createLong(0, 0)";
           } else if (IsScalar(field.value.type.element)) {
             code += "0";
           } else {
@@ -570,7 +568,7 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
         if (field.value.type.base_type == BASE_TYPE_BOOL) {
           code += "+";
         }
-        code += GenDefaultValue(field.value);
+        code += GenDefaultValue(field.value, "builder");
       }
       code += ");\n};\n\n";
 
diff --git a/tests/JavaScriptTest.js b/tests/JavaScriptTest.js
index 8eb50f3c5..3ed8b5156 100644
--- a/tests/JavaScriptTest.js
+++ b/tests/JavaScriptTest.js
@@ -67,6 +67,7 @@ function main() {
   // Test it:
   testBuffer(fbb.dataBuffer());
 
+  test64bit();
   testUnicode();
   fuzzTest1();
 
@@ -117,6 +118,52 @@ function testBuffer(bb) {
   assert.strictEqual(monster.testbool(), false);
 }
 
+function test64bit() {
+  var fbb = new flatbuffers.Builder();
+  var required = fbb.createString('required');
+
+  MyGame.Example.Stat.startStat(fbb);
+  var stat2 = MyGame.Example.Stat.endStat(fbb);
+
+  MyGame.Example.Monster.startMonster(fbb);
+  MyGame.Example.Monster.addName(fbb, required);
+  MyGame.Example.Monster.addTestempty(fbb, stat2);
+  var mon2 = MyGame.Example.Monster.endMonster(fbb);
+
+  MyGame.Example.Stat.startStat(fbb);
+  MyGame.Example.Stat.addVal(fbb, new flatbuffers.Long(0x12345678, 0x23456789));
+  var stat = MyGame.Example.Stat.endStat(fbb);
+
+  MyGame.Example.Monster.startMonster(fbb);
+  MyGame.Example.Monster.addName(fbb, required);
+  MyGame.Example.Monster.addEnemy(fbb, mon2);
+  MyGame.Example.Monster.addTestempty(fbb, stat);
+  var mon = MyGame.Example.Monster.endMonster(fbb);
+
+  MyGame.Example.Monster.finishMonsterBuffer(fbb, mon);
+  var bytes = fbb.asUint8Array();
+
+  ////////////////////////////////////////////////////////////////
+
+  var bb = new flatbuffers.ByteBuffer(bytes);
+  assert.ok(MyGame.Example.Monster.bufferHasIdentifier(bb));
+  var mon = MyGame.Example.Monster.getRootAsMonster(bb);
+
+  var stat = mon.testempty();
+  assert.strictEqual(stat != null, true);
+  assert.strictEqual(stat.val() != null, true);
+  assert.strictEqual(stat.val().low, 0x12345678);
+  assert.strictEqual(stat.val().high, 0x23456789);
+
+  var mon2 = mon.enemy();
+  assert.strictEqual(mon2 != null, true);
+  stat = mon2.testempty();
+  assert.strictEqual(stat != null, true);
+  assert.strictEqual(stat.val() != null, true);
+  assert.strictEqual(stat.val().low, 0); // default value
+  assert.strictEqual(stat.val().high, 0);
+}
+
 function testUnicode() {
   var correct = fs.readFileSync('unicode_test.mon');
   var json = JSON.parse(fs.readFileSync('unicode_test.json', 'utf8'));
diff --git a/tests/monster_test_generated.js b/tests/monster_test_generated.js
index 9d0f48b09..77c41d7f1 100644
--- a/tests/monster_test_generated.js
+++ b/tests/monster_test_generated.js
@@ -300,7 +300,7 @@ MyGame.Example.Stat.prototype.id = function(optionalEncoding) {
  */
 MyGame.Example.Stat.prototype.val = function() {
   var offset = this.bb.__offset(this.bb_pos, 6);
-  return offset ? this.bb.readInt64(this.bb_pos + offset) : flatbuffers.Long.ZERO;
+  return offset ? this.bb.readInt64(this.bb_pos + offset) : this.bb.createLong(0, 0);
 };
 
 /**
@@ -331,7 +331,7 @@ MyGame.Example.Stat.addId = function(builder, idOffset) {
  * @param {flatbuffers.Long} val
  */
 MyGame.Example.Stat.addVal = function(builder, val) {
-  builder.addFieldInt64(1, val, flatbuffers.Long.ZERO);
+  builder.addFieldInt64(1, val, builder.createLong(0, 0));
 };
 
 /**
@@ -593,7 +593,7 @@ MyGame.Example.Monster.prototype.testhashu32Fnv1 = function() {
  */
 MyGame.Example.Monster.prototype.testhashs64Fnv1 = function() {
   var offset = this.bb.__offset(this.bb_pos, 40);
-  return offset ? this.bb.readInt64(this.bb_pos + offset) : flatbuffers.Long.ZERO;
+  return offset ? this.bb.readInt64(this.bb_pos + offset) : this.bb.createLong(0, 0);
 };
 
 /**
@@ -601,7 +601,7 @@ MyGame.Example.Monster.prototype.testhashs64Fnv1 = function() {
  */
 MyGame.Example.Monster.prototype.testhashu64Fnv1 = function() {
   var offset = this.bb.__offset(this.bb_pos, 42);
-  return offset ? this.bb.readUint64(this.bb_pos + offset) : flatbuffers.Long.ZERO;
+  return offset ? this.bb.readUint64(this.bb_pos + offset) : this.bb.createLong(0, 0);
 };
 
 /**
@@ -625,7 +625,7 @@ MyGame.Example.Monster.prototype.testhashu32Fnv1a = function() {
  */
 MyGame.Example.Monster.prototype.testhashs64Fnv1a = function() {
   var offset = this.bb.__offset(this.bb_pos, 48);
-  return offset ? this.bb.readInt64(this.bb_pos + offset) : flatbuffers.Long.ZERO;
+  return offset ? this.bb.readInt64(this.bb_pos + offset) : this.bb.createLong(0, 0);
 };
 
 /**
@@ -633,7 +633,7 @@ MyGame.Example.Monster.prototype.testhashs64Fnv1a = function() {
  */
 MyGame.Example.Monster.prototype.testhashu64Fnv1a = function() {
   var offset = this.bb.__offset(this.bb_pos, 50);
-  return offset ? this.bb.readUint64(this.bb_pos + offset) : flatbuffers.Long.ZERO;
+  return offset ? this.bb.readUint64(this.bb_pos + offset) : this.bb.createLong(0, 0);
 };
 
 /**
@@ -893,7 +893,7 @@ MyGame.Example.Monster.addTesthashu32Fnv1 = function(builder, testhashu32Fnv1) {
  * @param {flatbuffers.Long} testhashs64Fnv1
  */
 MyGame.Example.Monster.addTesthashs64Fnv1 = function(builder, testhashs64Fnv1) {
-  builder.addFieldInt64(18, testhashs64Fnv1, flatbuffers.Long.ZERO);
+  builder.addFieldInt64(18, testhashs64Fnv1, builder.createLong(0, 0));
 };
 
 /**
@@ -901,7 +901,7 @@ MyGame.Example.Monster.addTesthashs64Fnv1 = function(builder, testhashs64Fnv1) {
  * @param {flatbuffers.Long} testhashu64Fnv1
  */
 MyGame.Example.Monster.addTesthashu64Fnv1 = function(builder, testhashu64Fnv1) {
-  builder.addFieldInt64(19, testhashu64Fnv1, flatbuffers.Long.ZERO);
+  builder.addFieldInt64(19, testhashu64Fnv1, builder.createLong(0, 0));
 };
 
 /**
@@ -925,7 +925,7 @@ MyGame.Example.Monster.addTesthashu32Fnv1a = function(builder, testhashu32Fnv1a)
  * @param {flatbuffers.Long} testhashs64Fnv1a
  */
 MyGame.Example.Monster.addTesthashs64Fnv1a = function(builder, testhashs64Fnv1a) {
-  builder.addFieldInt64(22, testhashs64Fnv1a, flatbuffers.Long.ZERO);
+  builder.addFieldInt64(22, testhashs64Fnv1a, builder.createLong(0, 0));
 };
 
 /**
@@ -933,7 +933,7 @@ MyGame.Example.Monster.addTesthashs64Fnv1a = function(builder, testhashs64Fnv1a)
  * @param {flatbuffers.Long} testhashu64Fnv1a
  */
 MyGame.Example.Monster.addTesthashu64Fnv1a = function(builder, testhashu64Fnv1a) {
-  builder.addFieldInt64(23, testhashu64Fnv1a, flatbuffers.Long.ZERO);
+  builder.addFieldInt64(23, testhashu64Fnv1a, builder.createLong(0, 0));
 };
 
 /**

From 66126cc32dfd863aebc93679e63733ed35db8cf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Baldassari?= <francois@pebble.com>
Date: Fri, 26 Feb 2016 09:00:46 -0800
Subject: [PATCH 084/185] Fix typo in documentation navigation

---
 docs/source/doxygen_layout.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/doxygen_layout.xml b/docs/source/doxygen_layout.xml
index 9cb838193..aa719f925 100644
--- a/docs/source/doxygen_layout.xml
+++ b/docs/source/doxygen_layout.xml
@@ -45,7 +45,7 @@
     <tab type="user" url="@ref flatbuffers_internals"
         title="FlatBuffers internals"/>
     <tab type="user" url="@ref flatbuffers_grammar"
-        title="Grammar of the schema langauge"/>
+        title="Grammar of the schema language"/>
     <tab type="usergroup" url="" title="API Reference">
       <tab type="modules" visible="yes" title="APIs" intro=""/>
       <tab type="classes" visible="yes" title="">
@@ -208,7 +208,7 @@
       <variables title=""/>
       <signals title=""/>
       <publicslots title=""/>
-      <protectedslots title=""/>
+      <protectedslots title=""/>l
       <privateslots title=""/>
       <events title=""/>
       <properties title=""/>

From 3d5f7f64f8a083ce95b7509db7384034fdd94434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Baldassari?= <francois@pebble.com>
Date: Fri, 26 Feb 2016 09:03:22 -0800
Subject: [PATCH 085/185] Remove erroneous extra character

---
 docs/source/doxygen_layout.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/doxygen_layout.xml b/docs/source/doxygen_layout.xml
index aa719f925..1437016ea 100644
--- a/docs/source/doxygen_layout.xml
+++ b/docs/source/doxygen_layout.xml
@@ -208,7 +208,7 @@
       <variables title=""/>
       <signals title=""/>
       <publicslots title=""/>
-      <protectedslots title=""/>l
+      <protectedslots title=""/>
       <privateslots title=""/>
       <events title=""/>
       <properties title=""/>

From 26f15bcd77985a00792afec073d419cab3162fb0 Mon Sep 17 00:00:00 2001
From: Yuri <yuri@tsoft.com>
Date: Wed, 2 Mar 2016 17:15:42 -0800
Subject: [PATCH 086/185] Fixed missing -lc++abi on FreeBSD.

---
 CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8449caa8..d2edf829b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,8 +89,10 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
 elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   set(CMAKE_CXX_FLAGS
       "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
-  set(CMAKE_EXE_LINKER_FLAGS
-      "${CMAKE_EXE_LINKER_FLAGS} -lc++abi")
+  if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
+    set(CMAKE_EXE_LINKER_FLAGS
+        "${CMAKE_EXE_LINKER_FLAGS} -lc++abi")
+  endif()
 endif()
 
 if(FLATBUFFERS_CODE_COVERAGE)

From 19afcdc70483d9f1111382fee96126f3407d8b6b Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 29 Feb 2016 14:31:06 -0800
Subject: [PATCH 087/185] Clarified how to test for the presence of fields.

This is FAQ on the issue tracker.

Bug: 26863353
Change-Id: I227e10a5c0134dbe7fd7f59e64cd57a0752c568e
---
 docs/source/Schemas.md | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/docs/source/Schemas.md b/docs/source/Schemas.md
index 2ed3005d9..7ac3bc735 100755
--- a/docs/source/Schemas.md
+++ b/docs/source/Schemas.md
@@ -122,7 +122,8 @@ default to `NULL` when not present.
 
 You generally do not want to change default values after they're initially
 defined. Fields that have the default value are not actually stored in the
-serialized data but are generated in code, so when you change the default, you'd
+serialized data (see also Gotchas below) but are generated in code,
+so when you change the default, you'd
 now get a different value than from code generated from an older version of
 the schema. There are situations, however, where this may be
 desirable, especially if you can ensure a simultaneous rebuild of
@@ -425,4 +426,28 @@ incompatible with the actual binary buffers, since those only ever address
 fields by id/offset.
 <br>
 
+### Testing whether a field is present in a table
+
+Most serialization formats (e.g. JSON or Protocol Buffers) make it very
+explicit in the format whether a field is present in an object or not,
+allowing you to use this as "extra" information.
+
+In FlatBuffers, this also holds for everything except scalar values.
+
+FlatBuffers by default will not write fields that are equal to the default
+value (for scalars), sometimes resulting in a significant space savings.
+
+However, this also means testing whether a field is "present" is somewhat
+meaningless, since it does not tell you if the field was actually written by
+calling `add_field` style calls, unless you're only interested in this
+information for non-default values.
+
+Some `FlatBufferBuilder` implementations have an option called `force_defaults`
+that circumvents this behavior, and writes fields even if they are equal to
+the default. You can then use `IsFieldPresent` to query this.
+
+Another option that works in all languages is to wrap a scalar field in a
+struct. This way it will return null if it is not present. The cool thing
+is that structs don't take up any more space than the scalar they represent.
+
    [Interface Definition Language]: https://en.wikipedia.org/wiki/Interface_description_language

From 958fc6ec49199ba47dd2492bef51845a53ec27e2 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 29 Feb 2016 15:47:46 -0800
Subject: [PATCH 088/185] Added support for easy string pooling.

Change-Id: I790cf681c1bffff800d77afb0e2f908d1c827679
Tested: on Linux.
Bug: 26186542
---
 include/flatbuffers/flatbuffers.h | 80 +++++++++++++++++++++++++++++--
 include/flatbuffers/reflection.h  |  6 ++-
 src/reflection.cpp                | 11 +++--
 tests/test.cpp                    | 20 +++++---
 4 files changed, 102 insertions(+), 15 deletions(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 14a055e8b..ff9f7269d 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -26,6 +26,7 @@
 #include <string>
 #include <type_traits>
 #include <vector>
+#include <set>
 #include <algorithm>
 #include <functional>
 #include <memory>
@@ -499,7 +500,7 @@ class vector_downward {
     return cur_;
   }
 
-  uint8_t *data_at(size_t offset) { return buf_ + reserved_ - offset; }
+  uint8_t *data_at(size_t offset) const { return buf_ + reserved_ - offset; }
 
   // push() & fill() are most frequently called with small byte counts (<= 4),
   // which is why we're using loops rather than calling memcpy/memset.
@@ -565,12 +566,17 @@ FLATBUFFERS_FINAL_CLASS
   explicit FlatBufferBuilder(uoffset_t initial_size = 1024,
                              const simple_allocator *allocator = nullptr)
       : buf_(initial_size, allocator ? *allocator : default_allocator),
-        nested(false), finished(false), minalign_(1), force_defaults_(false) {
+        nested(false), finished(false), minalign_(1), force_defaults_(false),
+        string_pool(nullptr) {
     offsetbuf_.reserve(16);  // Avoid first few reallocs.
     vtables_.reserve(16);
     EndianCheck();
   }
 
+  ~FlatBufferBuilder() {
+    if (string_pool) delete string_pool;
+  }
+
   /// @brief Reset all the state in this FlatBufferBuilder so it can be reused
   /// to construct another buffer.
   void Clear() {
@@ -580,6 +586,7 @@ FLATBUFFERS_FINAL_CLASS
     finished = false;
     vtables_.clear();
     minalign_ = 1;
+    if (string_pool) string_pool->clear();
   }
 
   /// @brief The current size of the serialized buffer, counting from the end.
@@ -829,7 +836,7 @@ FLATBUFFERS_FINAL_CLASS
     return Offset<String>(GetSize());
   }
 
-  /// @brief Store a string in the buffer, which can contain any binary data.
+  /// @brief Store a string in the buffer, which is null-terminated.
   /// @param[in] str A const char pointer to a C-string to add to the buffer.
   /// @return Returns the offset in the buffer where the string starts.
   Offset<String> CreateString(const char *str) {
@@ -850,6 +857,58 @@ FLATBUFFERS_FINAL_CLASS
     return CreateString(str->c_str(), str->Length());
   }
 
+  /// @brief Store a string in the buffer, which can contain any binary data.
+  /// If a string with this exact contents has already been serialized before,
+  /// instead simply returns the offset of the existing string.
+  /// @param[in] str A const char pointer to the data to be stored as a string.
+  /// @param[in] len The number of bytes that should be stored from `str`.
+  /// @return Returns the offset in the buffer where the string starts.
+  Offset<String> CreateSharedString(const char *str, size_t len) {
+    if (!string_pool)
+      string_pool = new StringOffsetMap(StringOffsetCompare(buf_));
+    auto size_before_string = buf_.size();
+    // Must first serialize the string, since the set is all offsets into
+    // buffer.
+    auto off = CreateString(str, len);
+    auto it = string_pool->find(off);
+    // If it exists we reuse existing serialized data!
+    if (it != string_pool->end()) {
+      // We can remove the string we serialized.
+      buf_.pop(buf_.size() - size_before_string);
+      return *it;
+    }
+    // Record this string for future use.
+    string_pool->insert(off);
+    return off;
+  }
+
+  /// @brief Store a string in the buffer, which null-terminated.
+  /// If a string with this exact contents has already been serialized before,
+  /// instead simply returns the offset of the existing string.
+  /// @param[in] str A const char pointer to a C-string to add to the buffer.
+  /// @return Returns the offset in the buffer where the string starts.
+  Offset<String> CreateSharedString(const char *str) {
+    return CreateSharedString(str, strlen(str));
+  }
+
+  /// @brief Store a string in the buffer, which can contain any binary data.
+  /// If a string with this exact contents has already been serialized before,
+  /// instead simply returns the offset of the existing string.
+  /// @param[in] str A const reference to a std::string to store in the buffer.
+  /// @return Returns the offset in the buffer where the string starts.
+  Offset<String> CreateSharedString(const std::string &str) {
+    return CreateSharedString(str.c_str(), str.length());
+  }
+
+  /// @brief Store a string in the buffer, which can contain any binary data.
+  /// If a string with this exact contents has already been serialized before,
+  /// instead simply returns the offset of the existing string.
+  /// @param[in] str A const pointer to a `String` struct to add to the buffer.
+  /// @return Returns the offset in the buffer where the string starts
+  Offset<String> CreateSharedString(const String *str) {
+    return CreateSharedString(str->c_str(), str->Length());
+  }
+
   /// @cond FLATBUFFERS_INTERNAL
   uoffset_t EndVector(size_t len) {
     assert(nested);  // Hit if no corresponding StartVector.
@@ -1048,6 +1107,21 @@ FLATBUFFERS_FINAL_CLASS
   size_t minalign_;
 
   bool force_defaults_;  // Serialize values equal to their defaults anyway.
+
+  struct StringOffsetCompare {
+    StringOffsetCompare(const vector_downward &buf) : buf_(buf) {}
+    bool operator() (const Offset<String> &a, const Offset<String> &b) const {
+      auto stra = reinterpret_cast<const String *>(buf_.data_at(a.o));
+      auto strb = reinterpret_cast<const String *>(buf_.data_at(b.o));
+      return strncmp(stra->c_str(), strb->c_str(),
+                     std::min(stra->size(), strb->size()) + 1) < 0;
+    }
+    const vector_downward &buf_;
+  };
+
+  // For use with CreateSharedString. Instantiated on first use only.
+  typedef std::set<Offset<String>, StringOffsetCompare> StringOffsetMap;
+  StringOffsetMap *string_pool;
 };
 /// @}
 
diff --git a/include/flatbuffers/reflection.h b/include/flatbuffers/reflection.h
index cb18b1437..ababe6ad4 100644
--- a/include/flatbuffers/reflection.h
+++ b/include/flatbuffers/reflection.h
@@ -415,12 +415,14 @@ inline bool SetFieldT(Table *table, const reflection::Field &field,
 // above resizing functionality has introduced garbage in a buffer you want
 // to remove.
 // Note: this does not deal with DAGs correctly. If the table passed forms a
-// DAG, the copy will be a tree instead (with duplicates).
+// DAG, the copy will be a tree instead (with duplicates). Strings can be
+// shared however, by passing true for use_string_pooling.
 
 Offset<const Table *> CopyTable(FlatBufferBuilder &fbb,
                                 const reflection::Schema &schema,
                                 const reflection::Object &objectdef,
-                                const Table &table);
+                                const Table &table,
+                                bool use_string_pooling = false);
 
 }  // namespace flatbuffers
 
diff --git a/src/reflection.cpp b/src/reflection.cpp
index d82c046cc..ff499ae99 100644
--- a/src/reflection.cpp
+++ b/src/reflection.cpp
@@ -354,7 +354,8 @@ 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) {
   // Before we can construct the table, we have to first generate any
   // subobjects, and collect their offsets.
   std::vector<uoffset_t> offsets;
@@ -366,7 +367,9 @@ Offset<const Table *> CopyTable(FlatBufferBuilder &fbb,
     uoffset_t offset = 0;
     switch (fielddef.type()->base_type()) {
       case reflection::String: {
-        offset = fbb.CreateString(GetFieldS(table, fielddef)).o;
+        offset = use_string_pooling
+                 ? fbb.CreateSharedString(GetFieldS(table, fielddef)).o
+                 : fbb.CreateString(GetFieldS(table, fielddef)).o;
         break;
       }
       case reflection::Obj: {
@@ -395,7 +398,9 @@ Offset<const Table *> CopyTable(FlatBufferBuilder &fbb,
             std::vector<Offset<const String *>> elements(vec->size());
             auto vec_s = reinterpret_cast<const Vector<Offset<String>> *>(vec);
             for (uoffset_t i = 0; i < vec_s->size(); i++) {
-              elements[i] = fbb.CreateString(vec_s->Get(i)).o;
+              elements[i] = use_string_pooling
+                            ? fbb.CreateSharedString(vec_s->Get(i)).o
+                            : fbb.CreateString(vec_s->Get(i)).o;
             }
             offset = fbb.CreateVector(elements).o;
             break;
diff --git a/tests/test.cpp b/tests/test.cpp
index fce249e99..52da4518f 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -113,11 +113,13 @@ flatbuffers::unique_ptr_t CreateFlatBufferTest(std::string &buffer) {
   mb3.add_name(wilma);
   mlocs[2] = mb3.Finish();
 
-  // Create an array of strings:
-  flatbuffers::Offset<flatbuffers::String> strings[2];
-  strings[0] = builder.CreateString("bob");
-  strings[1] = builder.CreateString("fred");
-  auto vecofstrings = builder.CreateVector(strings, 2);
+  // Create an array of strings. Also test string pooling.
+  flatbuffers::Offset<flatbuffers::String> strings[4];
+  strings[0] = builder.CreateSharedString("bob");
+  strings[1] = builder.CreateSharedString("fred");
+  strings[2] = builder.CreateSharedString("bob");
+  strings[3] = builder.CreateSharedString("fred");
+  auto vecofstrings = builder.CreateVector(strings, 4);
 
   // Create an array of sorted tables, can be used with binary search when read:
   auto vecoftables = builder.CreateVectorOfSortedTables(mlocs, 3);
@@ -188,9 +190,12 @@ void AccessFlatBufferTest(const uint8_t *flatbuf, size_t length) {
 
   // Example of accessing a vector of strings:
   auto vecofstrings = monster->testarrayofstring();
-  TEST_EQ(vecofstrings->Length(), 2U);
+  TEST_EQ(vecofstrings->Length(), 4U);
   TEST_EQ_STR(vecofstrings->Get(0)->c_str(), "bob");
   TEST_EQ_STR(vecofstrings->Get(1)->c_str(), "fred");
+  // These should have pointer equality because of string pooling.
+  TEST_EQ(vecofstrings->Get(0)->c_str(), vecofstrings->Get(2)->c_str());
+  TEST_EQ(vecofstrings->Get(1)->c_str(), vecofstrings->Get(3)->c_str());
 
   // Example of accessing a vector of tables:
   auto vecoftables = monster->testarrayoftables();
@@ -420,7 +425,8 @@ void ReflectionTest(uint8_t *flatbuf, size_t length) {
   // either part or whole.
   flatbuffers::FlatBufferBuilder fbb;
   auto root_offset = flatbuffers::CopyTable(fbb, schema, *root_table,
-                                            *flatbuffers::GetAnyRoot(flatbuf));
+                                            *flatbuffers::GetAnyRoot(flatbuf),
+                                            true);
   fbb.Finish(root_offset, MonsterIdentifier());
   // Test that it was copied correctly:
   AccessFlatBufferTest(fbb.GetBufferPointer(), fbb.GetSize());

From 81e4d3c6c3649a4e48af6ba714567fb4047ea0d3 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 2 Mar 2016 16:29:46 -0800
Subject: [PATCH 089/185] Moved the build dir to build_ide to not clash with
 BUILD files.

Change-Id: I9576e130142acc697fadbfb6aacfd5969f25866a
Tested: on Windows.
Bug: 27426239
---
 {build => build_ide}/VS2010/FlatBuffers.sln                      | 0
 {build => build_ide}/VS2010/flatc.vcxproj                        | 0
 {build => build_ide}/VS2010/flatc.vcxproj.user                   | 0
 {build => build_ide}/VS2010/flatsamplebinary.vcxproj             | 0
 {build => build_ide}/VS2010/flatsamplebinary.vcxproj.user        | 0
 {build => build_ide}/VS2010/flatsampletext.vcxproj               | 0
 {build => build_ide}/VS2010/flatsampletext.vcxproj.user          | 0
 {build => build_ide}/VS2010/flattests.vcxproj                    | 0
 {build => build_ide}/VS2010/flattests.vcxproj.user               | 0
 {build => build_ide}/Xcode/FlatBuffers.xcodeproj/project.pbxproj | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename {build => build_ide}/VS2010/FlatBuffers.sln (100%)
 rename {build => build_ide}/VS2010/flatc.vcxproj (100%)
 rename {build => build_ide}/VS2010/flatc.vcxproj.user (100%)
 rename {build => build_ide}/VS2010/flatsamplebinary.vcxproj (100%)
 rename {build => build_ide}/VS2010/flatsamplebinary.vcxproj.user (100%)
 rename {build => build_ide}/VS2010/flatsampletext.vcxproj (100%)
 rename {build => build_ide}/VS2010/flatsampletext.vcxproj.user (100%)
 rename {build => build_ide}/VS2010/flattests.vcxproj (100%)
 rename {build => build_ide}/VS2010/flattests.vcxproj.user (100%)
 rename {build => build_ide}/Xcode/FlatBuffers.xcodeproj/project.pbxproj (100%)

diff --git a/build/VS2010/FlatBuffers.sln b/build_ide/VS2010/FlatBuffers.sln
similarity index 100%
rename from build/VS2010/FlatBuffers.sln
rename to build_ide/VS2010/FlatBuffers.sln
diff --git a/build/VS2010/flatc.vcxproj b/build_ide/VS2010/flatc.vcxproj
similarity index 100%
rename from build/VS2010/flatc.vcxproj
rename to build_ide/VS2010/flatc.vcxproj
diff --git a/build/VS2010/flatc.vcxproj.user b/build_ide/VS2010/flatc.vcxproj.user
similarity index 100%
rename from build/VS2010/flatc.vcxproj.user
rename to build_ide/VS2010/flatc.vcxproj.user
diff --git a/build/VS2010/flatsamplebinary.vcxproj b/build_ide/VS2010/flatsamplebinary.vcxproj
similarity index 100%
rename from build/VS2010/flatsamplebinary.vcxproj
rename to build_ide/VS2010/flatsamplebinary.vcxproj
diff --git a/build/VS2010/flatsamplebinary.vcxproj.user b/build_ide/VS2010/flatsamplebinary.vcxproj.user
similarity index 100%
rename from build/VS2010/flatsamplebinary.vcxproj.user
rename to build_ide/VS2010/flatsamplebinary.vcxproj.user
diff --git a/build/VS2010/flatsampletext.vcxproj b/build_ide/VS2010/flatsampletext.vcxproj
similarity index 100%
rename from build/VS2010/flatsampletext.vcxproj
rename to build_ide/VS2010/flatsampletext.vcxproj
diff --git a/build/VS2010/flatsampletext.vcxproj.user b/build_ide/VS2010/flatsampletext.vcxproj.user
similarity index 100%
rename from build/VS2010/flatsampletext.vcxproj.user
rename to build_ide/VS2010/flatsampletext.vcxproj.user
diff --git a/build/VS2010/flattests.vcxproj b/build_ide/VS2010/flattests.vcxproj
similarity index 100%
rename from build/VS2010/flattests.vcxproj
rename to build_ide/VS2010/flattests.vcxproj
diff --git a/build/VS2010/flattests.vcxproj.user b/build_ide/VS2010/flattests.vcxproj.user
similarity index 100%
rename from build/VS2010/flattests.vcxproj.user
rename to build_ide/VS2010/flattests.vcxproj.user
diff --git a/build/Xcode/FlatBuffers.xcodeproj/project.pbxproj b/build_ide/Xcode/FlatBuffers.xcodeproj/project.pbxproj
similarity index 100%
rename from build/Xcode/FlatBuffers.xcodeproj/project.pbxproj
rename to build_ide/Xcode/FlatBuffers.xcodeproj/project.pbxproj

From 3cd9181ef814e847d365c0016419473a2f93a66e Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 7 Mar 2016 14:15:01 -0800
Subject: [PATCH 090/185] Fixed Java pom.xml file still having wrong version
 number.

Change-Id: I95bc50ecd3b49d91fb81477a8818e3c1f253ff77
---
 java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index 6713fe503..dd92b9d55 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.flatbuffers</groupId>
   <artifactId>flatbuffers-java</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>FlatBuffers Java API</name>
   <description>

From fbc8af40e34bebbbbf287bee25e3e4aab81213c3 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 7 Mar 2016 17:22:51 -0800
Subject: [PATCH 091/185] Allow JSON numeric fields to be specified by a
 numeric data in a string.

Change-Id: I6a3fae1e71434a7384edc39b8602bd84a0432edb
Tested: on Linux.
Bug: 24140897
---
 include/flatbuffers/idl.h   |  2 +-
 src/idl_parser.cpp          | 28 ++++++++++++++++++++++------
 tests/monsterdata_test.json |  4 ++--
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index e16d3ca90..17d89a42a 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -470,7 +470,7 @@ private:
                                           BaseType req, bool *destmatch);
   FLATBUFFERS_CHECKED_ERROR ParseHash(Value &e, FieldDef* field);
   FLATBUFFERS_CHECKED_ERROR ParseSingleValue(Value &e);
-  FLATBUFFERS_CHECKED_ERROR ParseIntegerFromString(Type &type, int64_t *result);
+  FLATBUFFERS_CHECKED_ERROR ParseEnumFromString(Type &type, int64_t *result);
   StructDef *LookupCreateStruct(const std::string &name,
                                 bool create_if_new = true,
                                 bool definition = false);
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 263f6509a..73dd80e28 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -209,6 +209,10 @@ CheckedError Parser::SkipByteOrderMark() {
   return NoError();
 }
 
+bool IsIdentifierStart(char c) {
+  return isalpha(static_cast<unsigned char>(c)) || c == '_';
+}
+
 CheckedError Parser::Next() {
   doc_comment_.clear();
   bool seen_newline = false;
@@ -288,7 +292,7 @@ CheckedError Parser::Next() {
         }
         // fall thru
       default:
-        if (isalpha(static_cast<unsigned char>(c)) || c == '_') {
+        if (IsIdentifierStart(c)) {
           // Collect all chars of an identifier:
           const char *start = cursor_ - 1;
           while (isalnum(static_cast<unsigned char>(*cursor_)) ||
@@ -880,7 +884,7 @@ CheckedError Parser::TryTypedValue(int dtoken, bool check, Value &e,
   return NoError();
 }
 
-CheckedError Parser::ParseIntegerFromString(Type &type, int64_t *result) {
+CheckedError Parser::ParseEnumFromString(Type &type, int64_t *result) {
   *result = 0;
   // Parse one or more enum identifiers, separated by spaces.
   const char *next = attribute_.c_str();
@@ -950,10 +954,22 @@ CheckedError Parser::ParseSingleValue(Value &e) {
   if (e.type.base_type != BASE_TYPE_STRING &&
       e.type.base_type != BASE_TYPE_NONE &&
       (token_ == kTokenIdentifier || token_ == kTokenStringConstant)) {
-    int64_t val;
-    ECHECK(ParseIntegerFromString(e.type, &val));
-    e.constant = NumToString(val);
-    NEXT();
+    if (IsIdentifierStart(attribute_[0])) {  // Enum value.
+      int64_t val;
+      ECHECK(ParseEnumFromString(e.type, &val));
+      e.constant = NumToString(val);
+      NEXT();
+    } else {  // Numeric constant in string.
+      if (IsInteger(e.type.base_type)) {
+        // TODO(wvo): do we want to check for garbage after the number?
+        e.constant = NumToString(StringToInt(attribute_.c_str()));
+      } else if (IsFloat(e.type.base_type)) {
+        e.constant = NumToString(strtod(attribute_.c_str(), nullptr));
+      } else {
+        assert(0);  // Shouldn't happen, we covered all types.
+        e.constant = "0";
+      }
+    }
   } else {
     bool match = false;
     ECHECK(TryTypedValue(kTokenIntegerConstant,
diff --git a/tests/monsterdata_test.json b/tests/monsterdata_test.json
index 12c02d21c..e8e3e1d77 100755
--- a/tests/monsterdata_test.json
+++ b/tests/monsterdata_test.json
@@ -1,7 +1,7 @@
 {
   pos: {
     x: 1,
-    y: 2,
+    y: "2",
     z: 3,
     test1: 3,
     test2: Green,
@@ -30,7 +30,7 @@
       b: 20
     },
     {
-      b: 40,
+      b: "40",
       a: 30
     }
   ],

From b49a7d146d1d30e44714c2d8b0f352bb6c8e0ce8 Mon Sep 17 00:00:00 2001
From: artiom <artiom.lunev@gmail.com>
Date: Tue, 8 Mar 2016 23:57:12 +0000
Subject: [PATCH 092/185] Update google user group link

Original link returns 404.
---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 4806f9d07..954604863 100755
--- a/readme.md
+++ b/readme.md
@@ -47,7 +47,7 @@ you would leave it in.
 
    [CONTRIBUTING]: http://github.com/google/flatbuffers/blob/master/CONTRIBUTING
    [`flatbuffers` tag]: https://stackoverflow.com/questions/tagged/flatbuffers
-   [FlatBuffers Google Group]: http://group.google.com/group/flatbuffers
+   [FlatBuffers Google Group]: https://groups.google.com/forum/#!forum/flatbuffers
    [FlatBuffers Issues Tracker]: http://github.com/google/flatbuffers/issues
    [stackoverflow.com]: http://www.stackoverflow.com
    [landing page]: http://google.github.io/flatbuffers

From 1e7310e6cd84a42bcf76d84b053257dc0df104da Mon Sep 17 00:00:00 2001
From: Alex Kerfoot <alex@mappable.com>
Date: Tue, 8 Mar 2016 16:05:02 -0800
Subject: [PATCH 093/185] Fix CreateString with already-encoded string or
 bytearray in Python 2.7.

There was no way to pass an already-encoded string to
`builder.CreateString` in Python 2.7:

- Passing a `bytearray` raised a TypeError because `bytearray` was not
  recognized as an instance of `compat.binary_type`.
- Passing a utf-8 encoded `str` would cause the string to be
  double-encoded, because `compat.string_types = (basestring,)` and
  `basestring` is the base class of `str` and `unicode`, so the logic
  would never reach the `elif isinstance(s, compat.binary_type)` case.
- Converting a utf-8 encoded bytearray to `bytes` like
  `builder.CreateString(bytes(encoded_string))` does not work because
  in Python 2.7, bytes is just an alias for `str` so it behaves as
  above.

This change allows either `bytes` or `bytearray` as an already-encoded
string to be passed to `CreateString` in versions of Python that support
`bytearray`, and falls back to `str` in older versions.

In Python 2, it restricts unencoded string types to `unicode`, so `str`
can be used as an encoded, binary representaiton.
---
 python/flatbuffers/builder.py | 2 +-
 python/flatbuffers/compat.py  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/python/flatbuffers/builder.py b/python/flatbuffers/builder.py
index 18cfab9c7..552d0e2b7 100644
--- a/python/flatbuffers/builder.py
+++ b/python/flatbuffers/builder.py
@@ -401,7 +401,7 @@ class Builder(object):
 
         if isinstance(s, compat.string_types):
             x = s.encode(encoding, errors)
-        elif isinstance(s, compat.binary_type):
+        elif isinstance(s, compat.binary_types):
             x = s
         else:
             raise TypeError("non-string passed to CreateString")
diff --git a/python/flatbuffers/compat.py b/python/flatbuffers/compat.py
index 345e38cbf..c592901c0 100644
--- a/python/flatbuffers/compat.py
+++ b/python/flatbuffers/compat.py
@@ -11,13 +11,16 @@ PY34 = sys.version_info[0:2] >= (3, 4)
 
 if PY3:
     string_types = (str,)
-    binary_type = bytes
+    binary_types = (bytes,bytearray)
     range_func = range
     memoryview_type = memoryview
     struct_bool_decl = "?"
 else:
-    string_types = (basestring,)
-    binary_type = str
+    string_types = (unicode,)
+    if PY26 or PY27:
+        binary_types = (str,bytearray)
+    else:
+        binary_types = (str,)
     range_func = xrange
     if PY26 or (PY27 and not PY275):
         memoryview_type = buffer

From 1a63eb46bbbb9a0e0d269b2fc0ec31c552871128 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 7 Mar 2016 18:07:10 -0800
Subject: [PATCH 094/185] Added RPC declarations to the schema parser.

This is the first step in RPC support. Actual code generation
to follow.

Change-Id: I96c40fec3db671d100dd9eb509a71c5cbe55bfb2
Tested: on Linux.
Bug: 20122696
---
 docs/source/Schemas.md    | 14 ++++++++++++
 include/flatbuffers/idl.h | 11 +++++++++
 src/idl_parser.cpp        | 48 ++++++++++++++++++++++++++++++++++++++-
 tests/monster_test.fbs    |  5 ++++
 4 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/docs/source/Schemas.md b/docs/source/Schemas.md
index 7ac3bc735..4004803de 100755
--- a/docs/source/Schemas.md
+++ b/docs/source/Schemas.md
@@ -225,6 +225,20 @@ This declaration in the schema will change that to whatever you want:
 
     file_extension "ext";
 
+### RPC interface declarations
+
+You can declare RPC calls in a schema, that define a set of functions
+that take a FlatBuffer as an argument (the request) and return a FlatBuffer
+as the response (both of which must be table types):
+
+    rpc_service MonsterStorage {
+      Store(Monster):StoreResponse;
+      Retrieve(MonsterId):Monster;
+    }
+
+What code this produces and how it is used depends on language and RPC system
+used, FlatBuffers itself does not offer this functionality.
+
 ### Comments & documentation
 
 May be written as in most C-based languages. Additionally, a triple
diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index 17d89a42a..342c5cf24 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -306,6 +306,15 @@ struct EnumDef : public Definition {
   Type underlying_type;
 };
 
+struct RPCCall {
+  std::string name;
+  StructDef *request, *response;
+};
+
+struct ServiceDef : public Definition {
+  SymbolTable<RPCCall> calls;
+};
+
 // Container of options that may apply to any of the source/text generators.
 struct IDLOptions {
   bool strict_json;
@@ -479,6 +488,7 @@ private:
   FLATBUFFERS_CHECKED_ERROR StartStruct(const std::string &name,
                                         StructDef **dest);
   FLATBUFFERS_CHECKED_ERROR ParseDecl();
+  FLATBUFFERS_CHECKED_ERROR ParseService();
   FLATBUFFERS_CHECKED_ERROR ParseProtoFields(StructDef *struct_def,
                                              bool isextend, bool inside_oneof);
   FLATBUFFERS_CHECKED_ERROR ParseProtoOption();
@@ -501,6 +511,7 @@ private:
  public:
   SymbolTable<StructDef> structs_;
   SymbolTable<EnumDef> enums_;
+  SymbolTable<ServiceDef> services_;
   std::vector<Namespace *> namespaces_;
   std::string error_;         // User readable error_ if Parse() == false
 
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 73dd80e28..ec7e8d3ce 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -152,7 +152,8 @@ std::string Namespace::GetFullyQualifiedName(const std::string &name,
   TD(FileExtension, 268, "file_extension") \
   TD(Include, 269, "include") \
   TD(Attribute, 270, "attribute") \
-  TD(Null, 271, "null")
+  TD(Null, 271, "null") \
+  TD(Service, 272, "rpc_service")
 #ifdef __GNUC__
 __extension__  // Stop GCC complaining about trailing comma with -Wpendantic.
 #endif
@@ -360,6 +361,10 @@ CheckedError Parser::Next() {
             token_ = kTokenNull;
             return NoError();
           }
+          if (attribute_ == "rpc_service") {
+            token_ = kTokenService;
+            return NoError();
+          }
           // If not, it is a user-defined identifier:
           token_ = kTokenIdentifier;
           return NoError();
@@ -1243,6 +1248,45 @@ CheckedError Parser::ParseDecl() {
   return NoError();
 }
 
+CheckedError Parser::ParseService() {
+  std::vector<std::string> service_comment = doc_comment_;
+  NEXT();
+  auto service_name = attribute_;
+  EXPECT(kTokenIdentifier);
+  auto &service_def = *new ServiceDef();
+  service_def.name = service_name;
+  service_def.file = file_being_parsed_;
+  service_def.doc_comment = service_comment;
+  service_def.defined_namespace = namespaces_.back();
+  if (services_.Add(namespaces_.back()->GetFullyQualifiedName(service_name),
+                    &service_def))
+    return Error("service already exists: " + service_name);
+  ECHECK(ParseMetaData(service_def));
+  EXPECT('{');
+  do {
+    auto rpc_name = attribute_;
+    EXPECT(kTokenIdentifier);
+    EXPECT('(');
+    Type reqtype, resptype;
+    ECHECK(ParseTypeIdent(reqtype));
+    EXPECT(')');
+    EXPECT(':');
+    ECHECK(ParseTypeIdent(resptype));
+    if (reqtype.base_type != BASE_TYPE_STRUCT || reqtype.struct_def->fixed ||
+        resptype.base_type != BASE_TYPE_STRUCT || resptype.struct_def->fixed)
+        return Error("rpc request and response types must be tables");
+    auto &rpc = *new RPCCall();
+    rpc.name = rpc_name;
+    rpc.request = reqtype.struct_def;
+    rpc.response = resptype.struct_def;
+    if (service_def.calls.Add(rpc_name, &rpc))
+      return Error("rpc already exists: " + rpc_name);
+    EXPECT(';');
+  } while (token_ != '}');
+  NEXT();
+  return NoError();
+}
+
 bool Parser::SetRootType(const char *name) {
   root_struct_def_ = structs_.Lookup(name);
   if (!root_struct_def_)
@@ -1739,6 +1783,8 @@ CheckedError Parser::DoParse(const char *source, const char **include_paths,
       EXPECT(kTokenStringConstant);
       EXPECT(';');
       known_attributes_.insert(name);
+    } else if (token_ == kTokenService) {
+      ECHECK(ParseService());
     } else {
       ECHECK(ParseDecl());
     }
diff --git a/tests/monster_test.fbs b/tests/monster_test.fbs
index 27f35f3a1..f30b5d242 100755
--- a/tests/monster_test.fbs
+++ b/tests/monster_test.fbs
@@ -61,6 +61,11 @@ table Monster {
   testhashu64_fnv1a:ulong (id:23, hash:"fnv1a_64");
 }
 
+rpc_service MonsterStorage {
+  Store(Monster):Stat;
+  Retrieve(Stat):Monster;
+}
+
 root_type Monster;
 
 file_identifier "MONS";

From e6b79f00022aee3108427977c9823ff57154e1c6 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 9 Mar 2016 15:03:05 -0800
Subject: [PATCH 095/185] Added stream & idempotent annotations for RPCs.

Change-Id: Ia8651c1051808fdda0dc0ba52ec991777f868e88
Tested: on Linux.
---
 include/flatbuffers/idl.h |  5 ++++-
 src/idl_parser.cpp        | 13 +++++++------
 tests/monster_test.fbs    |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index 342c5cf24..14062d9c7 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -308,6 +308,7 @@ struct EnumDef : public Definition {
 
 struct RPCCall {
   std::string name;
+  SymbolTable<Value> attributes;
   StructDef *request, *response;
 };
 
@@ -413,6 +414,8 @@ class Parser {
     known_attributes_.insert("original_order");
     known_attributes_.insert("nested_flatbuffer");
     known_attributes_.insert("csharp_partial");
+    known_attributes_.insert("stream");
+    known_attributes_.insert("idempotent");
   }
 
   ~Parser() {
@@ -474,7 +477,7 @@ private:
   void SerializeStruct(const StructDef &struct_def, const Value &val);
   void AddVector(bool sortbysize, int count);
   FLATBUFFERS_CHECKED_ERROR ParseVector(const Type &type, uoffset_t *ovalue);
-  FLATBUFFERS_CHECKED_ERROR ParseMetaData(Definition &def);
+  FLATBUFFERS_CHECKED_ERROR ParseMetaData(SymbolTable<Value> *attributes);
   FLATBUFFERS_CHECKED_ERROR TryTypedValue(int dtoken, bool check, Value &e,
                                           BaseType req, bool *destmatch);
   FLATBUFFERS_CHECKED_ERROR ParseHash(Value &e, FieldDef* field);
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index ec7e8d3ce..21508ccd8 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -556,7 +556,7 @@ CheckedError Parser::ParseField(StructDef &struct_def) {
           field->value.constant);
 
   field->doc_comment = dc;
-  ECHECK(ParseMetaData(*field));
+  ECHECK(ParseMetaData(&field->attributes));
   field->deprecated = field->attributes.Lookup("deprecated") != nullptr;
   auto hash_name = field->attributes.Lookup("hash");
   if (hash_name) {
@@ -846,7 +846,7 @@ CheckedError Parser::ParseVector(const Type &type, uoffset_t *ovalue) {
   return NoError();
 }
 
-CheckedError Parser::ParseMetaData(Definition &def) {
+CheckedError Parser::ParseMetaData(SymbolTable<Value> *attributes) {
   if (Is('(')) {
     NEXT();
     for (;;) {
@@ -856,7 +856,7 @@ CheckedError Parser::ParseMetaData(Definition &def) {
         return Error("user define attributes must be declared before use: " +
                      name);
       auto e = new Value();
-      def.attributes.Add(name, e);
+      attributes->Add(name, e);
       if (Is(':')) {
         NEXT();
         ECHECK(ParseSingleValue(*e));
@@ -1089,7 +1089,7 @@ CheckedError Parser::ParseEnum(bool is_union, EnumDef **dest) {
     // Make this type refer back to the enum it was derived from.
     enum_def.underlying_type.enum_def = &enum_def;
   }
-  ECHECK(ParseMetaData(enum_def));
+  ECHECK(ParseMetaData(&enum_def.attributes));
   EXPECT('{');
   if (is_union) enum_def.vals.Add("NONE", new EnumVal("NONE", 0));
   for (;;) {
@@ -1195,7 +1195,7 @@ CheckedError Parser::ParseDecl() {
   ECHECK(StartStruct(name, &struct_def));
   struct_def->doc_comment = dc;
   struct_def->fixed = fixed;
-  ECHECK(ParseMetaData(*struct_def));
+  ECHECK(ParseMetaData(&struct_def->attributes));
   struct_def->sortbysize =
     struct_def->attributes.Lookup("original_order") == nullptr && !fixed;
   EXPECT('{');
@@ -1261,7 +1261,7 @@ CheckedError Parser::ParseService() {
   if (services_.Add(namespaces_.back()->GetFullyQualifiedName(service_name),
                     &service_def))
     return Error("service already exists: " + service_name);
-  ECHECK(ParseMetaData(service_def));
+  ECHECK(ParseMetaData(&service_def.attributes));
   EXPECT('{');
   do {
     auto rpc_name = attribute_;
@@ -1281,6 +1281,7 @@ CheckedError Parser::ParseService() {
     rpc.response = resptype.struct_def;
     if (service_def.calls.Add(rpc_name, &rpc))
       return Error("rpc already exists: " + rpc_name);
+    ECHECK(ParseMetaData(&rpc.attributes));
     EXPECT(';');
   } while (token_ != '}');
   NEXT();
diff --git a/tests/monster_test.fbs b/tests/monster_test.fbs
index f30b5d242..998beedff 100755
--- a/tests/monster_test.fbs
+++ b/tests/monster_test.fbs
@@ -62,8 +62,8 @@ table Monster {
 }
 
 rpc_service MonsterStorage {
-  Store(Monster):Stat;
-  Retrieve(Stat):Monster;
+  Store(Monster):Stat (stream);
+  Retrieve(Stat):Monster (idempotent);
 }
 
 root_type Monster;

From ce4d3316d36cf8bc95b90bb6ecf0724b98dcdf6b Mon Sep 17 00:00:00 2001
From: Will Gardner <will.gardner@couchbase.com>
Date: Mon, 29 Feb 2016 17:28:40 +0000
Subject: [PATCH 096/185] Allow builds on platforms with unsigned chars by
 default

Certain architectures, such as ARM, use unsigned chars by default
so require the `-fsigned-char` for certain value comparisons to
make sense and in order to compile.
---
 CMakeLists.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2edf829b..944a73e9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,12 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS
       "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result")
   endif()
+
+  # Certain platforms such as ARM do not use signed chars by default
+  # which causes issues with certain bounds checks.
+  set(CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} -fsigned-char")
+
 elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   set(CMAKE_CXX_FLAGS
       "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
@@ -93,6 +99,12 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
     set(CMAKE_EXE_LINKER_FLAGS
         "${CMAKE_EXE_LINKER_FLAGS} -lc++abi")
   endif()
+
+  # Certain platforms such as ARM do not use signed chars by default
+  # which causes issues with certain bounds checks.
+  set(CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} -fsigned-char")
+
 endif()
 
 if(FLATBUFFERS_CODE_COVERAGE)

From 68c69b3717976565333cc03e3f15ee919969656d Mon Sep 17 00:00:00 2001
From: Alex McGuire <cage433@gmail.com>
Date: Sun, 20 Mar 2016 12:55:05 +0000
Subject: [PATCH 097/185] Tutorial's Java example uses incorrect types

`FlatBufferBuilder.createString` returns an int offset, not a string
---
 docs/source/Tutorial.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/Tutorial.md b/docs/source/Tutorial.md
index 74941be8c..de1e9fd95 100644
--- a/docs/source/Tutorial.md
+++ b/docs/source/Tutorial.md
@@ -432,10 +432,10 @@ our `orc` Monster, lets create some `Weapon`s: a `Sword` and an `Axe`.
 </div>
 <div class="language-java">
 ~~~{.java}
-  String weaponOneName = builder.createString("Sword")
+  int weaponOneName = builder.createString("Sword")
   short weaponOneDamage = 3;
 
-  String weaponTwoName = builder.createString("Axe");
+  int weaponTwoName = builder.createString("Axe");
   short weaponTwoDamage = 5;
 
   // Use the `createWeapon()` helper function to create the weapons, since we set every field.

From 47d4b46950d92cf5056094f8f25a0a26d0ba3865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikkel=20Fahn=C3=B8e=20J=C3=B8rgensen?= <mikkel@dvide.com>
Date: Sat, 26 Mar 2016 00:28:31 +0100
Subject: [PATCH 098/185] Documentation for C bindings

---
 docs/source/CUsage.md          |  54 +++++
 docs/source/FlatBuffers.md     |   6 +-
 docs/source/Support.md         |  18 +-
 docs/source/Tutorial.md        | 393 ++++++++++++++++++++++++++++++++-
 docs/source/doxyfile           |   1 +
 docs/source/doxygen_layout.xml |   2 +
 6 files changed, 454 insertions(+), 20 deletions(-)
 create mode 100644 docs/source/CUsage.md

diff --git a/docs/source/CUsage.md b/docs/source/CUsage.md
new file mode 100644
index 000000000..0c87ce955
--- /dev/null
+++ b/docs/source/CUsage.md
@@ -0,0 +1,54 @@
+Use in C    {#flatbuffers_guide_use_c}
+==========
+
+The C language binding exists in a separate project named [FlatCC](https://github.com/dvidelabs/flatcc).
+
+The `flatcc` C schema compiler can generate code offline as well as
+online via a C library. It can also generate buffer verifiers and fast
+JSON parsers, printers.
+
+Great effort has been made to ensure compatibily with the main `flatc`
+project.
+
+
+## General Documention
+
+- [Tutorial](@ref flatbuffers_guide_tutorial) - select C as language
+  when scrolling down
+- General Use in C (the README) <https://github.com/dvidelabs/flatcc/blob/master/README.md>
+- The C Builder Interface, advanced <https://github.com/dvidelabs/flatcc/blob/master/doc/builder.md>
+
+
+## Basic Reflection
+
+The C-API does support reading binary schema (.bfbs)
+files via code generated from the `reflection.fbs` schema, and an
+[example usage](https://github.com/dvidelabs/flatcc/tree/master/samples/reflection)
+shows how to use this. The schema files are pre-generated
+in the [runtime distribution](https://github.com/dvidelabs/flatcc/tree/master/include/flatcc/reflection). Extended reflection
+
+
+## Mutating Reflection
+
+The C-API does not support mutating reflection like C++ does.
+
+Although the following isn't reflection, it is possible to create new
+buffers using complex objects from existing buffers as source. This can
+be very efficient due to direct copy semantics without endian conversion or
+temporary stack allocation.
+
+It is currently not possible to use an existing table or vector of table
+as source, but it would be possible to add support for this at some
+point.
+
+
+## Why not integrate with the `flatc` tool?
+
+[It was considered how the C code generator could be integrated into the
+`flatc` tool](https://github.com/dvidelabs/flatcc/issues/1), but it
+would either require that the standalone C implementation of the schema
+compiler was dropped, or it would lead to excessive code duplication, or
+a complicated intermediate representation would have to be invented.
+Neither of these alternatives are very attractive, and it isn't a big
+deal to use the `flatcc` tool instead of `flatc` given that the
+FlatBuffers C runtime library needs to be made available regardless.
diff --git a/docs/source/FlatBuffers.md b/docs/source/FlatBuffers.md
index bbb0dce58..445121cb3 100644
--- a/docs/source/FlatBuffers.md
+++ b/docs/source/FlatBuffers.md
@@ -4,8 +4,8 @@ FlatBuffers    {#flatbuffers_index}
 # Overview {#flatbuffers_overview}
 
 [FlatBuffers](@ref flatbuffers_overview) is an efficient cross platform
-serialization library for C++, C#, Go, Java, JavaScript, PHP, and Python
-(C and Ruby in progress). It was originally created at Google for game
+serialization library for C++, C#, C, Go, Java, JavaScript, PHP, and Python
+(Ruby and Swift in progress). It was originally created at Google for game
 development and other performance-critical applications.
 
 It is available as Open Source on [GitHub](http://github.com/google/flatbuffers)
@@ -131,6 +131,8 @@ sections provide a more in-depth usage guide.
     in your own programs.
 -   How to [use the generated Go code](@ref flatbuffers_guide_use_go) in your
     own programs.
+-   How to [use the generated C code](@ref flatbuffers_guide_use_c) in your
+    own programs.
 -   [Support matrix](@ref flatbuffers_support) for platforms/languages/features.
 -   Some [benchmarks](@ref flatbuffers_benchmarks) showing the advantage of
     using FlatBuffers.
diff --git a/docs/source/Support.md b/docs/source/Support.md
index ba8c76579..270f88bb9 100755
--- a/docs/source/Support.md
+++ b/docs/source/Support.md
@@ -20,17 +20,17 @@ NOTE: this table is a start, it needs to be extended.
 
 Feature                        | C++    | Java   | C#     | Go     | Python | JS        | C    | PHP | Ruby
 ------------------------------ | ------ | ------ | ------ | ------ | ------ | --------- | ---- | --- | ----
-Codegen for all basic features | Yes    | Yes    | Yes    | Yes    | Yes    | Yes       | WiP  | WiP | WiP
-JSON parsing                   | Yes    | No     | No     | No     | No     | No        | No   | No  | No
+Codegen for all basic features | Yes    | Yes    | Yes    | Yes    | Yes    | Yes       | Yes  | WiP | WiP
+JSON parsing                   | Yes    | No     | No     | No     | No     | No        | Yes  | No  | No
 Simple mutation                | Yes    | WIP    | WIP    | No     | No     | No        | No   | No  | No
-Reflection                     | Yes    | No     | No     | No     | No     | No        | No   | No  | No
-Buffer verifier                | Yes    | No     | No     | No     | No     | No        | No   | No  | No
-Testing: basic                 | Yes    | Yes    | Yes    | Yes    | Yes    | Yes       | ?    | ?   | ?
-Testing: fuzz                  | Yes    | No     | No     | Yes    | Yes    | No        | ?    | ?   | ?
+Reflection                     | Yes    | No     | No     | No     | No     | No        | Basic| No  | No
+Buffer verifier                | Yes    | No     | No     | No     | No     | No        | Yes  | No  | No
+Testing: basic                 | Yes    | Yes    | Yes    | Yes    | Yes    | Yes       | Yes  | ?   | ?
+Testing: fuzz                  | Yes    | No     | No     | Yes    | Yes    | No        | No   | ?   | ?
 Performance:                   | Superb | Great  | Great  | Great  | Ok     | ?         |Superb| ?   | ?
-Platform: Windows              | VS2010 | Yes    | Yes    | ?      | ?      | ?         | ?    | ?   | ?
-Platform: Linux                | GCC282 | Yes    | ?      | Yes    | Yes    | ?         | ?    | ?   | ?
-Platform: OS X                 | Xcode4 | ?      | ?      | ?      | Yes    | ?         | ?    | ?   | ?
+Platform: Windows              | VS2010 | Yes    | Yes    | ?      | ?      | ?         | No   | ?   | ?
+Platform: Linux                | GCC282 | Yes    | ?      | Yes    | Yes    | ?         | Yes  | ?   | ?
+Platform: OS X                 | Xcode4 | ?      | ?      | ?      | Yes    | ?         | Yes  | ?   | ?
 Platform: Android              | NDK10d | Yes    | ?      | ?      | ?      | ?         | ?    | ?   | ?
 Platform: iOS                  | ?      | ?      | ?      | ?      | ?      | ?         | ?    | ?   | ?
 Engine: Unity                  | ?      | ?      | Yes    | ?      | ?      | ?         | ?    | ?   | ?
diff --git a/docs/source/Tutorial.md b/docs/source/Tutorial.md
index de1e9fd95..dfcc3ad7c 100644
--- a/docs/source/Tutorial.md
+++ b/docs/source/Tutorial.md
@@ -23,12 +23,13 @@ Please select your desired language for our quest:
 \htmlonly
 <form>
   <input type="radio" name="language" value="cpp" checked="checked">C++</input>
-  <input type="radio" name="language" value="java">Java</input>
   <input type="radio" name="language" value="csharp">C#</input>
+  <input type="radio" name="language" value="c">C</input>
   <input type="radio" name="language" value="go">Go</input>
-  <input type="radio" name="language" value="python">Python</input>
+  <input type="radio" name="language" value="java">Java</input>
   <input type="radio" name="language" value="javascript">JavaScript</input>
   <input type="radio" name="language" value="php">PHP</input>
+  <input type="radio" name="language" value="python">Python</input>
 </form>
 \endhtmlonly
 
@@ -98,6 +99,10 @@ Samples demonstating the concepts in this example are located in the source code
 package, under the `samples` directory. You can browse the samples on GitHub
 [here](https://github.com/google/flatbuffers/tree/master/samples).
 
+<div class="language-c">
+*Note: The above does not apply to C, instead [look here](https://github.com/dvidelabs/flatcc/tree/master/samples).*
+</div>
+
 For your chosen language, please cross-reference with:
 
 <div class="language-cpp">
@@ -121,6 +126,9 @@ For your chosen language, please cross-reference with:
 <div class="language-php">
 [SampleBinary.php](https://github.com/google/flatbuffers/blob/master/samples/SampleBinary.php)
 </div>
+<div class="language-c">
+[monster.c](https://github.com/dvidelabs/flatcc/blob/master/samples/monster/monster.c)
+</div>
 
 ## Writing the Monsters' FlatBuffer Schema
 
@@ -225,6 +233,16 @@ FlatBuffer compiler.
 
 Once `flatc` is built successfully, compile the schema for your language:
 
+<div class="language-c">
+
+*Note: If you're working in C, you need to use the separate project [FlatCC](https://github.com/dvidelabs/flatcc) which contains a schema compiler and runtime library in C for C.*
+<br>
+See [flatcc build instructions](https://github.com/dvidelabs/flatcc#building).
+<br>
+Please be aware of the difference between `flatc` and `flatcc` tools.
+<br>
+</div>
+
 <div class="language-cpp">
 ~~~{.sh}
   cd flatbuffers/sample
@@ -267,8 +285,17 @@ Once `flatc` is built successfully, compile the schema for your language:
   ./../flatc --php samples/monster.fbs
 ~~~
 </div>
+<div class="language-c">
+~~~{.sh}
+  cd flatcc
+  mkdir -p build/tmp/samples/monster
+  bin/flatcc -a -o build/tmp/samples/monster samples/monster/monster.fbs
+  # or just
+  flatcc/samples/monster/build.sh
+~~~
+</div>
 
-For a more complete guide to using the `flatc` compiler, pleaes read the
+For a more complete guide to using the `flatc` compiler, please read the
 [Using the schema compiler](@ref flatbuffers_guide_using_schema_compiler)
 section of the Programmer's Guide.
 
@@ -359,6 +386,21 @@ The first step is to import/include the library, generated files, etc.
   }
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  #include "monster_builder.h" // Generated by `flatcc`.
+
+  // Convenient namespace macro to manage long namespace prefix.
+  #define ns(x) FLATBUFFERS_WRAP_NAMESPACE(MyGame_Sample, x) // Specified in the schema.
+  // Convenient common namespace macro.
+  #define nsc(x) FLATBUFFERS_WRAP_NAMESPACE(flatbuffers, x)
+  // A helper to simplify creating vectors from C-arrays.
+  #define c_vec_len(V) (sizeof(V)/sizeof((V)[0]))
+
+  // The ns macro makes it possible to write `ns(Monster_create(...))`
+  // instead of `MyGame_Sample_Monster_create(...)`.
+~~~
+</div>
 
 Now we are ready to start building some buffers. In order to start, we need
 to create an instance of the `FlatBufferBuilder`, which will contain the buffer
@@ -413,6 +455,14 @@ as it grows:
   $builder = new Google\FlatBuffers\FlatbufferBuilder(0);
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+    flatcc_builder_t builder, *B;
+    B = &builder;
+    // Initialize the builder object.
+    flatcc_builder_init(B);
+~~~
+</div>
 
 After creating the `builder`, we can start serializing our data. Before we make
 our `orc` Monster, lets create some `Weapon`s: a `Sword` and an `Axe`.
@@ -525,6 +575,18 @@ our `orc` Monster, lets create some `Weapon`s: a `Sword` and an `Axe`.
   $weapons = \MyGame\Sample\Monster::CreateWeaponsVector($builder, $weaps);
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  ns(Weapon_ref_t) weapon_one_name = nsc(string_create_str(B, "Sword"));
+  uint16_t weapon_one_damage = 3;
+
+  ns(Weapon_ref_t) weapon_two_name = nsc(string_create_str(B, "Axe"));
+  uint16_t weapon_two_damage = 5;
+
+  ns(Weapon_ref_t) sword = ns(Weapon_create(B, weapon_one_name, weapon_one_damage));
+  ns(Weapon_ref_t) axe = ns(Weapon_create(B, weapon_two_name, weapon_two_damage));
+~~~
+</div>
 
 Now let's create our monster, the `orc`. For this `orc`, lets make him
 `red` with rage, positioned at `(1.0, 2.0, 3.0)`, and give him
@@ -627,6 +689,20 @@ traversal. This is generally easy to do on any tree structures.
   $inv = \MyGame\Sample\Monster::CreateInventoryVector($builder, $treasure);
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  // Serialize a name for our monster, called "Orc".
+  // The _str suffix indicates the source is an ascii-z string.
+  nsc(string_ref_t) name = nsc(string_create_str(B, "Orc"));
+
+  // Create a `vector` representing the inventory of the Orc. Each number
+  // could correspond to an item that can be claimed after he is slain.
+  uint8_t treasure[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  nsc(uint8_vec_ref_t) inventory;
+  // `c_vec_len` is the convenience macro we defined earlier.
+  inventory = nsc(uint8_vec_create(B, treasure, c_vec_len(treasure)));
+~~~
+</div>
 
 We serialized two built-in data types (`string` and `vector`) and captured
 their return values. These values are offsets into the serialized data,
@@ -642,6 +718,13 @@ and `Axe`). These are both FlatBuffer `table`s, whose offsets we now store in
 memory. Therefore we can create a FlatBuffer `vector` to contain these
 offsets.
 
+<div class="language-c">
+*Note: If you're using C, there is also an often shorter top-down
+approach that avoids storing temporary references because the runtime
+has an internal stack. The top-down version is shown at the end of build
+section.*
+</div>
+
 <div class="language-cpp">
 ~~~{.cpp}
   // Place the weapons into a `std::vector`, then convert that into a FlatBuffer `vector`.
@@ -709,8 +792,21 @@ offsets.
   $weapons = \MyGame\Sample\Monster::CreateWeaponsVector($builder, $weaps);
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  // Here we use a top-down approach locally to build a Weapons vector
+  // in-place instead of creating a temporary external vector to use
+  // as argument like we did with the `inventory` earlier on, but the
+  // overall approach is still bottom-up.
+  ns(Weapon_vec_start(B));
+  ns(Weapon_vec_push(B, sword));
+  ns(Weapon_vec_push(B, axe));
+  ns(Weapon_vec_ref_t) weapons = ns(Weapon_vec_end(B));
+~~~
+</div>
 
-To create a `struct`, use the `Vec3` class/struct that was generated by `flatc`:
+To create a `struct`, use the `Vec3` class/struct that was generated by
+the schema compiler:
 
 <div class="language-cpp">
 ~~~{.cpp}
@@ -754,6 +850,12 @@ To create a `struct`, use the `Vec3` class/struct that was generated by `flatc`:
   $pos = \MyGame\Sample\Vec3::CreateVec3($builder, 1.0, 2.0, 3.0);
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  // Create a `Vec3`, representing the Orc's position in 3-D space.
+  ns(Vec3_t) pos = { 1.0f, 2.0f, 3.0f };
+~~~
+</div>
 
 We have now serialized the non-scalar components of the orc, so we
 can serialize the monster itself:
@@ -862,10 +964,31 @@ can serialize the monster itself:
   $orc = \MyGame\Sample\Monster::EndMonster($builder);
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  // Set his hit points to 300 and his mana to 150.
+  uint16_t hp = 300;
+  uint16_t mana = 150;
+
+  // Create the equipment union. In the C++ language API this is given
+  // as two arguments to the create call, or as two separate add
+  // operations for the type and the table reference. In C we create
+  // a single union value that carries both the type and reference.
+  ns(Equipment_union_ref_t) equipped = ns(Equipment_as_Weapon(axe));
+
+  ns(Monster_create_as_root(B, &pos, mana, hp, name, inventory, ns(Color_Red),
+          weapons, equipped));
+~~~
+</div>
+
+<div class="language-c">
+*Note: in C we use `create_as_root` instead of the also valid `create` call
+because it simplfies constructing the root object.*
+</div>
 
 <div class="language-cpp">
 <br>
-*Note: Since we passing `150` as the `mana` field, which happens to be the
+*Note: Since we are passing `150` as the `mana` field, which happens to be the
 default value, the field will not actually be written to the buffer, since the
 default value will be returned on query anyway. This is a nice space savings,
 especially if default values are common in your data. It also means that you do
@@ -892,6 +1015,39 @@ a bit more flexibility.
   auto orc = monster_builder.Finish();
 ~~~
 </div>
+<div class="language-c">
+<br>
+*Note: Since we are passing `150` as the `mana` field, which happens to be the
+default value, the field will not actually be written to the buffer, since the
+default value will be returned on query anyway. This is a nice space savings,
+especially if default values are common in your data. It also means that you do
+not need to be worried of adding a lot of fields that are only used in a small
+number of instances, as it will not bloat the buffer if unused.*
+<br><br>
+If you do not wish to set every field in a `table`, it may be more convenient to
+manually set each field of your monster, instead of calling `create_monster_as_root()`.
+The following snippet is functionally equivalent to the above code, but provides
+a bit more flexibility.
+<br>
+~~~{.c}
+  // It is important to pair `start_as_root` with `end_as_root`.
+  ns(Monster_start_as_root(B));
+  ns(Monster_pos_create(B, 1.0f, 2.0f, 3.0f));
+  // or alternatively
+  //ns(Monster_pos_add(&pos);
+
+  ns(Monster_hp_add(B, hp));
+  // Notice that `Monser_name_add` adds a string reference unlike the
+  // add_str and add_strn variants.
+  ns(Monster_name_add(B, name));
+  ns(Monster_inventory_add(B, inventory));
+  ns(Monster_color_add(B, ns(Color_Red)));
+  ns(Monster_weapons_add(B, weapons));
+  ns(Monster_equipped_add(B, equipped));
+  // Complete the monster object and make it the buffer root object.
+  ns(Monster_end_as_root(B));
+~~~
+</div>
 
 Before finishing the serialization, let's take a quick look at FlatBuffer
 `union Equipped`. There are two parts to each FlatBuffer `union`. The first, is
@@ -902,6 +1058,11 @@ Second, is the `union`'s data.
 In our example, the last two things we added to our `Monster` were the
 `Equipped Type` and the `Equipped` union itself.
 
+<div class="language-c">
+*Note: In C, several different helpers make these two fields appear as
+one field, but they can be added separately.*
+</div>
+
 Here is a repetition these lines, to help highlight them more clearly:
 
 <div class="language-cpp">
@@ -947,11 +1108,78 @@ Here is a repetition these lines, to help highlight them more clearly:
     \MyGame\Sample\Monster::AddEquipped($builder, $axe); // Union data
   ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  ns(Equipment_union_ref_t) equipped = ns(Equipment_as_Weapon(axe));
+  ns(Monster_equipped_add(B, equipped));
+  // or alternatively
+  ns(Monster_equipped_Weapon_add(B, axe);
+  // or alternatively
+  ns(Monster_equipped_type_add(B, ns(Equipment_Weapon));
+  ns(Monster_equipped_add_member(B, axe));
+~~~
+</div>
+
+<div class="language-c">
+Here is an alternative top-down approach unique to the C builder
+library.
+<br>
+~~~{.c}
+  uint8_t treasure[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  size_t treasure_count = c_vec_len(treasure);
+  ns(Weapon_ref_t) axe;
+
+  // NOTE: if we use end_as_root, we MUST also start as root.
+  ns(Monster_start_as_root(B));
+  ns(Monster_pos_create(B, 1.0f, 2.0f, 3.0f));
+  ns(Monster_hp_add(B, 300));
+  ns(Monster_mana_add(B, 150));
+  // We use create_str instead of add because we have no existing string reference.
+  ns(Monster_name_create_str(B, "Orc"));
+  // Again we use create because we no existing vector object, only a C-array.
+  ns(Monster_inventory_create(B, treasure, treasure_count));
+  ns(Monster_color_add(B, ns(Color_Red)));
+  if (1) {
+      ns(Monster_weapons_start(B));
+      ns(Monster_weapons_push_create(B, nsc(string_create_str(B, "Sword")), 3));
+      // We reuse the axe object later. Note that we dereference a pointer
+      // because push always returns a short-term pointer to the stored element.
+      // We could also have created the axe object first and simply pushed it.
+      axe = *ns(Monster_weapons_push_create(B, nsc(string_create_str(B, "Axe")), 5));
+      ns(Monster_weapons_end(B));
+  } else {
+      // We can have more control with the table elements added to a vector:
+      //
+      ns(Monster_weapons_start(B));
+      ns(Monster_weapons_push_start(B));
+      ns(Weapon_name_create_str(B, "Sword"));
+      ns(Weapon_damage_add(B, 3));
+      ns(Monster_weapons_push_end(B));
+      ns(Monster_weapons_push_start(B));
+      ns(Monster_weapons_push_start(B));
+      ns(Weapon_name_create_str(B, "Axe"));
+      ns(Weapon_damage_add(B, 5));
+      axe = *ns(Monster_weapons_push_end(B));
+      ns(Monster_weapons_end(B));
+  }
+  // Unions can get their type by using a type-specific add/create/start method.
+  ns(Monster_equipped_Weapon_add(B, axe));
+
+  ns(Monster_end_as_root(B));
+~~~
+</div>
 
 After you have created your buffer, you will have the offset to the root of the
 data in the `orc` variable, so you can finish the buffer by calling the
 appropriate `finish` method.
 
+<div class="language-c">
+*Note: C does not have a `finish` call, and it is not needed when we use
+`create_as_root` or `start/end_as_root`. For the sake of modularity, it
+is sometimes useful to create an object without knowing if it will be a
+root. We show this below, but do NOT mix it with the `_as_root` calls.*
+</div>
+
 <div class="language-cpp">
 ~~~{.cpp}
   // Call `Finish()` to instruct the builder that this monster is complete.
@@ -999,6 +1227,14 @@ appropriate `finish` method.
                            //                        $builder, $orc);`.
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  // Alternative approach separating object creation from being root object.
+  ns(Monster_ref_t) orc = ns(Monster_create(B, ...));
+  // `flatcc_` calls should be isolated to top-level driver logic.
+  flatcc_builder_buffer_create(orc);
+~~~
+</div>
 
 The buffer is now ready to be stored somewhere, sent over the network, be
 compressed, or whatever you'd like to do with it. You can access the buffer
@@ -1048,6 +1284,29 @@ like so:
   $buf = $builder->dataBuffer(); // Of type `Google\FlatBuffers\ByteBuffer`
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  uint8_t *buf;
+  size_t size;
+
+  // Allocate and extract a readable buffer from internal builder heap.
+  // The returned buffer must be deallocated using `free`.
+  // NOTE: Finalizing the buffer does NOT change the builder, it
+  // just creates a snapshot of the builder content.
+  buf = flatcc_builder_finalize_buffer(&builder, &size);
+  // use buf
+  free(buf);
+
+  // Optionally reset builder to reuse builder without deallocating
+  // internal stack and heap.
+  flatcc_builder_reset(B);
+  // build next buffer.
+  // ...
+
+  // Cleanup.
+  flatcc_builder_clear(B);
+~~~
+</div>
 
 #### Reading Orc FlatBuffers
 
@@ -1055,9 +1314,15 @@ Now that we have successfully created an `Orc` FlatBuffer, the monster data can
 be saved, sent over a network, etc. Let's now adventure into the inverse, and
 deserialize a FlatBuffer.
 
-This seciton requires the same import/include, namespace, etc. requirements as
+This section requires the same import/include, namespace, etc. requirements as
 before:
 
+<div class="language-c">
+*Note: In C there is a separate include file for the reader which is automatically
+included by the generated builder header. A standalone reader only depends on header
+files while the builder must link with a small runtime library.*
+</div>
+
 <div class="language-cpp">
 ~~~{.cpp}
   #include "monster_generate.h" // This was generated by `flatc`.
@@ -1134,6 +1399,14 @@ before:
   }
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  #include "monster_reader.h"
+
+  #define ns(x) FLATBUFFERS_WRAP_NAMESPACE(MyGame_Sample, x) // Specified in the schema.
+  #define nsc(x) FLATBUFFERS_WRAP_NAMESPACE(flatbuffers, x)
+~~~
+</div>
 
 Then, assuming you have a variable containing to the bytes of data from disk,
 network, etc., you can create a monster from this data:
@@ -1224,8 +1497,18 @@ network, etc., you can create a monster from this data:
   $monster = \MyGame\Sample\Monster::GetRootAsMonster($buf);
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  // Note that we use the `table_t` suffix when reading a table object
+  // as opposed to the `ref_t` suffix used during the construction of
+  // the buffer.
+  ns(Monster_table_t) monster = ns(Monster_as_root(buffer));
 
-If you look in the generated files from `flatc`, you will see it generated
+  // Note: root object pointers are NOT the same as the `buffer` pointer.
+~~~
+</div>
+
+If you look in the generated files from the schema compiler, you will see it generated
 accessors for all non-`deprecated` fields. For example:
 
 <div class="language-cpp">
@@ -1279,10 +1562,32 @@ accessors for all non-`deprecated` fields. For example:
   $name = monster->getName();
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  uint16_t hp = ns(Monster_hp(monster));
+  // Since 150 is the default, we are reading a value that wasn't stored.
+  uint16_t mana = ns(Monster_mana(monster));
+  // This is just a const char *, but it also supports a fast length operation.
+  nsc(string_t) name = ns(Monster_name(monster));
+  size_t name_len = nsc(string_len(name));
+~~~
+</div>
+
+<div class="language-c">
+*Note: In C we can check if a field is present. For example `mana`
+should not be present because it was set with a default value or not at
+all, but `hp` should be present.*
+
+~~~{.c}
+  int hp_present = ns(Monster_hp_is_present(monster)); // 1
+  int mana_present = ns(Monster_mana_is_present(monster)); // 0
+~~~
+</div>
+
 
 These should hold `300`, `150`, and `"Orc"` respectively.
 
-*Note: We never stored a value in `mp`, so we got the default value of `150`.*
+*Note: We never stored a value in `mana`, so we got the default value of `150`.*
 
 To access sub-objects, in the case of our `pos`, which is a `Vec3`:
 
@@ -1348,10 +1653,25 @@ To access sub-objects, in the case of our `pos`, which is a `Vec3`:
   $z = $pos->getZ();
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  ns(Vec3_struct_t) pos = ns(Monster_pos(monster));
+  float x = ns(Vec3_x(pos));
+  float y = ns(Vec3_y(pos));
+  float z = ns(Vec3_z(pos));
+
+  // or alternatively
+  ns(Vec3_t) pos_vec;
+  // `pe` indicates endian conversion from protocol to native.
+  ns(Vec3_copy_from_pe(&pos_vec, pos));
+  x = pos_vec.x;
+  // ...
+~~~
+</div>
 
 `x`, `y`, and `z` will contain `1.0`, `2.0`, and `3.0`, respectively.
 
-*Note: Had we not set `pos` during serialization, it would be `NULL`-value.*
+*Note: Had we not set `pos` during serialization, it would be a `NULL`-value.*
 
 Similarly, we can access elements of the inventory `vector` by indexing it. You
 can also iterate over the length of the array/vector representing the
@@ -1400,6 +1720,19 @@ FlatBuffers `vector`.
   $third_item = $monster->getInventory(2);
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+    // This is a const uint8_t *, but it shouldn't be accessed directly
+    // to ensure proper endian conversion. Incidentally the uint8 (ubyte)
+    // is not sensitive to endianness, so we *could* have accessed it directly.
+    // The compiler likely optimizes this so that it doesn't matter.
+    nsc(uint8_vec_t) inv = ns(Monster_inventory(monster));
+    size_t inv_len = nsc(uint8_vec_len(inv));
+
+    // If `inv` was not set, it will be null, but the length is still
+    // valid to read and will then be zero.
+~~~
+</div>
 
 For `vector`s of `table`s, you can access the elements like any other vector,
 except your need to handle the result as a FlatBuffer `table`:
@@ -1458,6 +1791,15 @@ except your need to handle the result as a FlatBuffer `table`:
   $second_weapon_damage = $monster->getWeapons(1)->getDamage();
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  ns(Weapon_vec_t) weapons = ns(Monster_weapons(monster));
+  size_t weapons_len = ns(Weapon_vec_len(weapons));
+  // We don't have to use `nsc(string_t)` as type if we don't need fast length access.
+  const char *second_weapon_name = ns(Weapon_name(ns(Weapon_vec_at(weapons, 1))));
+  uint16_t second_weapon_damage =  ns(Weapon_damage(ns(Weapon_vec_at(weapons, 1))));
+~~~
+</div>
 
 Last, we can access our `Equipped` FlatBuffer `union`. Just like when we created
 the `union`, we need to get both parts of the `union`: the type and the data.
@@ -1560,9 +1902,26 @@ We can access the type to dynamically cast the data as needed (since the
   }
 ~~~
 </div>
+<div class="language-c">
+~~~{.c}
+  // Access union type field.
+  if (ns(Monster_equipped_type(monster)) == ns(Equipment_Weapon)) {
+      // Cast to appropriate type:
+      // C allows for silent void pointer assignment, so we need no explicit cast.
+      ns(Weapon_table_t) weapon = ns(Monster_equipped(monster));
+      const char *weapon_name = ns(Weapon_name(weapon)); // "Axe"
+      uint16_t weapon_damage = ns(Weapon_damage(weapon)); // 5
+  }
+~~~
+</div>
 
 ## Mutating FlatBuffers
 
+<div class="language-c">
+*Note: This section does not fully apply to C which has no generated mutation
+interface (except for sorting vectors in-place which is an advanced topic).*
+</div>
+
 As you saw above, typically once you have created a FlatBuffer, it is read-only
 from that moment on. There are, however, cases where you have just received a
 FlatBuffer, and you'd like to modify something about it before sending it on to
@@ -1624,6 +1983,11 @@ mutators like so:
   <API for mutating FlatBuffers is not yet supported in PHP.>
 ~~~
 </div>
+<div class="language-c">
+~~~{.php}
+  <API for in-place mutating FlatBuffers will not be supported in C.>
+~~~
+</div>
 
 We use the somewhat verbose term `mutate` instead of `set` to indicate that this
 is a special use case, not to be confused with the default way of constructing
@@ -1687,6 +2051,14 @@ FlatBuffer binary representation of the contents from our `.json` file.
 [Use in C++](@ref flatbuffers_guide_use_cpp) section of the Programmer's
 Guide for more information.*
 </div>
+<div class="language-c">
+*Note: If you're working in C, the `flatcc --json` (not `flatc`)
+compiler will generate schema specific high performance json parsers and
+printers that you can compile and use at runtime. The `flatc` compiler (not
+`flatcc`) on the other hand, is still useful for general offline json to
+flatbuffer conversion from a given schema. There are no current plans
+for `flatcc` to support this.*
+</div>
 
 ## Advanced Features for Each Language
 
@@ -1716,5 +2088,8 @@ For your chosen language, see:
 <div class="language-php">
 [Use in PHP](@ref flatbuffers_guide_use_php)
 </div>
+<div class="language-c">
+[Use in C](@ref flatbuffers_guide_use_c)
+</div>
 
 <br>
diff --git a/docs/source/doxyfile b/docs/source/doxyfile
index ba6fbcbd6..bef63f582 100755
--- a/docs/source/doxyfile
+++ b/docs/source/doxyfile
@@ -750,6 +750,7 @@ INPUT = "FlatBuffers.md" \
         "Compiler.md" \
         "Schemas.md" \
         "CppUsage.md" \
+        "CUsage.md" \
         "GoUsage.md" \
         "JavaCsharpUsage.md" \
         "JavaScriptUsage.md" \
diff --git a/docs/source/doxygen_layout.xml b/docs/source/doxygen_layout.xml
index 1437016ea..b5d8644c1 100644
--- a/docs/source/doxygen_layout.xml
+++ b/docs/source/doxygen_layout.xml
@@ -25,6 +25,8 @@
           title="Writing a schema"/>
       <tab type="user" url="@ref flatbuffers_guide_use_cpp"
           title="Use in C++"/>
+      <tab type="user" url="@ref flatbuffers_guide_use_c"
+          title="Use in C"/>
       <tab type="user" url="@ref flatbuffers_guide_use_go"
           title="Use in Go"/>
       <tab type="user" url="@ref flatbuffers_guide_use_java_c-sharp"

From 9b8c91c90b2a2e63bf6e3d96ce996dc2f7d883cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikkel=20Fahn=C3=B8e=20J=C3=B8rgensen?= <mikkel@dvide.com>
Date: Sat, 26 Mar 2016 09:22:56 +0100
Subject: [PATCH 099/185] Add C support in README, minor updates in other C doc

---
 docs/source/CUsage.md   | 11 +++++++----
 docs/source/Tutorial.md |  2 +-
 readme.md               |  1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/source/CUsage.md b/docs/source/CUsage.md
index 0c87ce955..9397e04dd 100644
--- a/docs/source/CUsage.md
+++ b/docs/source/CUsage.md
@@ -15,8 +15,8 @@ project.
 
 - [Tutorial](@ref flatbuffers_guide_tutorial) - select C as language
   when scrolling down
-- General Use in C (the README) <https://github.com/dvidelabs/flatcc/blob/master/README.md>
-- The C Builder Interface, advanced <https://github.com/dvidelabs/flatcc/blob/master/doc/builder.md>
+- General Use in C (README) <https://github.com/dvidelabs/flatcc/blob/master/README.md>
+- The C Builder Interface (advanced) <https://github.com/dvidelabs/flatcc/blob/master/doc/builder.md>
 
 
 ## Basic Reflection
@@ -25,7 +25,7 @@ The C-API does support reading binary schema (.bfbs)
 files via code generated from the `reflection.fbs` schema, and an
 [example usage](https://github.com/dvidelabs/flatcc/tree/master/samples/reflection)
 shows how to use this. The schema files are pre-generated
-in the [runtime distribution](https://github.com/dvidelabs/flatcc/tree/master/include/flatcc/reflection). Extended reflection
+in the [runtime distribution](https://github.com/dvidelabs/flatcc/tree/master/include/flatcc/reflection).
 
 
 ## Mutating Reflection
@@ -37,9 +37,12 @@ buffers using complex objects from existing buffers as source. This can
 be very efficient due to direct copy semantics without endian conversion or
 temporary stack allocation.
 
+Scalars, structs and strings can be used as source, as well vectors of
+these.
+
 It is currently not possible to use an existing table or vector of table
 as source, but it would be possible to add support for this at some
-point.
+point. Vectors of strings
 
 
 ## Why not integrate with the `flatc` tool?
diff --git a/docs/source/Tutorial.md b/docs/source/Tutorial.md
index dfcc3ad7c..4547a2198 100644
--- a/docs/source/Tutorial.md
+++ b/docs/source/Tutorial.md
@@ -1293,7 +1293,7 @@ like so:
   // The returned buffer must be deallocated using `free`.
   // NOTE: Finalizing the buffer does NOT change the builder, it
   // just creates a snapshot of the builder content.
-  buf = flatcc_builder_finalize_buffer(&builder, &size);
+  buf = flatcc_builder_finalize_buffer(B, &size);
   // use buf
   free(buf);
 
diff --git a/readme.md b/readme.md
index 954604863..15dd41b11 100755
--- a/readme.md
+++ b/readme.md
@@ -15,6 +15,7 @@ unpacking/parsing it first, while still having great forwards/backwards compatib
 ## Supported programming languages
 * C++
 * C#
+* C
 * Go
 * Java
 * JavaScript

From 7d9779fc677372bb5af7b3f10f387116109e67ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikkel=20Fahn=C3=B8e=20J=C3=B8rgensen?= <mikkel@dvide.com>
Date: Mon, 28 Mar 2016 22:52:10 +0200
Subject: [PATCH 100/185] Move some C specifics out of tutorial and clarify
 platform support

---
 docs/source/CUsage.md      | 180 +++++++++++++++++++++++++++++++++--
 docs/source/FlatBuffers.md |   2 +-
 docs/source/Support.md     |   2 +-
 docs/source/Tutorial.md    | 190 ++++++-------------------------------
 4 files changed, 202 insertions(+), 172 deletions(-)

diff --git a/docs/source/CUsage.md b/docs/source/CUsage.md
index 9397e04dd..434038731 100644
--- a/docs/source/CUsage.md
+++ b/docs/source/CUsage.md
@@ -19,32 +19,194 @@ project.
 - The C Builder Interface (advanced) <https://github.com/dvidelabs/flatcc/blob/master/doc/builder.md>
 
 
+## Supported Platforms
+
+Ubuntu and OS-X are regularly tested during releases. Centos 7.1
+has also been tested. Cross compilation to little-endian ARM has been
+reported to work with warnings.
+
+Windows has not been tested. The `include/flatcc/portable` library is
+intended to abstract platform differences, including Windows. User
+feedback and patches are welcome.
+
+Big endian platforms have not been tested and may contain bugs, but care
+has been taken to provide support for it.
+
+
+## Modular Object Creation
+
+In the tutorial we used the call `Monster_create_as_root` to create the
+root buffer object since this is easier in simple use cases. Sometimes
+we need more modularity so we can reuse a function to create nested
+tables and root tables the same way. For this we need the
+`flatcc_builder_buffer_create_call`. It is best to keep `flatcc_builder`
+calls isolated at the top driver level, so we get:
+
+<div class="language-c">
+~~~{.c}
+  ns(Monster_ref_t) create_orc(flatcc_builder_t *B)
+  {
+    // ... same as in the tutorial.
+    return s(Monster_create(B, ...));
+  }
+
+  void create_monster_buffer()
+  {
+      uint8_t *buf;
+      size_t size;
+      flatcc_builder_t builder, *B;
+
+      // Initialize the builder object.
+      B = &builder;
+      flatcc_builder_init(B);
+      // Only use `buffer_create` without `create/start/end_as_root`.
+      flatcc_builder_buffer_create(create_orc(B));
+      // Allocate and copy buffer to user memory.
+      buf = flatcc_builder_finalize_buffer(B, &size);
+      // ... write the buffer to disk or network, or something.
+
+      free(buf);
+      flatcc_builder_clear(B);
+  }
+~~~
+</div>
+
+The same principle applies with `start/end` vs `start/end_as_root` in
+the top-down approach.
+
+
+## Top Down Example
+
+The tutorial uses a bottom up approach. In C it is also possible to use
+a top-down approach by starting and ending objects nested within each
+other. In the tutorial there is no deep nesting, so the difference is
+limited, but it shows the idea:
+
+<div class="language-c">
+<br>
+~~~{.c}
+  uint8_t treasure[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  size_t treasure_count = c_vec_len(treasure);
+  ns(Weapon_ref_t) axe;
+
+  // NOTE: if we use end_as_root, we MUST also start as root.
+  ns(Monster_start_as_root(B));
+  ns(Monster_pos_create(B, 1.0f, 2.0f, 3.0f));
+  ns(Monster_hp_add(B, 300));
+  ns(Monster_mana_add(B, 150));
+  // We use create_str instead of add because we have no existing string reference.
+  ns(Monster_name_create_str(B, "Orc"));
+  // Again we use create because we no existing vector object, only a C-array.
+  ns(Monster_inventory_create(B, treasure, treasure_count));
+  ns(Monster_color_add(B, ns(Color_Red)));
+  if (1) {
+      ns(Monster_weapons_start(B));
+      ns(Monster_weapons_push_create(B, flatbuffers_string_create_str(B, "Sword"), 3));
+      // We reuse the axe object later. Note that we dereference a pointer
+      // because push always returns a short-term pointer to the stored element.
+      // We could also have created the axe object first and simply pushed it.
+      axe = *ns(Monster_weapons_push_create(B, flatbuffers_string_create_str(B, "Axe"), 5));
+      ns(Monster_weapons_end(B));
+  } else {
+      // We can have more control with the table elements added to a vector:
+      //
+      ns(Monster_weapons_start(B));
+      ns(Monster_weapons_push_start(B));
+      ns(Weapon_name_create_str(B, "Sword"));
+      ns(Weapon_damage_add(B, 3));
+      ns(Monster_weapons_push_end(B));
+      ns(Monster_weapons_push_start(B));
+      ns(Monster_weapons_push_start(B));
+      ns(Weapon_name_create_str(B, "Axe"));
+      ns(Weapon_damage_add(B, 5));
+      axe = *ns(Monster_weapons_push_end(B));
+      ns(Monster_weapons_end(B));
+  }
+  // Unions can get their type by using a type-specific add/create/start method.
+  ns(Monster_equipped_Weapon_add(B, axe));
+
+  ns(Monster_end_as_root(B));
+~~~
+</div>
+
+
 ## Basic Reflection
 
 The C-API does support reading binary schema (.bfbs)
 files via code generated from the `reflection.fbs` schema, and an
 [example usage](https://github.com/dvidelabs/flatcc/tree/master/samples/reflection)
-shows how to use this. The schema files are pre-generated
+shows how to use this. The reflection schema files are pre-generated
 in the [runtime distribution](https://github.com/dvidelabs/flatcc/tree/master/include/flatcc/reflection).
 
 
-## Mutating Reflection
+## Mutations and Reflection
 
-The C-API does not support mutating reflection like C++ does.
+The C-API does not support mutating reflection like C++ does, nor does
+the reader interface support mutating scalars (and it is generally
+unsafe to do so even after verification).
 
-Although the following isn't reflection, it is possible to create new
-buffers using complex objects from existing buffers as source. This can
-be very efficient due to direct copy semantics without endian conversion or
-temporary stack allocation.
+The generated reader interface supports sorting vectors in-place after
+casting them to a mutating type because it is not practical to do so
+while building a buffer. This is covered in the builder documentation.  
+The reflection example makes use of this feature to look up objects by
+name.
+
+It is possible to build new buffers using complex objects from existing
+buffers as source. This can be very efficient due to direct copy
+semantics without endian conversion or temporary stack allocation.
 
 Scalars, structs and strings can be used as source, as well vectors of
 these.
 
 It is currently not possible to use an existing table or vector of table
 as source, but it would be possible to add support for this at some
-point. Vectors of strings
+point.
 
 
+## Namespaces
+
+The `FLATBUFFERS_WRAP_NAMESPACE` approach used in the tutorial is convenient
+when each function has a very long namespace prefix. But it isn't always
+we the best approach. If the namespace is absent, or very simple and
+informative, we might as well use the prefix directly. The
+[reflection example](https://github.com/dvidelabs/flatcc/blob/master/samples/reflection/bfbs2json.c)
+mentioned above uses this approach.
+
+
+## Checking for Present Members
+
+Not all languages support testing if a field is present, but in C we can
+elaborate the reader section of the tutorial with tests for this. Recall
+that `mana` was set to the default value `150` and therefore shouldn't
+be present.
+
+<div class="language-c">
+~~~{.c}
+  int hp_present = ns(Monster_hp_is_present(monster)); // 1
+  int mana_present = ns(Monster_mana_is_present(monster)); // 0
+~~~
+</div>
+
+## Alternative ways to add a Union
+
+In the tutorial we used a single call to add a union.  Here we show
+different ways to accomplish the same thing. The last form is rarely
+used, but is the low-level way to do it. It can be used to group small
+values together in the table by adding type and data at different
+points in time.
+
+<div class="language-c">
+~~~{.c}
+   ns(Equipment_union_ref_t) equipped = ns(Equipment_as_Weapon(axe));
+   ns(Monster_equipped_add(B, equipped));
+   // or alternatively
+   ns(Monster_equipped_Weapon_add(B, axe);
+   // or alternatively
+   ns(Monster_equipped_type_add(B, ns(Equipment_Weapon));
+   ns(Monster_equipped_add_member(B, axe));
+~~~
+</div>
+
 ## Why not integrate with the `flatc` tool?
 
 [It was considered how the C code generator could be integrated into the
@@ -55,3 +217,5 @@ a complicated intermediate representation would have to be invented.
 Neither of these alternatives are very attractive, and it isn't a big
 deal to use the `flatcc` tool instead of `flatc` given that the
 FlatBuffers C runtime library needs to be made available regardless.
+
+
diff --git a/docs/source/FlatBuffers.md b/docs/source/FlatBuffers.md
index 445121cb3..7da09903b 100644
--- a/docs/source/FlatBuffers.md
+++ b/docs/source/FlatBuffers.md
@@ -131,7 +131,7 @@ sections provide a more in-depth usage guide.
     in your own programs.
 -   How to [use the generated Go code](@ref flatbuffers_guide_use_go) in your
     own programs.
--   How to [use the generated C code](@ref flatbuffers_guide_use_c) in your
+-   How to [use FlatBuffers in C with `flatcc`](@ref flatbuffers_guide_use_c) in your
     own programs.
 -   [Support matrix](@ref flatbuffers_support) for platforms/languages/features.
 -   Some [benchmarks](@ref flatbuffers_benchmarks) showing the advantage of
diff --git a/docs/source/Support.md b/docs/source/Support.md
index 270f88bb9..23bf41aa8 100755
--- a/docs/source/Support.md
+++ b/docs/source/Support.md
@@ -28,7 +28,7 @@ Buffer verifier                | Yes    | No     | No     | No     | No     | No
 Testing: basic                 | Yes    | Yes    | Yes    | Yes    | Yes    | Yes       | Yes  | ?   | ?
 Testing: fuzz                  | Yes    | No     | No     | Yes    | Yes    | No        | No   | ?   | ?
 Performance:                   | Superb | Great  | Great  | Great  | Ok     | ?         |Superb| ?   | ?
-Platform: Windows              | VS2010 | Yes    | Yes    | ?      | ?      | ?         | No   | ?   | ?
+Platform: Windows              | VS2010 | Yes    | Yes    | ?      | ?      | ?         | ?    | ?   | ?
 Platform: Linux                | GCC282 | Yes    | ?      | Yes    | Yes    | ?         | Yes  | ?   | ?
 Platform: OS X                 | Xcode4 | ?      | ?      | ?      | Yes    | ?         | Yes  | ?   | ?
 Platform: Android              | NDK10d | Yes    | ?      | ?      | ?      | ?         | ?    | ?   | ?
diff --git a/docs/source/Tutorial.md b/docs/source/Tutorial.md
index 4547a2198..fdf7aca90 100644
--- a/docs/source/Tutorial.md
+++ b/docs/source/Tutorial.md
@@ -234,7 +234,6 @@ FlatBuffer compiler.
 Once `flatc` is built successfully, compile the schema for your language:
 
 <div class="language-c">
-
 *Note: If you're working in C, you need to use the separate project [FlatCC](https://github.com/dvidelabs/flatcc) which contains a schema compiler and runtime library in C for C.*
 <br>
 See [flatcc build instructions](https://github.com/dvidelabs/flatcc#building).
@@ -391,14 +390,11 @@ The first step is to import/include the library, generated files, etc.
   #include "monster_builder.h" // Generated by `flatcc`.
 
   // Convenient namespace macro to manage long namespace prefix.
+  #undef ns
   #define ns(x) FLATBUFFERS_WRAP_NAMESPACE(MyGame_Sample, x) // Specified in the schema.
-  // Convenient common namespace macro.
-  #define nsc(x) FLATBUFFERS_WRAP_NAMESPACE(flatbuffers, x)
+
   // A helper to simplify creating vectors from C-arrays.
   #define c_vec_len(V) (sizeof(V)/sizeof((V)[0]))
-
-  // The ns macro makes it possible to write `ns(Monster_create(...))`
-  // instead of `MyGame_Sample_Monster_create(...)`.
 ~~~
 </div>
 
@@ -577,10 +573,10 @@ our `orc` Monster, lets create some `Weapon`s: a `Sword` and an `Axe`.
 </div>
 <div class="language-c">
 ~~~{.c}
-  ns(Weapon_ref_t) weapon_one_name = nsc(string_create_str(B, "Sword"));
+  ns(Weapon_ref_t) weapon_one_name = flatbuffers_string_create_str(B, "Sword");
   uint16_t weapon_one_damage = 3;
 
-  ns(Weapon_ref_t) weapon_two_name = nsc(string_create_str(B, "Axe"));
+  ns(Weapon_ref_t) weapon_two_name = flatbuffers_string_create_str(B, "Axe");
   uint16_t weapon_two_damage = 5;
 
   ns(Weapon_ref_t) sword = ns(Weapon_create(B, weapon_one_name, weapon_one_damage));
@@ -693,14 +689,14 @@ traversal. This is generally easy to do on any tree structures.
 ~~~{.c}
   // Serialize a name for our monster, called "Orc".
   // The _str suffix indicates the source is an ascii-z string.
-  nsc(string_ref_t) name = nsc(string_create_str(B, "Orc"));
+  flatbuffers_string_ref_t name = flatbuffers_string_create_str(B, "Orc");
 
   // Create a `vector` representing the inventory of the Orc. Each number
   // could correspond to an item that can be claimed after he is slain.
   uint8_t treasure[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-  nsc(uint8_vec_ref_t) inventory;
+  flatbuffers_uint8_vec_ref_t inventory;
   // `c_vec_len` is the convenience macro we defined earlier.
-  inventory = nsc(uint8_vec_create(B, treasure, c_vec_len(treasure)));
+  inventory = flatbuffers_uint8_vec_create(B, treasure, c_vec_len(treasure));
 ~~~
 </div>
 
@@ -718,13 +714,6 @@ and `Axe`). These are both FlatBuffer `table`s, whose offsets we now store in
 memory. Therefore we can create a FlatBuffer `vector` to contain these
 offsets.
 
-<div class="language-c">
-*Note: If you're using C, there is also an often shorter top-down
-approach that avoids storing temporary references because the runtime
-has an internal stack. The top-down version is shown at the end of build
-section.*
-</div>
-
 <div class="language-cpp">
 ~~~{.cpp}
   // Place the weapons into a `std::vector`, then convert that into a FlatBuffer `vector`.
@@ -794,10 +783,7 @@ section.*
 </div>
 <div class="language-c">
 ~~~{.c}
-  // Here we use a top-down approach locally to build a Weapons vector
-  // in-place instead of creating a temporary external vector to use
-  // as argument like we did with the `inventory` earlier on, but the
-  // overall approach is still bottom-up.
+  // We use the internal builder stack to implement a dynamic vector.
   ns(Weapon_vec_start(B));
   ns(Weapon_vec_push(B, sword));
   ns(Weapon_vec_push(B, axe));
@@ -970,31 +956,23 @@ can serialize the monster itself:
   uint16_t hp = 300;
   uint16_t mana = 150;
 
-  // Create the equipment union. In the C++ language API this is given
-  // as two arguments to the create call, or as two separate add
-  // operations for the type and the table reference. In C we create
-  // a single union value that carries both the type and reference.
+  // Define an equipment union. `create` calls in C has a single
+  // argument for unions where C++ has both a type and a data argument.
   ns(Equipment_union_ref_t) equipped = ns(Equipment_as_Weapon(axe));
-
   ns(Monster_create_as_root(B, &pos, mana, hp, name, inventory, ns(Color_Red),
           weapons, equipped));
 ~~~
 </div>
 
-<div class="language-c">
-*Note: in C we use `create_as_root` instead of the also valid `create` call
-because it simplfies constructing the root object.*
-</div>
-
-<div class="language-cpp">
-<br>
 *Note: Since we are passing `150` as the `mana` field, which happens to be the
 default value, the field will not actually be written to the buffer, since the
 default value will be returned on query anyway. This is a nice space savings,
 especially if default values are common in your data. It also means that you do
 not need to be worried of adding a lot of fields that are only used in a small
 number of instances, as it will not bloat the buffer if unused.*
-<br><br>
+
+<div class="language-cpp">
+<br>
 If you do not wish to set every field in a `table`, it may be more convenient to
 manually set each field of your monster, instead of calling `CreateMonster()`.
 The following snippet is functionally equivalent to the above code, but provides
@@ -1016,14 +994,6 @@ a bit more flexibility.
 ~~~
 </div>
 <div class="language-c">
-<br>
-*Note: Since we are passing `150` as the `mana` field, which happens to be the
-default value, the field will not actually be written to the buffer, since the
-default value will be returned on query anyway. This is a nice space savings,
-especially if default values are common in your data. It also means that you do
-not need to be worried of adding a lot of fields that are only used in a small
-number of instances, as it will not bloat the buffer if unused.*
-<br><br>
 If you do not wish to set every field in a `table`, it may be more convenient to
 manually set each field of your monster, instead of calling `create_monster_as_root()`.
 The following snippet is functionally equivalent to the above code, but provides
@@ -1058,11 +1028,6 @@ Second, is the `union`'s data.
 In our example, the last two things we added to our `Monster` were the
 `Equipped Type` and the `Equipped` union itself.
 
-<div class="language-c">
-*Note: In C, several different helpers make these two fields appear as
-one field, but they can be added separately.*
-</div>
-
 Here is a repetition these lines, to help highlight them more clearly:
 
 <div class="language-cpp">
@@ -1110,62 +1075,8 @@ Here is a repetition these lines, to help highlight them more clearly:
 </div>
 <div class="language-c">
 ~~~{.c}
-  ns(Equipment_union_ref_t) equipped = ns(Equipment_as_Weapon(axe));
-  ns(Monster_equipped_add(B, equipped));
-  // or alternatively
-  ns(Monster_equipped_Weapon_add(B, axe);
-  // or alternatively
-  ns(Monster_equipped_type_add(B, ns(Equipment_Weapon));
-  ns(Monster_equipped_add_member(B, axe));
-~~~
-</div>
-
-<div class="language-c">
-Here is an alternative top-down approach unique to the C builder
-library.
-<br>
-~~~{.c}
-  uint8_t treasure[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-  size_t treasure_count = c_vec_len(treasure);
-  ns(Weapon_ref_t) axe;
-
-  // NOTE: if we use end_as_root, we MUST also start as root.
-  ns(Monster_start_as_root(B));
-  ns(Monster_pos_create(B, 1.0f, 2.0f, 3.0f));
-  ns(Monster_hp_add(B, 300));
-  ns(Monster_mana_add(B, 150));
-  // We use create_str instead of add because we have no existing string reference.
-  ns(Monster_name_create_str(B, "Orc"));
-  // Again we use create because we no existing vector object, only a C-array.
-  ns(Monster_inventory_create(B, treasure, treasure_count));
-  ns(Monster_color_add(B, ns(Color_Red)));
-  if (1) {
-      ns(Monster_weapons_start(B));
-      ns(Monster_weapons_push_create(B, nsc(string_create_str(B, "Sword")), 3));
-      // We reuse the axe object later. Note that we dereference a pointer
-      // because push always returns a short-term pointer to the stored element.
-      // We could also have created the axe object first and simply pushed it.
-      axe = *ns(Monster_weapons_push_create(B, nsc(string_create_str(B, "Axe")), 5));
-      ns(Monster_weapons_end(B));
-  } else {
-      // We can have more control with the table elements added to a vector:
-      //
-      ns(Monster_weapons_start(B));
-      ns(Monster_weapons_push_start(B));
-      ns(Weapon_name_create_str(B, "Sword"));
-      ns(Weapon_damage_add(B, 3));
-      ns(Monster_weapons_push_end(B));
-      ns(Monster_weapons_push_start(B));
-      ns(Monster_weapons_push_start(B));
-      ns(Weapon_name_create_str(B, "Axe"));
-      ns(Weapon_damage_add(B, 5));
-      axe = *ns(Monster_weapons_push_end(B));
-      ns(Monster_weapons_end(B));
-  }
-  // Unions can get their type by using a type-specific add/create/start method.
-  ns(Monster_equipped_Weapon_add(B, axe));
-
-  ns(Monster_end_as_root(B));
+  // Add union type and data simultanously.
+  ns(Monster_equipped_Weapon_add(B, axe)); 
 ~~~
 </div>
 
@@ -1173,12 +1084,6 @@ After you have created your buffer, you will have the offset to the root of the
 data in the `orc` variable, so you can finish the buffer by calling the
 appropriate `finish` method.
 
-<div class="language-c">
-*Note: C does not have a `finish` call, and it is not needed when we use
-`create_as_root` or `start/end_as_root`. For the sake of modularity, it
-is sometimes useful to create an object without knowing if it will be a
-root. We show this below, but do NOT mix it with the `_as_root` calls.*
-</div>
 
 <div class="language-cpp">
 ~~~{.cpp}
@@ -1229,10 +1134,7 @@ root. We show this below, but do NOT mix it with the `_as_root` calls.*
 </div>
 <div class="language-c">
 ~~~{.c}
-  // Alternative approach separating object creation from being root object.
-  ns(Monster_ref_t) orc = ns(Monster_create(B, ...));
-  // `flatcc_` calls should be isolated to top-level driver logic.
-  flatcc_builder_buffer_create(orc);
+  // Because we used `Monster_create_as_root`, we do not need a `finish` call in C`.
 ~~~
 </div>
 
@@ -1317,12 +1219,6 @@ deserialize a FlatBuffer.
 This section requires the same import/include, namespace, etc. requirements as
 before:
 
-<div class="language-c">
-*Note: In C there is a separate include file for the reader which is automatically
-included by the generated builder header. A standalone reader only depends on header
-files while the builder must link with a small runtime library.*
-</div>
-
 <div class="language-cpp">
 ~~~{.cpp}
   #include "monster_generate.h" // This was generated by `flatc`.
@@ -1401,10 +1297,11 @@ files while the builder must link with a small runtime library.*
 </div>
 <div class="language-c">
 ~~~{.c}
+  // Only needed if we don't have `#include "monster_builder.h"`.
   #include "monster_reader.h"
 
+  #undef ns
   #define ns(x) FLATBUFFERS_WRAP_NAMESPACE(MyGame_Sample, x) // Specified in the schema.
-  #define nsc(x) FLATBUFFERS_WRAP_NAMESPACE(flatbuffers, x)
 ~~~
 </div>
 
@@ -1565,29 +1462,14 @@ accessors for all non-`deprecated` fields. For example:
 <div class="language-c">
 ~~~{.c}
   uint16_t hp = ns(Monster_hp(monster));
-  // Since 150 is the default, we are reading a value that wasn't stored.
   uint16_t mana = ns(Monster_mana(monster));
-  // This is just a const char *, but it also supports a fast length operation.
-  nsc(string_t) name = ns(Monster_name(monster));
-  size_t name_len = nsc(string_len(name));
+  flatbuffers_string_t name = ns(Monster_name(monster));
 ~~~
 </div>
 
-<div class="language-c">
-*Note: In C we can check if a field is present. For example `mana`
-should not be present because it was set with a default value or not at
-all, but `hp` should be present.*
-
-~~~{.c}
-  int hp_present = ns(Monster_hp_is_present(monster)); // 1
-  int mana_present = ns(Monster_mana_is_present(monster)); // 0
-~~~
-</div>
-
-
 These should hold `300`, `150`, and `"Orc"` respectively.
 
-*Note: We never stored a value in `mana`, so we got the default value of `150`.*
+*Note: The default value `150` wasn't stored in `mana`, but we are still able to retrieve it.*
 
 To access sub-objects, in the case of our `pos`, which is a `Vec3`:
 
@@ -1659,13 +1541,6 @@ To access sub-objects, in the case of our `pos`, which is a `Vec3`:
   float x = ns(Vec3_x(pos));
   float y = ns(Vec3_y(pos));
   float z = ns(Vec3_z(pos));
-
-  // or alternatively
-  ns(Vec3_t) pos_vec;
-  // `pe` indicates endian conversion from protocol to native.
-  ns(Vec3_copy_from_pe(&pos_vec, pos));
-  x = pos_vec.x;
-  // ...
 ~~~
 </div>
 
@@ -1722,15 +1597,10 @@ FlatBuffers `vector`.
 </div>
 <div class="language-c">
 ~~~{.c}
-    // This is a const uint8_t *, but it shouldn't be accessed directly
-    // to ensure proper endian conversion. Incidentally the uint8 (ubyte)
-    // is not sensitive to endianness, so we *could* have accessed it directly.
-    // The compiler likely optimizes this so that it doesn't matter.
-    nsc(uint8_vec_t) inv = ns(Monster_inventory(monster));
-    size_t inv_len = nsc(uint8_vec_len(inv));
-
-    // If `inv` was not set, it will be null, but the length is still
-    // valid to read and will then be zero.
+    // If `inv` hasn't been set, it will be null. It is valid get
+    // the length of null which will be 0, useful for iteration.
+    flatbuffers_uint8_vec_t inv = ns(Monster_inventory(monster));
+    size_t inv_len = flatbuffers_uint8_vec_len(inv);
 ~~~
 </div>
 
@@ -1795,7 +1665,7 @@ except your need to handle the result as a FlatBuffer `table`:
 ~~~{.c}
   ns(Weapon_vec_t) weapons = ns(Monster_weapons(monster));
   size_t weapons_len = ns(Weapon_vec_len(weapons));
-  // We don't have to use `nsc(string_t)` as type if we don't need fast length access.
+  // We can use `const char *` instead of `flatbuffers_string_t`.
   const char *second_weapon_name = ns(Weapon_name(ns(Weapon_vec_at(weapons, 1))));
   uint16_t second_weapon_damage =  ns(Weapon_damage(ns(Weapon_vec_at(weapons, 1))));
 ~~~
@@ -1917,11 +1787,6 @@ We can access the type to dynamically cast the data as needed (since the
 
 ## Mutating FlatBuffers
 
-<div class="language-c">
-*Note: This section does not fully apply to C which has no generated mutation
-interface (except for sorting vectors in-place which is an advanced topic).*
-</div>
-
 As you saw above, typically once you have created a FlatBuffer, it is read-only
 from that moment on. There are, however, cases where you have just received a
 FlatBuffer, and you'd like to modify something about it before sending it on to
@@ -1984,8 +1849,9 @@ mutators like so:
 ~~~
 </div>
 <div class="language-c">
-~~~{.php}
-  <API for in-place mutating FlatBuffers will not be supported in C.>
+~~~{.c}
+  <API for in-place mutating FlatBuffers will not be supported in C
+  (except in-place vector sorting is possible).>
 ~~~
 </div>
 

From 28a3c939e7f2083b79254ff90cfde77e51908bc8 Mon Sep 17 00:00:00 2001
From: Armen Baghumian <armen@vardump.org>
Date: Mon, 14 Mar 2016 17:37:22 +1100
Subject: [PATCH 101/185] Implement __vector_as_bytes and methods to get
 [ubyte] efficiently

Currently in order to get a value type of [ubyte] in PHP, iteration is
necessary which is not efficient. Helper __vector_as_bytes has been
implemented in order to return the byte arrays in PHP efficiently.

Appropriate methods also been added to use aforementioned method to return
the byte array. (e.g. get*Bytes()).

The reason the methods are named get*Bytes() and not for instance
get*ByteArray() is the fact that PHP doesn't support byte arrays and the
binary safe string implementation in PHP is used to simulate byte arrays
and since there is chance for PHP users to confuse this with PHP arrays
the name get*Bytes() has been chosen.

In the future __vector_as_bytebuffer() method can also be implemented to
return PHP implementation of ByteBuffer.
---
 php/Table.php                    | 12 +++++++++---
 src/idl_gen_php.cpp              | 21 ++++++++++++++++++++-
 tests/MyGame/Example/Monster.php | 16 ++++++++++++++++
 tests/phpTest.php                |  1 +
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/php/Table.php b/php/Table.php
index 7f6114560..6f917c1af 100644
--- a/php/Table.php
+++ b/php/Table.php
@@ -89,9 +89,15 @@ abstract class Table
         return $offset + $this->bb->getInt($offset) + Constants::SIZEOF_INT;
     }
 
-//    protected function __vector_as_bytebuffer($vector_offset, $elem_size)
-//    {
-//    }
+    protected function __vector_as_bytes($vector_offset, $elem_size=1)
+    {
+        $o = $this->__offset($vector_offset);
+        if ($o == 0) {
+            return null;
+        }
+
+        return substr($this->bb->_buffer, $this->__vector($o), $this->__vector_len($o) * $elem_size);
+    }
 
     /**
      * @param Table $table
diff --git a/src/idl_gen_php.cpp b/src/idl_gen_php.cpp
index 2488b1d18..5b904a077 100644
--- a/src/idl_gen_php.cpp
+++ b/src/idl_gen_php.cpp
@@ -165,6 +165,22 @@ namespace php {
       code += Indent + "}\n\n";
     }
 
+    // Get a [ubyte] vector as a byte array.
+    static void GetUByte(const FieldDef &field,
+      std::string *code_ptr) {
+      std::string &code = *code_ptr;
+
+      code += Indent + "/**\n";
+      code += Indent + " * @return string\n";
+      code += Indent + " */\n";
+      code += Indent + "public function get";
+      code += MakeCamel(field.name) + "Bytes()\n";
+      code += Indent + "{\n";
+      code += Indent + Indent + "return $this->__vector_as_bytes(";
+      code += NumToString(field.value.offset) + ");\n";
+      code += Indent + "}\n\n";
+    }
+
     // Get the value of a struct's scalar.
     static void GetScalarFieldOfStruct(const FieldDef &field,
       std::string *code_ptr) {
@@ -250,7 +266,7 @@ namespace php {
         ");\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 {
@@ -690,6 +706,9 @@ namespace php {
       }
       if (field.value.type.base_type == BASE_TYPE_VECTOR) {
         GetVectorLen(field, code_ptr);
+        if (field.value.type.element == BASE_TYPE_UCHAR) {
+          GetUByte(field, code_ptr);
+        }
       }
     }
 
diff --git a/tests/MyGame/Example/Monster.php b/tests/MyGame/Example/Monster.php
index 6c1d34a0b..48b9c7df2 100644
--- a/tests/MyGame/Example/Monster.php
+++ b/tests/MyGame/Example/Monster.php
@@ -98,6 +98,14 @@ class Monster extends Table
         return $o != 0 ? $this->__vector_len($o) : 0;
     }
 
+    /**
+     * @return string
+     */
+    public function getInventoryBytes()
+    {
+        return $this->__vector_as_bytes(14);
+    }
+
     /**
      * @return sbyte
      */
@@ -210,6 +218,14 @@ class Monster extends Table
         return $o != 0 ? $this->__vector_len($o) : 0;
     }
 
+    /**
+     * @return string
+     */
+    public function getTestnestedflatbufferBytes()
+    {
+        return $this->__vector_as_bytes(30);
+    }
+
     public function getTestempty()
     {
         $obj = new Stat();
diff --git a/tests/phpTest.php b/tests/phpTest.php
index 0afc0af7f..4dc83b28d 100644
--- a/tests/phpTest.php
+++ b/tests/phpTest.php
@@ -128,6 +128,7 @@ function test_buffer(Assert $assert, Google\FlatBuffers\ByteBuffer $bb) {
     }
     $assert->strictEqual($invsum, 10);
 
+    $assert->strictEqual(bin2hex($monster->GetInventoryBytes()), "0001020304");
 
     $test_0 = $monster->GetTest4(0);
     $test_1 = $monster->GetTest4(1);

From 35f6bb506018976a923b67fb14dd1eb5e30e08b9 Mon Sep 17 00:00:00 2001
From: Nnamdi <nnamdio@gmail.com>
Date: Tue, 29 Mar 2016 22:25:04 +0100
Subject: [PATCH 102/185] Added --gen-name-strings command line option.

To support the use case described in issue google/flatbuffers#3826, a new command line option --gen-name-strings
has been added, which will cause a static GetFullyQualifiedName function to be added
to the C++ output for tables/structs.
---
 include/flatbuffers/flatbuffers.h |  8 +++++
 include/flatbuffers/idl.h         |  2 ++
 src/flatc.cpp                     | 53 ++++++++++++++++---------------
 src/idl_gen_cpp.cpp               | 16 +++++++++-
 4 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index ff9f7269d..e08e96118 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -91,6 +91,14 @@
 #else
   #define FLATBUFFERS_FINAL_CLASS
 #endif
+
+#if (!defined(_MSC_VER) || _MSC_VER >= 1900) && \
+    (!defined(__GNUC__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406))
+  #define FLATBUFFERS_CONSTEXPR constexpr
+#else
+  #define FLATBUFFERS_CONSTEXPR
+#endif
+
 /// @endcond
 
 /// @file
diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index e16d3ca90..3229576c9 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -321,6 +321,7 @@ struct IDLOptions {
   bool proto_mode;
   bool generate_all;
   bool skip_unexpected_fields_in_json;
+  bool generate_name_strings;
 
   // Possible options for the more general generator below.
   enum Language { kJava, kCSharp, kGo, kMAX };
@@ -339,6 +340,7 @@ struct IDLOptions {
       proto_mode(false),
       generate_all(false),
       skip_unexpected_fields_in_json(false),
+      generate_name_strings(false),
       lang(IDLOptions::kJava) {}
 };
 
diff --git a/src/flatc.cpp b/src/flatc.cpp
index c0696dd46..d4be151c8 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -96,31 +96,32 @@ static void Error(const std::string &err, bool usage, bool show_exe_name) {
                : "  ",
              generators[i].generator_help);
     printf(
-      "  -o PATH         Prefix PATH to all generated files.\n"
-      "  -I PATH         Search for includes in the specified path.\n"
-      "  -M              Print make rules for generated files.\n"
-      "  --version       Print the version number of flatc and exit.\n"
-      "  --strict-json   Strict JSON: field names must be / will be quoted,\n"
-      "                  no trailing commas in tables/vectors.\n"
-      "  --defaults-json Output fields whose value is the default when\n"
-      "                  writing JSON\n"
-      "  --unknown-json  Allow fields in JSON that are not defined in the\n"
-      "                  schema. These fields will be discared when generating\n"
-      "                  binaries.\n"
-      "  --no-prefix     Don\'t prefix enum values with the enum type in C++.\n"
-      "  --scoped-enums  Use C++11 style scoped and strongly typed enums.\n"
-      "                  also implies --no-prefix.\n"
-      "  --gen-includes  (deprecated), this is the default behavior.\n"
-      "                  If the original behavior is required (no include\n"
-      "                  statements) use --no-includes.\n"
-      "  --no-includes   Don\'t generate include statements for included\n"
-      "                  schemas the generated file depends on (C++).\n"
-      "  --gen-mutable   Generate accessors that can mutate buffers in-place.\n"
-      "  --gen-onefile   Generate single output file for C#\n"
-      "  --raw-binary    Allow binaries without file_indentifier to be read.\n"
-      "                  This may crash flatc given a mismatched schema.\n"
-      "  --proto         Input is a .proto, translate to .fbs.\n"
-      "  --schema        Serialize schemas instead of JSON (use with -b)\n"
+      "  -o PATH            Prefix PATH to all generated files.\n"
+      "  -I PATH            Search for includes in the specified path.\n"
+      "  -M                 Print make rules for generated files.\n"
+      "  --version          Print the version number of flatc and exit.\n"
+      "  --strict-json      Strict JSON: field names must be / will be quoted,\n"
+      "                     no trailing commas in tables/vectors.\n"
+      "  --defaults-json    Output fields whose value is the default when\n"
+      "                     writing JSON\n"
+      "  --unknown-json     Allow fields in JSON that are not defined in the\n"
+      "                     schema. These fields will be discared when generating\n"
+      "                     binaries.\n"
+      "  --no-prefix        Don\'t prefix enum values with the enum type in C++.\n"
+      "  --scoped-enums     Use C++11 style scoped and strongly typed enums.\n"
+      "                     also implies --no-prefix.\n"
+      "  --gen-includes     (deprecated), this is the default behavior.\n"
+      "                     If the original behavior is required (no include\n"
+      "                     statements) use --no-includes.\n"
+      "  --no-includes      Don\'t generate include statements for included\n"
+      "                     schemas the generated file depends on (C++).\n"
+      "  --gen-mutable      Generate accessors that can mutate buffers in-place.\n"
+      "  --gen-onefile      Generate single output file for C#\n"
+      "  --gen-name-strings Generate type name functions for C++.\n"
+      "  --raw-binary       Allow binaries without file_indentifier to be read.\n"
+      "                     This may crash flatc given a mismatched schema.\n"
+      "  --proto            Input is a .proto, translate to .fbs.\n"
+      "  --schema           Serialize schemas instead of JSON (use with -b)\n"
       "FILEs may be schemas, or JSON files (conforming to preceding schema)\n"
       "FILEs after the -- must be binary flatbuffer format files.\n"
       "Output files are named using the base file name of the input,\n"
@@ -171,6 +172,8 @@ int main(int argc, const char *argv[]) {
         opts.scoped_enums = true;
       } else if(arg == "--gen-mutable") {
         opts.mutable_buffer = true;
+      } else if(arg == "--gen-name-strings") {
+        opts.generate_name_strings = true;
       } else if(arg == "--gen-all") {
         opts.generate_all = true;
         opts.include_dependence_headers = false;
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index eb5093461..cae3812db 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -267,6 +267,14 @@ std::string GenFieldOffsetName(const FieldDef &field) {
   return "VT_" + uname;
 }
 
+static void GenFullyQualifiedNameGetter(const Parser &parser, const std::string& name, std::string &code) {
+  if (parser.opts.generate_name_strings) {
+    code += "  static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() {\n";
+    code += "    return \"" + parser.namespaces_.back()->GetFullyQualifiedName(name) + "\";\n";
+    code += "  }\n";
+  }
+}
+
 // Generate an accessor struct, builder structs & function for a table.
 static void GenTable(const Parser &parser, StructDef &struct_def,
                      std::string *code_ptr) {
@@ -277,6 +285,8 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
   code += "struct " + struct_def.name;
   code += " FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table";
   code += " {\n";
+  // Generate GetFullyQualifiedName
+  GenFullyQualifiedNameGetter(parser, struct_def.name, code);
   // Generate field id constants.
   if (struct_def.fields.vec.size() > 0) {
     code += "  enum {\n";
@@ -583,8 +593,12 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
     GenPadding(field, code, padding_id, PaddingDefinition);
   }
 
+  // Generate GetFullyQualifiedName
+  code += "\n public:\n";
+  GenFullyQualifiedNameGetter(parser, struct_def.name, code);
+
   // Generate a constructor that takes all fields as arguments.
-  code += "\n public:\n  " + struct_def.name + "(";
+  code += "  " + struct_def.name + "(";
   for (auto it = struct_def.fields.vec.begin();
        it != struct_def.fields.vec.end();
        ++it) {

From 4c16038e72b378e5864f12fad607abc071d94c6f Mon Sep 17 00:00:00 2001
From: Tony Kelman <tony@kelman.net>
Date: Fri, 1 Apr 2016 21:42:23 -0700
Subject: [PATCH 103/185] Fix build on Cygwin

use -std=gnu++11 instead of c++0x on cygwin to avoid
error: realpath was not declared in this scope

ref http://www.cygwin.com/ml/cygwin/2016-03/msg00005.html
---
 CMakeLists.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2edf829b..542bce3b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,8 +80,15 @@ if(APPLE)
   set(CMAKE_CXX_FLAGS
     "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
 elseif(CMAKE_COMPILER_IS_GNUCXX)
+  if(CYGWIN)
+    set(CMAKE_CXX_FLAGS
+      "${CMAKE_CXX_FLAGS} -std=gnu++11")
+  else(CYGWIN)
+    set(CMAKE_CXX_FLAGS
+      "${CMAKE_CXX_FLAGS} -std=c++0x")
+  endif(CYGWIN)
   set(CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra -Werror=shadow")
+    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow")
   if (GCC_VERSION VERSION_GREATER 4.4)
     set(CMAKE_CXX_FLAGS
       "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result")

From 5b38134431cb770e2a3d7f7f5ef185b9de0e9b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikkel=20Fahn=C3=B8e=20J=C3=B8rgensen?= <mikkel@dvide.com>
Date: Sun, 3 Apr 2016 21:37:57 +0200
Subject: [PATCH 104/185] Document FlatCC support for Windows

---
 docs/source/CUsage.md  | 21 ++++++++++++---------
 docs/source/Support.md |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/docs/source/CUsage.md b/docs/source/CUsage.md
index 434038731..1f48050e7 100644
--- a/docs/source/CUsage.md
+++ b/docs/source/CUsage.md
@@ -7,7 +7,7 @@ The `flatcc` C schema compiler can generate code offline as well as
 online via a C library. It can also generate buffer verifiers and fast
 JSON parsers, printers.
 
-Great effort has been made to ensure compatibily with the main `flatc`
+Great care has been taken to ensure compatibily with the main `flatc`
 project.
 
 
@@ -21,13 +21,16 @@ project.
 
 ## Supported Platforms
 
-Ubuntu and OS-X are regularly tested during releases. Centos 7.1
-has also been tested. Cross compilation to little-endian ARM has been
-reported to work with warnings.
+Not all platforms are tested regularly but the following platforms have
+all successfully built and passed all tests:
 
-Windows has not been tested. The `include/flatcc/portable` library is
-intended to abstract platform differences, including Windows. User
-feedback and patches are welcome.
+- 64-bit Ubuntu 14.04, gcc, CMake with Ninja Build or GNU Make
+- 64-bit OS-X 10.11, Apple Clang, CMake with Ninja Build or GNU Make
+- 64-bit Centos 7.1, CMake with GNU Make
+- 32-bit Windows 10, CMake with MSVC 14 2015
+
+ARM cross compilation from Linux has been reported to work to some
+extend.
 
 Big endian platforms have not been tested and may contain bugs, but care
 has been taken to provide support for it.
@@ -167,7 +170,7 @@ point.
 
 The `FLATBUFFERS_WRAP_NAMESPACE` approach used in the tutorial is convenient
 when each function has a very long namespace prefix. But it isn't always
-we the best approach. If the namespace is absent, or very simple and
+the best approach. If the namespace is absent, or simple and
 informative, we might as well use the prefix directly. The
 [reflection example](https://github.com/dvidelabs/flatcc/blob/master/samples/reflection/bfbs2json.c)
 mentioned above uses this approach.
@@ -202,7 +205,7 @@ points in time.
    // or alternatively
    ns(Monster_equipped_Weapon_add(B, axe);
    // or alternatively
-   ns(Monster_equipped_type_add(B, ns(Equipment_Weapon));
+   ns(Monster_equipped_add_type(B, ns(Equipment_Weapon));
    ns(Monster_equipped_add_member(B, axe));
 ~~~
 </div>
diff --git a/docs/source/Support.md b/docs/source/Support.md
index 23bf41aa8..7b01d1582 100755
--- a/docs/source/Support.md
+++ b/docs/source/Support.md
@@ -28,7 +28,7 @@ Buffer verifier                | Yes    | No     | No     | No     | No     | No
 Testing: basic                 | Yes    | Yes    | Yes    | Yes    | Yes    | Yes       | Yes  | ?   | ?
 Testing: fuzz                  | Yes    | No     | No     | Yes    | Yes    | No        | No   | ?   | ?
 Performance:                   | Superb | Great  | Great  | Great  | Ok     | ?         |Superb| ?   | ?
-Platform: Windows              | VS2010 | Yes    | Yes    | ?      | ?      | ?         | ?    | ?   | ?
+Platform: Windows              | VS2010 | Yes    | Yes    | ?      | ?      | ?         | Yes  | ?   | ?
 Platform: Linux                | GCC282 | Yes    | ?      | Yes    | Yes    | ?         | Yes  | ?   | ?
 Platform: OS X                 | Xcode4 | ?      | ?      | ?      | Yes    | ?         | Yes  | ?   | ?
 Platform: Android              | NDK10d | Yes    | ?      | ?      | ?      | ?         | ?    | ?   | ?

From 1db9783bfc2f08fd86d710eb4b936829af842442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikkel=20Fahn=C3=B8e=20J=C3=B8rgensen?= <mikkel@dvide.com>
Date: Mon, 4 Apr 2016 16:33:20 +0200
Subject: [PATCH 105/185] Remove details on FlatCC builds that would easily
 become outdated

---
 docs/source/CUsage.md | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/docs/source/CUsage.md b/docs/source/CUsage.md
index 1f48050e7..6f293a81b 100644
--- a/docs/source/CUsage.md
+++ b/docs/source/CUsage.md
@@ -18,23 +18,14 @@ project.
 - General Use in C (README) <https://github.com/dvidelabs/flatcc/blob/master/README.md>
 - The C Builder Interface (advanced) <https://github.com/dvidelabs/flatcc/blob/master/doc/builder.md>
 
-
 ## Supported Platforms
 
-Not all platforms are tested regularly but the following platforms have
-all successfully built and passed all tests:
-
-- 64-bit Ubuntu 14.04, gcc, CMake with Ninja Build or GNU Make
-- 64-bit OS-X 10.11, Apple Clang, CMake with Ninja Build or GNU Make
-- 64-bit Centos 7.1, CMake with GNU Make
-- 32-bit Windows 10, CMake with MSVC 14 2015
-
-ARM cross compilation from Linux has been reported to work to some
-extend.
-
-Big endian platforms have not been tested and may contain bugs, but care
-has been taken to provide support for it.
+- Ubuntu
+- OS-X
+- Windows
 
+Centos has been tested at some point and ARM cross compilation has been reported to
+work to some extend, but these are not regularly tested.
 
 ## Modular Object Creation
 

From f4a5c9de5094173a214e2f34d1db9d7e57fcb840 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <aardappel@gmail.com>
Date: Mon, 4 Apr 2016 13:00:48 -0700
Subject: [PATCH 106/185] Fixed VS assignment constructor warning.

---
 include/flatbuffers/flatbuffers.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index e08e96118..2c3398bd2 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -1117,14 +1117,14 @@ FLATBUFFERS_FINAL_CLASS
   bool force_defaults_;  // Serialize values equal to their defaults anyway.
 
   struct StringOffsetCompare {
-    StringOffsetCompare(const vector_downward &buf) : buf_(buf) {}
+    StringOffsetCompare(const vector_downward &buf) : buf_(&buf) {}
     bool operator() (const Offset<String> &a, const Offset<String> &b) const {
-      auto stra = reinterpret_cast<const String *>(buf_.data_at(a.o));
-      auto strb = reinterpret_cast<const String *>(buf_.data_at(b.o));
+      auto stra = reinterpret_cast<const String *>(buf_->data_at(a.o));
+      auto strb = reinterpret_cast<const String *>(buf_->data_at(b.o));
       return strncmp(stra->c_str(), strb->c_str(),
                      std::min(stra->size(), strb->size()) + 1) < 0;
     }
-    const vector_downward &buf_;
+    const vector_downward *buf_;
   };
 
   // For use with CreateSharedString. Instantiated on first use only.

From 7523e4ad4960261f8be5d79200f8d65aad128711 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 30 Mar 2016 17:00:49 -0700
Subject: [PATCH 107/185] Fixed potential integer overflow in the Verifier.

This overflow could allow malformed FlatBuffers to pass the verifier.

Change-Id: Ia993299a761b00b93e53e8aff2689b631755763c
Tested: on Linux.
Bug: 27903580
---
 include/flatbuffers/flatbuffers.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index ff9f7269d..592f71586 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -111,6 +111,9 @@ typedef uint16_t voffset_t;
 
 typedef uintmax_t largest_scalar_t;
 
+// In 32bits, this evaluates to 2GB - 1
+#define FLATBUFFERS_MAX_BUFFER_SIZE ((1ULL << (sizeof(soffset_t) * 8 - 1)) - 1)
+
 // Pointer to relinquished memory.
 typedef std::unique_ptr<uint8_t, std::function<void(uint8_t * /* unused */)>>
           unique_ptr_t;
@@ -486,7 +489,7 @@ class vector_downward {
     cur_ -= len;
     // Beyond this, signed offsets may not have enough range:
     // (FlatBuffers > 2GB not supported).
-    assert(size() < (1UL << (sizeof(soffset_t) * 8 - 1)) - 1);
+    assert(size() < FLATBUFFERS_MAX_BUFFER_SIZE);
     return cur_;
   }
 
@@ -1162,7 +1165,9 @@ class Verifier FLATBUFFERS_FINAL_CLASS {
 
   // Verify any range within the buffer.
   bool Verify(const void *elem, size_t elem_len) const {
-    return Check(elem_len <= (size_t) (end_ - buf_) && elem >= buf_ && elem <= end_ - elem_len);
+    return Check(elem_len <= (size_t) (end_ - buf_) &&
+                 elem >= buf_ &&
+                 elem <= end_ - elem_len);
   }
 
   // Verify a range indicated by sizeof(T).
@@ -1205,6 +1210,8 @@ class Verifier FLATBUFFERS_FINAL_CLASS {
     // Check the whole array. If this is a string, the byte past the array
     // must be 0.
     auto size = ReadScalar<uoffset_t>(vec);
+    auto max_elems = FLATBUFFERS_MAX_BUFFER_SIZE / elem_size;
+    Check(size < max_elems);  // Protect against byte_size overflowing.
     auto byte_size = sizeof(size) + elem_size * size;
     *end = vec + byte_size;
     return Verify(vec, byte_size);

From 1c1d079113fe046f1702da6f3506c49660de1f19 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 30 Mar 2016 17:21:48 -0700
Subject: [PATCH 108/185] Fix flatc build for msvc.

(from CL 117010760)

Change-Id: I0ee77cf87d0cb00b94887356745b85423b1375a6
---
 include/flatbuffers/util.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h
index 9f9cb9d64..30037963b 100644
--- a/include/flatbuffers/util.h
+++ b/include/flatbuffers/util.h
@@ -21,6 +21,7 @@
 #include <iomanip>
 #include <string>
 #include <sstream>
+#include <stdint.h>
 #include <stdlib.h>
 #include <assert.h>
 #ifdef _WIN32

From c8c00824138ae1819250d4dd77859f5d0b811ece Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 30 Mar 2016 17:26:44 -0700
Subject: [PATCH 109/185] Fix flatbuffers conversion warnings.

(from CL 116785833)

Change-Id: I0fb0e1318fd70cba51e229a93f535c6639bbb331
---
 include/flatbuffers/flatbuffers.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 592f71586..0b6bd1762 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -534,7 +534,7 @@ class vector_downward {
 inline voffset_t FieldIndexToOffset(voffset_t field_id) {
   // Should correspond to what EndTable() below builds up.
   const int fixed_fields = 2;  // Vtable size and Object Size.
-  return (field_id + fixed_fields) * sizeof(voffset_t);
+  return static_cast<voffset_t>((field_id + fixed_fields) * sizeof(voffset_t));
 }
 
 // Computes how many bytes you'd have to pad to be able to write an
@@ -715,7 +715,7 @@ FLATBUFFERS_FINAL_CLASS
     Align(sizeof(uoffset_t));
     // Offset must refer to something already in buffer.
     assert(off && off <= GetSize());
-    return GetSize() - off + sizeof(uoffset_t);
+    return GetSize() - off + static_cast<uoffset_t>(sizeof(uoffset_t));
   }
 
   void NotNested() {

From e98b1912b356f1e8a19245979eeb979628c62c87 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 30 Mar 2016 17:34:52 -0700
Subject: [PATCH 110/185] add setloadfile and setfileexists functions to
 flatbuffers

to allow for custom file loaders. The targeted use case is android runtime.

(from CL 116980408)

Change-Id: I8785c0acf714fab41d8f6fc9f1c52875423b8f5b
---
 CMakeLists.txt             |  2 ++
 android/jni/Android.mk     |  3 +-
 include/flatbuffers/util.h | 33 +++++++-----------
 src/util.cpp               | 71 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 87 insertions(+), 22 deletions(-)
 create mode 100644 src/util.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2edf829b..70a7dd54f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,7 @@ set(FlatBuffers_Library_SRCS
   src/idl_parser.cpp
   src/idl_gen_text.cpp
   src/reflection.cpp
+  src/util.cpp
 )
 
 set(FlatBuffers_Compiler_SRCS
@@ -68,6 +69,7 @@ set(FlatBuffers_Sample_Text_SRCS
   include/flatbuffers/util.h
   src/idl_parser.cpp
   src/idl_gen_text.cpp
+  src/util.cpp
   samples/sample_text.cpp
   # file generated by running compiler on samples/monster.fbs
   ${CMAKE_CURRENT_BINARY_DIR}/samples/monster_generated.h
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 905fbe91a..f5f83f17a 100755
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -33,7 +33,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := flatbuffers_extra
 LOCAL_SRC_FILES := src/idl_parser.cpp \
                    src/idl_gen_text.cpp \
-                   src/reflection.cpp
+                   src/reflection.cpp \
+                   src/util.cpp
 LOCAL_STATIC_LIBRARIES := flatbuffers
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h
index 30037963b..cfb211f09 100644
--- a/include/flatbuffers/util.h
+++ b/include/flatbuffers/util.h
@@ -111,33 +111,24 @@ inline int64_t StringToUInt(const char *str, int base = 10) {
   #endif
 }
 
+typedef bool (*LoadFileFunction)(const char *filename, bool binary,
+                                 std::string *dest);
+typedef bool (*FileExistsFunction)(const char *filename);
+
+LoadFileFunction SetLoadFileFunction(LoadFileFunction load_file_function);
+
+FileExistsFunction SetFileExistsFunction(FileExistsFunction
+                                         file_exists_function);
+
+
 // Check if file "name" exists.
-inline bool FileExists(const char *name) {
-  std::ifstream ifs(name);
-  return ifs.good();
-}
+bool FileExists(const char *name);
 
 // Load file "name" into "buf" returning true if successful
 // false otherwise.  If "binary" is false data is read
 // using ifstream's text mode, otherwise data is read with
 // no transcoding.
-inline bool LoadFile(const char *name, bool binary, std::string *buf) {
-  std::ifstream ifs(name, binary ? std::ifstream::binary : std::ifstream::in);
-  if (!ifs.is_open()) return false;
-  if (binary) {
-    // The fastest way to read a file into a string.
-    ifs.seekg(0, std::ios::end);
-    (*buf).resize(static_cast<size_t>(ifs.tellg()));
-    ifs.seekg(0, std::ios::beg);
-    ifs.read(&(*buf)[0], (*buf).size());
-  } else {
-    // This is slower, but works correctly on all platforms for text files.
-    std::ostringstream oss;
-    oss << ifs.rdbuf();
-    *buf = oss.str();
-  }
-  return !ifs.bad();
-}
+bool LoadFile(const char *name, bool binary, std::string *buf);
 
 // Save data "buf" of length "len" bytes into a file
 // "name" returning true if successful, false otherwise.
diff --git a/src/util.cpp b/src/util.cpp
new file mode 100644
index 000000000..452e9eae5
--- /dev/null
+++ b/src/util.cpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "flatbuffers/util.h"
+
+namespace flatbuffers {
+
+bool FileExistsRaw(const char *name) {
+  std::ifstream ifs(name);
+  return ifs.good();
+}
+
+bool LoadFileRaw(const char *name, bool binary, std::string *buf) {
+  std::ifstream ifs(name, binary ? std::ifstream::binary : std::ifstream::in);
+  if (!ifs.is_open()) return false;
+  if (binary) {
+    // The fastest way to read a file into a string.
+    ifs.seekg(0, std::ios::end);
+    (*buf).resize(static_cast<size_t>(ifs.tellg()));
+    ifs.seekg(0, std::ios::beg);
+    ifs.read(&(*buf)[0], (*buf).size());
+  } else {
+    // This is slower, but works correctly on all platforms for text files.
+    std::ostringstream oss;
+    oss << ifs.rdbuf();
+    *buf = oss.str();
+  }
+  return !ifs.bad();
+}
+
+static LoadFileFunction g_load_file_function = LoadFileRaw;
+static FileExistsFunction g_file_exists_function = FileExistsRaw;
+
+bool LoadFile(const char *name, bool binary, std::string *buf) {
+  assert(g_load_file_function);
+  return g_load_file_function(name, binary, buf);
+}
+
+bool FileExists(const char *name) {
+  assert(g_file_exists_function);
+  return g_file_exists_function(name);
+}
+
+LoadFileFunction SetLoadFileFunction(LoadFileFunction load_file_function) {
+  LoadFileFunction previous_function = g_load_file_function;
+  g_load_file_function = load_file_function ? load_file_function : LoadFileRaw;
+  return previous_function;
+}
+
+FileExistsFunction SetFileExistsFunction(
+    FileExistsFunction file_exists_function) {
+  FileExistsFunction previous_function = g_file_exists_function;
+  g_file_exists_function = file_exists_function ?
+      file_exists_function : FileExistsRaw;
+  return previous_function;
+}
+
+}  // namespace flatbuffers

From cfaa7782b6e2ea1b3fd83b2d93594c2895c6415c Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 4 Apr 2016 17:07:05 -0700
Subject: [PATCH 111/185] Adding missing util.cpp to Xcode project

---
 build_ide/Xcode/FlatBuffers.xcodeproj/project.pbxproj | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build_ide/Xcode/FlatBuffers.xcodeproj/project.pbxproj b/build_ide/Xcode/FlatBuffers.xcodeproj/project.pbxproj
index 7618c1595..ee18e9e29 100644
--- a/build_ide/Xcode/FlatBuffers.xcodeproj/project.pbxproj
+++ b/build_ide/Xcode/FlatBuffers.xcodeproj/project.pbxproj
@@ -11,6 +11,9 @@
 		5AC48C391ACA9A0A008132C5 /* idl_gen_general.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD8717A19CB937D0012A827 /* idl_gen_general.cpp */; };
 		61823BBC53544106B6DBC38E /* idl_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3709AC883348409592530AE6 /* idl_parser.cpp */; settings = {COMPILER_FLAGS = ""; }; };
 		61FF3C34FBEC4819A1C30F92 /* sample_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECCEBFFA6977404F858F9739 /* sample_text.cpp */; settings = {COMPILER_FLAGS = ""; }; };
+		8C2AAE0A1CB338A8000CC78D /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C2AAE091CB338A8000CC78D /* util.cpp */; settings = {ASSET_TAGS = (); }; };
+		8C2AAE0B1CB338CD000CC78D /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C2AAE091CB338A8000CC78D /* util.cpp */; settings = {ASSET_TAGS = (); }; };
+		8C2AAE0C1CB338CE000CC78D /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C2AAE091CB338A8000CC78D /* util.cpp */; settings = {ASSET_TAGS = (); }; };
 		8C303C591975D6A700D7C1C5 /* idl_gen_go.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C303C581975D6A700D7C1C5 /* idl_gen_go.cpp */; };
 		8C6905FD19F835B400CB8866 /* idl_gen_fbs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C6905EC19F8357300CB8866 /* idl_gen_fbs.cpp */; };
 		8C78573E1BD5AE2C00C53C34 /* idl_gen_js.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C78573D1BD5AE2C00C53C34 /* idl_gen_js.cpp */; };
@@ -38,6 +41,7 @@
 		420E3BC724ED4A008D79297F /* flatsampletext */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; path = flatsampletext; sourceTree = BUILT_PRODUCTS_DIR; };
 		5EE44BFFAF8E43F485859145 /* sample_binary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sample_binary.cpp; path = samples/sample_binary.cpp; sourceTree = SOURCE_ROOT; };
 		6AD24EEB3D024825A37741FF /* test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test.cpp; path = tests/test.cpp; sourceTree = SOURCE_ROOT; };
+		8C2AAE091CB338A8000CC78D /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = util.cpp; path = src/util.cpp; sourceTree = "<group>"; };
 		8C303C581975D6A700D7C1C5 /* idl_gen_go.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = idl_gen_go.cpp; path = src/idl_gen_go.cpp; sourceTree = "<group>"; };
 		8C6905EC19F8357300CB8866 /* idl_gen_fbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = idl_gen_fbs.cpp; path = src/idl_gen_fbs.cpp; sourceTree = "<group>"; };
 		8C78573D1BD5AE2C00C53C34 /* idl_gen_js.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = idl_gen_js.cpp; path = src/idl_gen_js.cpp; sourceTree = "<group>"; };
@@ -58,6 +62,7 @@
 		28237E300FE042DEADA302D3 /* Source Files */ = {
 			isa = PBXGroup;
 			children = (
+				8C2AAE091CB338A8000CC78D /* util.cpp */,
 				D2DA271C1BFFBC06000F9168 /* idl_gen_php.cpp */,
 				8C78573D1BD5AE2C00C53C34 /* idl_gen_js.cpp */,
 				8CA854B21B04244A00040A06 /* idl_gen_python.cpp */,
@@ -246,6 +251,7 @@
 				61FF3C34FBEC4819A1C30F92 /* sample_text.cpp in Sources */,
 				AE5F47A7DCB44781B657F062 /* idl_gen_text.cpp in Sources */,
 				1963D7D2A57344A3B1C1713F /* idl_parser.cpp in Sources */,
+				8C2AAE0B1CB338CD000CC78D /* util.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -265,6 +271,7 @@
 				AA9BACF55EB3456BA2F633BB /* flatc.cpp in Sources */,
 				BE03D7B0C9584DD58B50ED34 /* idl_gen_cpp.cpp in Sources */,
 				AD71FEBEE4E846529002C1F0 /* idl_gen_text.cpp in Sources */,
+				8C2AAE0A1CB338A8000CC78D /* util.cpp in Sources */,
 				8C8774641B703E1200E693F5 /* idl_gen_fbs.cpp in Sources */,
 				A9C9A99F719A4ED58DC2D2FC /* idl_parser.cpp in Sources */,
 				8CA854B31B04244A00040A06 /* idl_gen_python.cpp in Sources */,
@@ -280,6 +287,7 @@
 			files = (
 				8C8774631B703D4800E693F5 /* reflection.cpp in Sources */,
 				5AC48C391ACA9A0A008132C5 /* idl_gen_general.cpp in Sources */,
+				8C2AAE0C1CB338CE000CC78D /* util.cpp in Sources */,
 				8C6905FD19F835B400CB8866 /* idl_gen_fbs.cpp in Sources */,
 				E0680D6B5BFD484BA9D88EE8 /* idl_gen_text.cpp in Sources */,
 				61823BBC53544106B6DBC38E /* idl_parser.cpp in Sources */,

From 8128df765550ee6223459d211bd47fabee0e7966 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <aardappel@gmail.com>
Date: Mon, 4 Apr 2016 17:01:21 -0700
Subject: [PATCH 112/185] Added missing util.cpp to VS project

---
 build_ide/VS2010/flatc.vcxproj          | 1 +
 build_ide/VS2010/flatsampletext.vcxproj | 1 +
 build_ide/VS2010/flattests.vcxproj      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/build_ide/VS2010/flatc.vcxproj b/build_ide/VS2010/flatc.vcxproj
index e804ed332..31cd01345 100755
--- a/build_ide/VS2010/flatc.vcxproj
+++ b/build_ide/VS2010/flatc.vcxproj
@@ -263,6 +263,7 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\src\util.cpp" />
     <ClInclude Include="..\..\include\flatbuffers\flatbuffers.h" />
     <ClInclude Include="..\..\include\flatbuffers\idl.h" />
     <ClInclude Include="..\..\include\flatbuffers\util.h" />
diff --git a/build_ide/VS2010/flatsampletext.vcxproj b/build_ide/VS2010/flatsampletext.vcxproj
index 2519e50c8..95a6a351f 100755
--- a/build_ide/VS2010/flatsampletext.vcxproj
+++ b/build_ide/VS2010/flatsampletext.vcxproj
@@ -263,6 +263,7 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\src\util.cpp" />
     <ClInclude Include="..\..\include\flatbuffers\flatbuffers.h" />
     <ClInclude Include="..\..\include\flatbuffers\idl.h" />
     <ClInclude Include="..\..\include\flatbuffers\util.h" />
diff --git a/build_ide/VS2010/flattests.vcxproj b/build_ide/VS2010/flattests.vcxproj
index 24dca0b36..511aa66e1 100755
--- a/build_ide/VS2010/flattests.vcxproj
+++ b/build_ide/VS2010/flattests.vcxproj
@@ -273,6 +273,7 @@
     <ClCompile Include="..\..\src\idl_parser.cpp" />
     <ClCompile Include="..\..\src\idl_gen_text.cpp" />
     <ClCompile Include="..\..\src\reflection.cpp" />
+    <ClCompile Include="..\..\src\util.cpp" />
     <ClCompile Include="..\..\tests\test.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

From 7d396bc2e75c25062e9084efb7f740e28fa86eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikkel=20Fahn=C3=B8e=20J=C3=B8rgensen?= <mikkel@dvide.com>
Date: Thu, 7 Apr 2016 18:52:00 +0200
Subject: [PATCH 113/185] Update C documentation with supported MSVC versions,
 and other minor updates.

---
 docs/source/CUsage.md      | 25 +++++++++++++++++--------
 docs/source/FlatBuffers.md |  6 +++---
 docs/source/Support.md     | 34 +++++++++++++++++-----------------
 docs/source/Tutorial.md    |  9 ++++-----
 4 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/docs/source/CUsage.md b/docs/source/CUsage.md
index 6f293a81b..9aafa6f77 100644
--- a/docs/source/CUsage.md
+++ b/docs/source/CUsage.md
@@ -10,22 +10,31 @@ JSON parsers, printers.
 Great care has been taken to ensure compatibily with the main `flatc`
 project.
 
-
 ## General Documention
 
 - [Tutorial](@ref flatbuffers_guide_tutorial) - select C as language
   when scrolling down
-- General Use in C (README) <https://github.com/dvidelabs/flatcc/blob/master/README.md>
-- The C Builder Interface (advanced) <https://github.com/dvidelabs/flatcc/blob/master/doc/builder.md>
+- [FlatCC Guide](https://github.com/dvidelabs/flatcc#flatcc-flatbuffers-in-c-for-c)
+- [The C Builder Interface](https://github.com/dvidelabs/flatcc/blob/master/doc/builder.md#the-builder-interface)
+- [The Monster Sample in C](https://github.com/dvidelabs/flatcc/blob/master/samples/monster/monster.c)
+- [GitHub](https://github.com/dvidelabs/flatcc)
+
 
 ## Supported Platforms
 
-- Ubuntu
-- OS-X
-- Windows
+- Ubuntu (clang / gcc, ninja / gnu make)
+- OS-X (clang / gcc, ninja / gnu make)
+- Windows MSVC 2010, 2013, 2015
 
-Centos has been tested at some point and ARM cross compilation has been reported to
-work to some extend, but these are not regularly tested.
+CI builds recent versions of gcc, clang and MSVC on OS-X, Ubuntu, and
+Windows, and occasionally older compiler versions. See main project [Status](https://github.com/dvidelabs/flatcc#status).
+
+Other platforms may well work, including Centos, but are not tested
+regularly.
+
+The monster sample project was specifically written for C99 in order to
+follow the C++ version and for that reason it will not work with MSVC
+2010.
 
 ## Modular Object Creation
 
diff --git a/docs/source/FlatBuffers.md b/docs/source/FlatBuffers.md
index 7da09903b..46d4c1201 100644
--- a/docs/source/FlatBuffers.md
+++ b/docs/source/FlatBuffers.md
@@ -4,9 +4,9 @@ FlatBuffers    {#flatbuffers_index}
 # Overview {#flatbuffers_overview}
 
 [FlatBuffers](@ref flatbuffers_overview) is an efficient cross platform
-serialization library for C++, C#, C, Go, Java, JavaScript, PHP, and Python
-(Ruby and Swift in progress). It was originally created at Google for game
-development and other performance-critical applications.
+serialization library for C++, C#, C, Go, Java, JavaScript, PHP, and Python.
+It was originally created at Google for game development and other
+performance-critical applications.
 
 It is available as Open Source on [GitHub](http://github.com/google/flatbuffers)
 under the Apache license, v2 (see LICENSE.txt).
diff --git a/docs/source/Support.md b/docs/source/Support.md
index 7b01d1582..7bc33481d 100755
--- a/docs/source/Support.md
+++ b/docs/source/Support.md
@@ -18,23 +18,23 @@ In general:
 
 NOTE: this table is a start, it needs to be extended.
 
-Feature                        | C++    | Java   | C#     | Go     | Python | JS        | C    | PHP | Ruby
------------------------------- | ------ | ------ | ------ | ------ | ------ | --------- | ---- | --- | ----
-Codegen for all basic features | Yes    | Yes    | Yes    | Yes    | Yes    | Yes       | Yes  | WiP | WiP
-JSON parsing                   | Yes    | No     | No     | No     | No     | No        | Yes  | No  | No
-Simple mutation                | Yes    | WIP    | WIP    | No     | No     | No        | No   | No  | No
-Reflection                     | Yes    | No     | No     | No     | No     | No        | Basic| No  | No
-Buffer verifier                | Yes    | No     | No     | No     | No     | No        | Yes  | No  | No
-Testing: basic                 | Yes    | Yes    | Yes    | Yes    | Yes    | Yes       | Yes  | ?   | ?
-Testing: fuzz                  | Yes    | No     | No     | Yes    | Yes    | No        | No   | ?   | ?
-Performance:                   | Superb | Great  | Great  | Great  | Ok     | ?         |Superb| ?   | ?
-Platform: Windows              | VS2010 | Yes    | Yes    | ?      | ?      | ?         | Yes  | ?   | ?
-Platform: Linux                | GCC282 | Yes    | ?      | Yes    | Yes    | ?         | Yes  | ?   | ?
-Platform: OS X                 | Xcode4 | ?      | ?      | ?      | Yes    | ?         | Yes  | ?   | ?
-Platform: Android              | NDK10d | Yes    | ?      | ?      | ?      | ?         | ?    | ?   | ?
-Platform: iOS                  | ?      | ?      | ?      | ?      | ?      | ?         | ?    | ?   | ?
-Engine: Unity                  | ?      | ?      | Yes    | ?      | ?      | ?         | ?    | ?   | ?
-Primary authors (github)       | gwvo   | gwvo   | ev*/js*| rw     | rw     | evanw/ev* | mik* | ch* | rw
+Feature                        | C++    | Java   | C#     | Go     | Python | JS        | C        | PHP | Ruby
+------------------------------ | ------ | ------ | ------ | ------ | ------ | --------- | ------  | --- | ----
+Codegen for all basic features | Yes    | Yes    | Yes    | Yes    | Yes    | Yes       | Yes     | WiP | WiP
+JSON parsing                   | Yes    | No     | No     | No     | No     | No        | Yes     | No  | No
+Simple mutation                | Yes    | WIP    | WIP    | No     | No     | No        | No      | No  | No
+Reflection                     | Yes    | No     | No     | No     | No     | No        | Basic   | No  | No
+Buffer verifier                | Yes    | No     | No     | No     | No     | No        | Yes     | No  | No
+Testing: basic                 | Yes    | Yes    | Yes    | Yes    | Yes    | Yes       | Yes     | ?   | ?
+Testing: fuzz                  | Yes    | No     | No     | Yes    | Yes    | No        | No      | ?   | ?
+Performance:                   | Superb | Great  | Great  | Great  | Ok     | ?         | Superb  | ?   | ?
+Platform: Windows              | VS2010 | Yes    | Yes    | ?      | ?      | ?         | VS2010  | ?   | ?
+Platform: Linux                | GCC282 | Yes    | ?      | Yes    | Yes    | ?         | Yes     | ?   | ?
+Platform: OS X                 | Xcode4 | ?      | ?      | ?      | Yes    | ?         | Yes     | ?   | ?
+Platform: Android              | NDK10d | Yes    | ?      | ?      | ?      | ?         | ?       | ?   | ?
+Platform: iOS                  | ?      | ?      | ?      | ?      | ?      | ?         | ?       | ?   | ?
+Engine: Unity                  | ?      | ?      | Yes    | ?      | ?      | ?         | ?       | ?   | ?
+Primary authors (github)       | gwvo   | gwvo   | ev*/js*| rw     | rw     | evanw/ev* | mik*    | ch* | rw
 
   * ev = evolutional
   * js = jonsimantov
diff --git a/docs/source/Tutorial.md b/docs/source/Tutorial.md
index fdf7aca90..1e48796d9 100644
--- a/docs/source/Tutorial.md
+++ b/docs/source/Tutorial.md
@@ -19,17 +19,16 @@ character, the hero of the story, needs to slay some `orc`s. We will walk
 through each step necessary to create this monster type using FlatBuffers.
 
 Please select your desired language for our quest:
-
 \htmlonly
 <form>
   <input type="radio" name="language" value="cpp" checked="checked">C++</input>
-  <input type="radio" name="language" value="csharp">C#</input>
-  <input type="radio" name="language" value="c">C</input>
-  <input type="radio" name="language" value="go">Go</input>
   <input type="radio" name="language" value="java">Java</input>
+  <input type="radio" name="language" value="csharp">C#</input>
+  <input type="radio" name="language" value="go">Go</input>
+  <input type="radio" name="language" value="python">Python</input>
   <input type="radio" name="language" value="javascript">JavaScript</input>
   <input type="radio" name="language" value="php">PHP</input>
-  <input type="radio" name="language" value="python">Python</input>
+  <input type="radio" name="language" value="c">C</input>
 </form>
 \endhtmlonly
 

From c837d29eabd8b844a10e20f102f3de4d5a05ad60 Mon Sep 17 00:00:00 2001
From: Wojciech Jaszczak <jaszczakw@gmail.com>
Date: Fri, 8 Apr 2016 19:56:02 +0200
Subject: [PATCH 114/185] Remove unnecessary condition in
 AssertOffsetAndLength.

Condition is already checked and covered in the following condition, the second one was excess.

Signed-off-by: Wojciech Jaszczak <jaszczakw@gmail.com>
---
 net/FlatBuffers/ByteBuffer.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/FlatBuffers/ByteBuffer.cs b/net/FlatBuffers/ByteBuffer.cs
index 37779b593..7ca491dc5 100755
--- a/net/FlatBuffers/ByteBuffer.cs
+++ b/net/FlatBuffers/ByteBuffer.cs
@@ -129,8 +129,7 @@ namespace FlatBuffers
         private void AssertOffsetAndLength(int offset, int length)
         {
             if (offset < 0 ||
-                offset >= _buffer.Length ||
-                offset + length > _buffer.Length)
+                offset > _buffer.Length - length)
                 throw new ArgumentOutOfRangeException();
         }
 

From e597ad8f0f63bd0e5b9571e7c6c9d22d3e1acdc5 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 11 Apr 2016 11:05:42 -0700
Subject: [PATCH 115/185] Fixed pre-declarations of included types in generated
 code.

This was harmless, but unnecessary.

Change-Id: I1365a725e254d4ebbda081110a50277cb5118323
Tested: on Linux.
---
 src/idl_gen_cpp.cpp            | 6 ++++--
 tests/monster_test_generated.h | 8 --------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index cae3812db..e043b0146 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -777,8 +777,10 @@ std::string GenerateCPP(const Parser &parser,
   for (auto it = parser.structs_.vec.begin();
        it != parser.structs_.vec.end(); ++it) {
     auto &struct_def = **it;
-    CheckNameSpace(struct_def, &code);
-    code += "struct " + struct_def.name + ";\n\n";
+    if (!struct_def.generated) {
+      CheckNameSpace(struct_def, &code);
+      code += "struct " + struct_def.name + ";\n\n";
+    }
   }
 
   // Generate code for all the enum declarations.
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index a7f02ffe7..ef7f577f5 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -5,14 +5,6 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-namespace MyGame {
-namespace OtherNameSpace {
-
-struct Unused;
-
-}  // namespace OtherNameSpace
-}  // namespace MyGame
-
 namespace MyGame {
 namespace Example {
 

From 83dc5ed4a7267c78fb3f00e972de4db30762166d Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 11 Apr 2016 11:08:09 -0700
Subject: [PATCH 116/185] Fixed JSON integers as strings not being parsed
 correctly.

Change-Id: If34aef46ef619e06de799cff14948b02e98da86d
Tested: on Linux.
---
 src/idl_parser.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 21508ccd8..1df44add1 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -974,6 +974,7 @@ CheckedError Parser::ParseSingleValue(Value &e) {
         assert(0);  // Shouldn't happen, we covered all types.
         e.constant = "0";
       }
+      NEXT();
     }
   } else {
     bool match = false;

From 72fc45aa6acbc11052c6baa462fac26c5075392a Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 11 Apr 2016 17:36:56 -0700
Subject: [PATCH 117/185] Made user-defined attributes available in the
 reflection data.

Tested: on Linux.

Bug: 27923233
Change-Id: Ic16675650e4a8e138c163f1e2131a3aad7008ada
---
 include/flatbuffers/idl.h                     |  49 +--
 include/flatbuffers/reflection_generated.h    | 341 ++++++++++++------
 reflection/reflection.fbs                     |   8 +
 src/idl_parser.cpp                            |  49 ++-
 tests/monster_test.bfbs                       | Bin 2744 -> 2840 bytes
 .../namespace_test2_generated.h               |  10 -
 tests/test.cpp                                |   4 +
 7 files changed, 305 insertions(+), 156 deletions(-)

diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index fbc696f55..e671c01e7 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -18,7 +18,6 @@
 #define FLATBUFFERS_IDL_H_
 
 #include <map>
-#include <set>
 #include <stack>
 #include <memory>
 #include <functional>
@@ -113,6 +112,7 @@ inline size_t SizeOf(BaseType t) {
 
 struct StructDef;
 struct EnumDef;
+struct Parser;
 
 // Represents any type in the IDL, which is a combination of the BaseType
 // and additional information for vectors/structs_.
@@ -184,10 +184,8 @@ template<typename T> class SymbolTable {
     return it == dict.end() ? nullptr : it->second;
   }
 
- private:
-  std::map<std::string, T *> dict;      // quick lookup
-
  public:
+  std::map<std::string, T *> dict;      // quick lookup
   std::vector<T *> vec;  // Used to iterate in order of insertion
 };
 
@@ -208,6 +206,11 @@ struct Definition {
   Definition() : generated(false), defined_namespace(nullptr),
                  serialized_location(0), index(-1) {}
 
+  flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<
+    reflection::KeyValue>>>
+      SerializeAttributes(FlatBufferBuilder *builder,
+                          const Parser &parser) const;
+
   std::string name;
   std::string file;
   std::vector<std::string> doc_comment;
@@ -223,8 +226,8 @@ struct Definition {
 struct FieldDef : public Definition {
   FieldDef() : deprecated(false), required(false), key(false), padding(0) {}
 
-  Offset<reflection::Field> Serialize(FlatBufferBuilder *builder, uint16_t id)
-                                                                          const;
+  Offset<reflection::Field> Serialize(FlatBufferBuilder *builder, uint16_t id,
+                                      const Parser &parser) const;
 
   Value value;
   bool deprecated; // Field is allowed to be present in old data, but can't be
@@ -250,7 +253,8 @@ struct StructDef : public Definition {
     if (fields.vec.size()) fields.vec.back()->padding = padding;
   }
 
-  Offset<reflection::Object> Serialize(FlatBufferBuilder *builder) const;
+  Offset<reflection::Object> Serialize(FlatBufferBuilder *builder,
+                                       const Parser &parser) const;
 
   SymbolTable<FieldDef> fields;
   bool fixed;       // If it's struct, not a table.
@@ -299,7 +303,8 @@ struct EnumDef : public Definition {
     return nullptr;
   }
 
-  Offset<reflection::Enum> Serialize(FlatBufferBuilder *builder) const;
+  Offset<reflection::Enum> Serialize(FlatBufferBuilder *builder,
+                                     const Parser &parser) const;
 
   SymbolTable<EnumVal> vals;
   bool is_union;
@@ -406,18 +411,18 @@ class Parser {
       anonymous_counter(0) {
     // Just in case none are declared:
     namespaces_.push_back(new Namespace());
-    known_attributes_.insert("deprecated");
-    known_attributes_.insert("required");
-    known_attributes_.insert("key");
-    known_attributes_.insert("hash");
-    known_attributes_.insert("id");
-    known_attributes_.insert("force_align");
-    known_attributes_.insert("bit_flags");
-    known_attributes_.insert("original_order");
-    known_attributes_.insert("nested_flatbuffer");
-    known_attributes_.insert("csharp_partial");
-    known_attributes_.insert("stream");
-    known_attributes_.insert("idempotent");
+    known_attributes_["deprecated"] = true;
+    known_attributes_["required"] = true;
+    known_attributes_["key"] = true;
+    known_attributes_["hash"] = true;
+    known_attributes_["id"] = true;
+    known_attributes_["force_align"] = true;
+    known_attributes_["bit_flags"] = true;
+    known_attributes_["original_order"] = true;
+    known_attributes_["nested_flatbuffer"] = true;
+    known_attributes_["csharp_partial"] = true;
+    known_attributes_["stream"] = true;
+    known_attributes_["idempotent"] = true;
   }
 
   ~Parser() {
@@ -528,6 +533,8 @@ private:
   std::map<std::string, bool> included_files_;
   std::map<std::string, std::set<std::string>> files_included_per_file_;
 
+  std::map<std::string, bool> known_attributes_;
+
   IDLOptions opts;
 
  private:
@@ -541,8 +548,6 @@ private:
 
   std::vector<std::pair<Value, FieldDef *>> field_stack_;
 
-  std::set<std::string> known_attributes_;
-
   int anonymous_counter;
 };
 
diff --git a/include/flatbuffers/reflection_generated.h b/include/flatbuffers/reflection_generated.h
index 86023df9d..da1124939 100644
--- a/include/flatbuffers/reflection_generated.h
+++ b/include/flatbuffers/reflection_generated.h
@@ -5,14 +5,20 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-
 namespace reflection {
 
 struct Type;
+
+struct KeyValue;
+
 struct EnumVal;
+
 struct Enum;
+
 struct Field;
+
 struct Object;
+
 struct Schema;
 
 enum BaseType {
@@ -32,7 +38,9 @@ enum BaseType {
   String = 13,
   Vector = 14,
   Obj = 15,
-  Union = 16
+  Union = 16,
+  MIN = None,
+  MAX = Union
 };
 
 inline const char **EnumNamesBaseType() {
@@ -40,17 +48,22 @@ inline const char **EnumNamesBaseType() {
   return names;
 }
 
-inline const char *EnumNameBaseType(BaseType e) { return EnumNamesBaseType()[e]; }
+inline const char *EnumNameBaseType(BaseType e) { return EnumNamesBaseType()[static_cast<int>(e)]; }
 
 struct Type FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  BaseType base_type() const { return static_cast<BaseType>(GetField<int8_t>(4, 0)); }
-  BaseType element() const { return static_cast<BaseType>(GetField<int8_t>(6, 0)); }
-  int32_t index() const { return GetField<int32_t>(8, -1); }
+  enum {
+    VT_BASE_TYPE = 4,
+    VT_ELEMENT = 6,
+    VT_INDEX = 8
+  };
+  BaseType base_type() const { return static_cast<BaseType>(GetField<int8_t>(VT_BASE_TYPE, 0)); }
+  BaseType element() const { return static_cast<BaseType>(GetField<int8_t>(VT_ELEMENT, 0)); }
+  int32_t index() const { return GetField<int32_t>(VT_INDEX, -1); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<int8_t>(verifier, 4 /* base_type */) &&
-           VerifyField<int8_t>(verifier, 6 /* element */) &&
-           VerifyField<int32_t>(verifier, 8 /* index */) &&
+           VerifyField<int8_t>(verifier, VT_BASE_TYPE) &&
+           VerifyField<int8_t>(verifier, VT_ELEMENT) &&
+           VerifyField<int32_t>(verifier, VT_INDEX) &&
            verifier.EndTable();
   }
 };
@@ -58,9 +71,9 @@ struct Type FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
 struct TypeBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
-  void add_base_type(BaseType base_type) { fbb_.AddElement<int8_t>(4, static_cast<int8_t>(base_type), 0); }
-  void add_element(BaseType element) { fbb_.AddElement<int8_t>(6, static_cast<int8_t>(element), 0); }
-  void add_index(int32_t index) { fbb_.AddElement<int32_t>(8, index, -1); }
+  void add_base_type(BaseType base_type) { fbb_.AddElement<int8_t>(Type::VT_BASE_TYPE, static_cast<int8_t>(base_type), 0); }
+  void add_element(BaseType element) { fbb_.AddElement<int8_t>(Type::VT_ELEMENT, static_cast<int8_t>(element), 0); }
+  void add_index(int32_t index) { fbb_.AddElement<int32_t>(Type::VT_INDEX, index, -1); }
   TypeBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   TypeBuilder &operator=(const TypeBuilder &);
   flatbuffers::Offset<Type> Finish() {
@@ -80,18 +93,65 @@ inline flatbuffers::Offset<Type> CreateType(flatbuffers::FlatBufferBuilder &_fbb
   return builder_.Finish();
 }
 
-struct EnumVal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(4); }
-  int64_t value() const { return GetField<int64_t>(6, 0); }
-  bool KeyCompareLessThan(const EnumVal *o) const { return value() < o->value(); }
-  int KeyCompareWithValue(int64_t val) const { return value() < val ? -1 : value() > val; }
-  const Object *object() const { return GetPointer<const Object *>(8); }
+struct KeyValue FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  enum {
+    VT_KEY = 4,
+    VT_VALUE = 6
+  };
+  const flatbuffers::String *key() const { return GetPointer<const flatbuffers::String *>(VT_KEY); }
+  bool KeyCompareLessThan(const KeyValue *o) const { return *key() < *o->key(); }
+  int KeyCompareWithValue(const char *val) const { return strcmp(key()->c_str(), val); }
+  const flatbuffers::String *value() const { return GetPointer<const flatbuffers::String *>(VT_VALUE); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, 4 /* name */) &&
+           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_KEY) &&
+           verifier.Verify(key()) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_VALUE) &&
+           verifier.Verify(value()) &&
+           verifier.EndTable();
+  }
+};
+
+struct KeyValueBuilder {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_key(flatbuffers::Offset<flatbuffers::String> key) { fbb_.AddOffset(KeyValue::VT_KEY, key); }
+  void add_value(flatbuffers::Offset<flatbuffers::String> value) { fbb_.AddOffset(KeyValue::VT_VALUE, value); }
+  KeyValueBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
+  KeyValueBuilder &operator=(const KeyValueBuilder &);
+  flatbuffers::Offset<KeyValue> Finish() {
+    auto o = flatbuffers::Offset<KeyValue>(fbb_.EndTable(start_, 2));
+    fbb_.Required(o, KeyValue::VT_KEY);  // key
+    return o;
+  }
+};
+
+inline flatbuffers::Offset<KeyValue> CreateKeyValue(flatbuffers::FlatBufferBuilder &_fbb,
+   flatbuffers::Offset<flatbuffers::String> key = 0,
+   flatbuffers::Offset<flatbuffers::String> value = 0) {
+  KeyValueBuilder builder_(_fbb);
+  builder_.add_value(value);
+  builder_.add_key(key);
+  return builder_.Finish();
+}
+
+struct EnumVal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  enum {
+    VT_NAME = 4,
+    VT_VALUE = 6,
+    VT_OBJECT = 8
+  };
+  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
+  int64_t value() const { return GetField<int64_t>(VT_VALUE, 0); }
+  bool KeyCompareLessThan(const EnumVal *o) const { return value() < o->value(); }
+  int KeyCompareWithValue(int64_t val) const { return value() < val ? -1 : value() > val; }
+  const Object *object() const { return GetPointer<const Object *>(VT_OBJECT); }
+  bool Verify(flatbuffers::Verifier &verifier) const {
+    return VerifyTableStart(verifier) &&
+           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
            verifier.Verify(name()) &&
-           VerifyField<int64_t>(verifier, 6 /* value */) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 8 /* object */) &&
+           VerifyField<int64_t>(verifier, VT_VALUE) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_OBJECT) &&
            verifier.VerifyTable(object()) &&
            verifier.EndTable();
   }
@@ -100,14 +160,14 @@ struct EnumVal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
 struct EnumValBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
-  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(4, name); }
-  void add_value(int64_t value) { fbb_.AddElement<int64_t>(6, value, 0); }
-  void add_object(flatbuffers::Offset<Object> object) { fbb_.AddOffset(8, object); }
+  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(EnumVal::VT_NAME, name); }
+  void add_value(int64_t value) { fbb_.AddElement<int64_t>(EnumVal::VT_VALUE, value, 0); }
+  void add_object(flatbuffers::Offset<Object> object) { fbb_.AddOffset(EnumVal::VT_OBJECT, object); }
   EnumValBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   EnumValBuilder &operator=(const EnumValBuilder &);
   flatbuffers::Offset<EnumVal> Finish() {
     auto o = flatbuffers::Offset<EnumVal>(fbb_.EndTable(start_, 3));
-    fbb_.Required(o, 4);  // name
+    fbb_.Required(o, EnumVal::VT_NAME);  // name
     return o;
   }
 };
@@ -124,22 +184,33 @@ inline flatbuffers::Offset<EnumVal> CreateEnumVal(flatbuffers::FlatBufferBuilder
 }
 
 struct Enum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(4); }
+  enum {
+    VT_NAME = 4,
+    VT_VALUES = 6,
+    VT_IS_UNION = 8,
+    VT_UNDERLYING_TYPE = 10,
+    VT_ATTRIBUTES = 12
+  };
+  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
   bool KeyCompareLessThan(const Enum *o) const { return *name() < *o->name(); }
   int KeyCompareWithValue(const char *val) const { return strcmp(name()->c_str(), val); }
-  const flatbuffers::Vector<flatbuffers::Offset<EnumVal>> *values() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<EnumVal>> *>(6); }
-  uint8_t is_union() const { return GetField<uint8_t>(8, 0); }
-  const Type *underlying_type() const { return GetPointer<const Type *>(10); }
+  const flatbuffers::Vector<flatbuffers::Offset<EnumVal>> *values() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<EnumVal>> *>(VT_VALUES); }
+  bool is_union() const { return GetField<uint8_t>(VT_IS_UNION, 0) != 0; }
+  const Type *underlying_type() const { return GetPointer<const Type *>(VT_UNDERLYING_TYPE); }
+  const flatbuffers::Vector<flatbuffers::Offset<KeyValue>> *attributes() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<KeyValue>> *>(VT_ATTRIBUTES); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, 4 /* name */) &&
+           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
            verifier.Verify(name()) &&
-           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, 6 /* values */) &&
+           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_VALUES) &&
            verifier.Verify(values()) &&
            verifier.VerifyVectorOfTables(values()) &&
-           VerifyField<uint8_t>(verifier, 8 /* is_union */) &&
-           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, 10 /* underlying_type */) &&
+           VerifyField<uint8_t>(verifier, VT_IS_UNION) &&
+           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_UNDERLYING_TYPE) &&
            verifier.VerifyTable(underlying_type()) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_ATTRIBUTES) &&
+           verifier.Verify(attributes()) &&
+           verifier.VerifyVectorOfTables(attributes()) &&
            verifier.EndTable();
   }
 };
@@ -147,17 +218,18 @@ struct Enum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
 struct EnumBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
-  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(4, name); }
-  void add_values(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<EnumVal>>> values) { fbb_.AddOffset(6, values); }
-  void add_is_union(uint8_t is_union) { fbb_.AddElement<uint8_t>(8, is_union, 0); }
-  void add_underlying_type(flatbuffers::Offset<Type> underlying_type) { fbb_.AddOffset(10, underlying_type); }
+  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(Enum::VT_NAME, name); }
+  void add_values(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<EnumVal>>> values) { fbb_.AddOffset(Enum::VT_VALUES, values); }
+  void add_is_union(bool is_union) { fbb_.AddElement<uint8_t>(Enum::VT_IS_UNION, static_cast<uint8_t>(is_union), 0); }
+  void add_underlying_type(flatbuffers::Offset<Type> underlying_type) { fbb_.AddOffset(Enum::VT_UNDERLYING_TYPE, underlying_type); }
+  void add_attributes(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<KeyValue>>> attributes) { fbb_.AddOffset(Enum::VT_ATTRIBUTES, attributes); }
   EnumBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   EnumBuilder &operator=(const EnumBuilder &);
   flatbuffers::Offset<Enum> Finish() {
-    auto o = flatbuffers::Offset<Enum>(fbb_.EndTable(start_, 4));
-    fbb_.Required(o, 4);  // name
-    fbb_.Required(o, 6);  // values
-    fbb_.Required(o, 10);  // underlying_type
+    auto o = flatbuffers::Offset<Enum>(fbb_.EndTable(start_, 5));
+    fbb_.Required(o, Enum::VT_NAME);  // name
+    fbb_.Required(o, Enum::VT_VALUES);  // values
+    fbb_.Required(o, Enum::VT_UNDERLYING_TYPE);  // underlying_type
     return o;
   }
 };
@@ -165,9 +237,11 @@ struct EnumBuilder {
 inline flatbuffers::Offset<Enum> CreateEnum(flatbuffers::FlatBufferBuilder &_fbb,
    flatbuffers::Offset<flatbuffers::String> name = 0,
    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<EnumVal>>> values = 0,
-   uint8_t is_union = 0,
-   flatbuffers::Offset<Type> underlying_type = 0) {
+   bool is_union = false,
+   flatbuffers::Offset<Type> underlying_type = 0,
+   flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<KeyValue>>> attributes = 0) {
   EnumBuilder builder_(_fbb);
+  builder_.add_attributes(attributes);
   builder_.add_underlying_type(underlying_type);
   builder_.add_values(values);
   builder_.add_name(name);
@@ -176,30 +250,46 @@ inline flatbuffers::Offset<Enum> CreateEnum(flatbuffers::FlatBufferBuilder &_fbb
 }
 
 struct Field FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(4); }
+  enum {
+    VT_NAME = 4,
+    VT_TYPE = 6,
+    VT_ID = 8,
+    VT_OFFSET = 10,
+    VT_DEFAULT_INTEGER = 12,
+    VT_DEFAULT_REAL = 14,
+    VT_DEPRECATED = 16,
+    VT_REQUIRED = 18,
+    VT_KEY = 20,
+    VT_ATTRIBUTES = 22
+  };
+  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
   bool KeyCompareLessThan(const Field *o) const { return *name() < *o->name(); }
   int KeyCompareWithValue(const char *val) const { return strcmp(name()->c_str(), val); }
-  const Type *type() const { return GetPointer<const Type *>(6); }
-  uint16_t id() const { return GetField<uint16_t>(8, 0); }
-  uint16_t offset() const { return GetField<uint16_t>(10, 0); }
-  int64_t default_integer() const { return GetField<int64_t>(12, 0); }
-  double default_real() const { return GetField<double>(14, 0.0); }
-  uint8_t deprecated() const { return GetField<uint8_t>(16, 0); }
-  uint8_t required() const { return GetField<uint8_t>(18, 0); }
-  uint8_t key() const { return GetField<uint8_t>(20, 0); }
+  const Type *type() const { return GetPointer<const Type *>(VT_TYPE); }
+  uint16_t id() const { return GetField<uint16_t>(VT_ID, 0); }
+  uint16_t offset() const { return GetField<uint16_t>(VT_OFFSET, 0); }
+  int64_t default_integer() const { return GetField<int64_t>(VT_DEFAULT_INTEGER, 0); }
+  double default_real() const { return GetField<double>(VT_DEFAULT_REAL, 0.0); }
+  bool deprecated() const { return GetField<uint8_t>(VT_DEPRECATED, 0) != 0; }
+  bool required() const { return GetField<uint8_t>(VT_REQUIRED, 0) != 0; }
+  bool key() const { return GetField<uint8_t>(VT_KEY, 0) != 0; }
+  const flatbuffers::Vector<flatbuffers::Offset<KeyValue>> *attributes() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<KeyValue>> *>(VT_ATTRIBUTES); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, 4 /* name */) &&
+           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
            verifier.Verify(name()) &&
-           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, 6 /* type */) &&
+           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_TYPE) &&
            verifier.VerifyTable(type()) &&
-           VerifyField<uint16_t>(verifier, 8 /* id */) &&
-           VerifyField<uint16_t>(verifier, 10 /* offset */) &&
-           VerifyField<int64_t>(verifier, 12 /* default_integer */) &&
-           VerifyField<double>(verifier, 14 /* default_real */) &&
-           VerifyField<uint8_t>(verifier, 16 /* deprecated */) &&
-           VerifyField<uint8_t>(verifier, 18 /* required */) &&
-           VerifyField<uint8_t>(verifier, 20 /* key */) &&
+           VerifyField<uint16_t>(verifier, VT_ID) &&
+           VerifyField<uint16_t>(verifier, VT_OFFSET) &&
+           VerifyField<int64_t>(verifier, VT_DEFAULT_INTEGER) &&
+           VerifyField<double>(verifier, VT_DEFAULT_REAL) &&
+           VerifyField<uint8_t>(verifier, VT_DEPRECATED) &&
+           VerifyField<uint8_t>(verifier, VT_REQUIRED) &&
+           VerifyField<uint8_t>(verifier, VT_KEY) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_ATTRIBUTES) &&
+           verifier.Verify(attributes()) &&
+           verifier.VerifyVectorOfTables(attributes()) &&
            verifier.EndTable();
   }
 };
@@ -207,21 +297,22 @@ struct Field FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
 struct FieldBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
-  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(4, name); }
-  void add_type(flatbuffers::Offset<Type> type) { fbb_.AddOffset(6, type); }
-  void add_id(uint16_t id) { fbb_.AddElement<uint16_t>(8, id, 0); }
-  void add_offset(uint16_t offset) { fbb_.AddElement<uint16_t>(10, offset, 0); }
-  void add_default_integer(int64_t default_integer) { fbb_.AddElement<int64_t>(12, default_integer, 0); }
-  void add_default_real(double default_real) { fbb_.AddElement<double>(14, default_real, 0.0); }
-  void add_deprecated(uint8_t deprecated) { fbb_.AddElement<uint8_t>(16, deprecated, 0); }
-  void add_required(uint8_t required) { fbb_.AddElement<uint8_t>(18, required, 0); }
-  void add_key(uint8_t key) { fbb_.AddElement<uint8_t>(20, key, 0); }
+  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(Field::VT_NAME, name); }
+  void add_type(flatbuffers::Offset<Type> type) { fbb_.AddOffset(Field::VT_TYPE, type); }
+  void add_id(uint16_t id) { fbb_.AddElement<uint16_t>(Field::VT_ID, id, 0); }
+  void add_offset(uint16_t offset) { fbb_.AddElement<uint16_t>(Field::VT_OFFSET, offset, 0); }
+  void add_default_integer(int64_t default_integer) { fbb_.AddElement<int64_t>(Field::VT_DEFAULT_INTEGER, default_integer, 0); }
+  void add_default_real(double default_real) { fbb_.AddElement<double>(Field::VT_DEFAULT_REAL, default_real, 0.0); }
+  void add_deprecated(bool deprecated) { fbb_.AddElement<uint8_t>(Field::VT_DEPRECATED, static_cast<uint8_t>(deprecated), 0); }
+  void add_required(bool required) { fbb_.AddElement<uint8_t>(Field::VT_REQUIRED, static_cast<uint8_t>(required), 0); }
+  void add_key(bool key) { fbb_.AddElement<uint8_t>(Field::VT_KEY, static_cast<uint8_t>(key), 0); }
+  void add_attributes(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<KeyValue>>> attributes) { fbb_.AddOffset(Field::VT_ATTRIBUTES, attributes); }
   FieldBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   FieldBuilder &operator=(const FieldBuilder &);
   flatbuffers::Offset<Field> Finish() {
-    auto o = flatbuffers::Offset<Field>(fbb_.EndTable(start_, 9));
-    fbb_.Required(o, 4);  // name
-    fbb_.Required(o, 6);  // type
+    auto o = flatbuffers::Offset<Field>(fbb_.EndTable(start_, 10));
+    fbb_.Required(o, Field::VT_NAME);  // name
+    fbb_.Required(o, Field::VT_TYPE);  // type
     return o;
   }
 };
@@ -233,12 +324,14 @@ inline flatbuffers::Offset<Field> CreateField(flatbuffers::FlatBufferBuilder &_f
    uint16_t offset = 0,
    int64_t default_integer = 0,
    double default_real = 0.0,
-   uint8_t deprecated = 0,
-   uint8_t required = 0,
-   uint8_t key = 0) {
+   bool deprecated = false,
+   bool required = false,
+   bool key = false,
+   flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<KeyValue>>> attributes = 0) {
   FieldBuilder builder_(_fbb);
   builder_.add_default_real(default_real);
   builder_.add_default_integer(default_integer);
+  builder_.add_attributes(attributes);
   builder_.add_type(type);
   builder_.add_name(name);
   builder_.add_offset(offset);
@@ -250,23 +343,35 @@ inline flatbuffers::Offset<Field> CreateField(flatbuffers::FlatBufferBuilder &_f
 }
 
 struct Object FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(4); }
+  enum {
+    VT_NAME = 4,
+    VT_FIELDS = 6,
+    VT_IS_STRUCT = 8,
+    VT_MINALIGN = 10,
+    VT_BYTESIZE = 12,
+    VT_ATTRIBUTES = 14
+  };
+  const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
   bool KeyCompareLessThan(const Object *o) const { return *name() < *o->name(); }
   int KeyCompareWithValue(const char *val) const { return strcmp(name()->c_str(), val); }
-  const flatbuffers::Vector<flatbuffers::Offset<Field>> *fields() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Field>> *>(6); }
-  uint8_t is_struct() const { return GetField<uint8_t>(8, 0); }
-  int32_t minalign() const { return GetField<int32_t>(10, 0); }
-  int32_t bytesize() const { return GetField<int32_t>(12, 0); }
+  const flatbuffers::Vector<flatbuffers::Offset<Field>> *fields() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Field>> *>(VT_FIELDS); }
+  bool is_struct() const { return GetField<uint8_t>(VT_IS_STRUCT, 0) != 0; }
+  int32_t minalign() const { return GetField<int32_t>(VT_MINALIGN, 0); }
+  int32_t bytesize() const { return GetField<int32_t>(VT_BYTESIZE, 0); }
+  const flatbuffers::Vector<flatbuffers::Offset<KeyValue>> *attributes() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<KeyValue>> *>(VT_ATTRIBUTES); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, 4 /* name */) &&
+           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
            verifier.Verify(name()) &&
-           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, 6 /* fields */) &&
+           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_FIELDS) &&
            verifier.Verify(fields()) &&
            verifier.VerifyVectorOfTables(fields()) &&
-           VerifyField<uint8_t>(verifier, 8 /* is_struct */) &&
-           VerifyField<int32_t>(verifier, 10 /* minalign */) &&
-           VerifyField<int32_t>(verifier, 12 /* bytesize */) &&
+           VerifyField<uint8_t>(verifier, VT_IS_STRUCT) &&
+           VerifyField<int32_t>(verifier, VT_MINALIGN) &&
+           VerifyField<int32_t>(verifier, VT_BYTESIZE) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_ATTRIBUTES) &&
+           verifier.Verify(attributes()) &&
+           verifier.VerifyVectorOfTables(attributes()) &&
            verifier.EndTable();
   }
 };
@@ -274,17 +379,18 @@ struct Object FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
 struct ObjectBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
-  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(4, name); }
-  void add_fields(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Field>>> fields) { fbb_.AddOffset(6, fields); }
-  void add_is_struct(uint8_t is_struct) { fbb_.AddElement<uint8_t>(8, is_struct, 0); }
-  void add_minalign(int32_t minalign) { fbb_.AddElement<int32_t>(10, minalign, 0); }
-  void add_bytesize(int32_t bytesize) { fbb_.AddElement<int32_t>(12, bytesize, 0); }
+  void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(Object::VT_NAME, name); }
+  void add_fields(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Field>>> fields) { fbb_.AddOffset(Object::VT_FIELDS, fields); }
+  void add_is_struct(bool is_struct) { fbb_.AddElement<uint8_t>(Object::VT_IS_STRUCT, static_cast<uint8_t>(is_struct), 0); }
+  void add_minalign(int32_t minalign) { fbb_.AddElement<int32_t>(Object::VT_MINALIGN, minalign, 0); }
+  void add_bytesize(int32_t bytesize) { fbb_.AddElement<int32_t>(Object::VT_BYTESIZE, bytesize, 0); }
+  void add_attributes(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<KeyValue>>> attributes) { fbb_.AddOffset(Object::VT_ATTRIBUTES, attributes); }
   ObjectBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   ObjectBuilder &operator=(const ObjectBuilder &);
   flatbuffers::Offset<Object> Finish() {
-    auto o = flatbuffers::Offset<Object>(fbb_.EndTable(start_, 5));
-    fbb_.Required(o, 4);  // name
-    fbb_.Required(o, 6);  // fields
+    auto o = flatbuffers::Offset<Object>(fbb_.EndTable(start_, 6));
+    fbb_.Required(o, Object::VT_NAME);  // name
+    fbb_.Required(o, Object::VT_FIELDS);  // fields
     return o;
   }
 };
@@ -292,10 +398,12 @@ struct ObjectBuilder {
 inline flatbuffers::Offset<Object> CreateObject(flatbuffers::FlatBufferBuilder &_fbb,
    flatbuffers::Offset<flatbuffers::String> name = 0,
    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Field>>> fields = 0,
-   uint8_t is_struct = 0,
+   bool is_struct = false,
    int32_t minalign = 0,
-   int32_t bytesize = 0) {
+   int32_t bytesize = 0,
+   flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<KeyValue>>> attributes = 0) {
   ObjectBuilder builder_(_fbb);
+  builder_.add_attributes(attributes);
   builder_.add_bytesize(bytesize);
   builder_.add_minalign(minalign);
   builder_.add_fields(fields);
@@ -305,24 +413,31 @@ inline flatbuffers::Offset<Object> CreateObject(flatbuffers::FlatBufferBuilder &
 }
 
 struct Schema FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  const flatbuffers::Vector<flatbuffers::Offset<Object>> *objects() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Object>> *>(4); }
-  const flatbuffers::Vector<flatbuffers::Offset<Enum>> *enums() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Enum>> *>(6); }
-  const flatbuffers::String *file_ident() const { return GetPointer<const flatbuffers::String *>(8); }
-  const flatbuffers::String *file_ext() const { return GetPointer<const flatbuffers::String *>(10); }
-  const Object *root_table() const { return GetPointer<const Object *>(12); }
+  enum {
+    VT_OBJECTS = 4,
+    VT_ENUMS = 6,
+    VT_FILE_IDENT = 8,
+    VT_FILE_EXT = 10,
+    VT_ROOT_TABLE = 12
+  };
+  const flatbuffers::Vector<flatbuffers::Offset<Object>> *objects() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Object>> *>(VT_OBJECTS); }
+  const flatbuffers::Vector<flatbuffers::Offset<Enum>> *enums() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Enum>> *>(VT_ENUMS); }
+  const flatbuffers::String *file_ident() const { return GetPointer<const flatbuffers::String *>(VT_FILE_IDENT); }
+  const flatbuffers::String *file_ext() const { return GetPointer<const flatbuffers::String *>(VT_FILE_EXT); }
+  const Object *root_table() const { return GetPointer<const Object *>(VT_ROOT_TABLE); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, 4 /* objects */) &&
+           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_OBJECTS) &&
            verifier.Verify(objects()) &&
            verifier.VerifyVectorOfTables(objects()) &&
-           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, 6 /* enums */) &&
+           VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_ENUMS) &&
            verifier.Verify(enums()) &&
            verifier.VerifyVectorOfTables(enums()) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 8 /* file_ident */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_FILE_IDENT) &&
            verifier.Verify(file_ident()) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 10 /* file_ext */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_FILE_EXT) &&
            verifier.Verify(file_ext()) &&
-           VerifyField<flatbuffers::uoffset_t>(verifier, 12 /* root_table */) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_ROOT_TABLE) &&
            verifier.VerifyTable(root_table()) &&
            verifier.EndTable();
   }
@@ -331,17 +446,17 @@ struct Schema FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
 struct SchemaBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
-  void add_objects(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Object>>> objects) { fbb_.AddOffset(4, objects); }
-  void add_enums(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Enum>>> enums) { fbb_.AddOffset(6, enums); }
-  void add_file_ident(flatbuffers::Offset<flatbuffers::String> file_ident) { fbb_.AddOffset(8, file_ident); }
-  void add_file_ext(flatbuffers::Offset<flatbuffers::String> file_ext) { fbb_.AddOffset(10, file_ext); }
-  void add_root_table(flatbuffers::Offset<Object> root_table) { fbb_.AddOffset(12, root_table); }
+  void add_objects(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Object>>> objects) { fbb_.AddOffset(Schema::VT_OBJECTS, objects); }
+  void add_enums(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Enum>>> enums) { fbb_.AddOffset(Schema::VT_ENUMS, enums); }
+  void add_file_ident(flatbuffers::Offset<flatbuffers::String> file_ident) { fbb_.AddOffset(Schema::VT_FILE_IDENT, file_ident); }
+  void add_file_ext(flatbuffers::Offset<flatbuffers::String> file_ext) { fbb_.AddOffset(Schema::VT_FILE_EXT, file_ext); }
+  void add_root_table(flatbuffers::Offset<Object> root_table) { fbb_.AddOffset(Schema::VT_ROOT_TABLE, root_table); }
   SchemaBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   SchemaBuilder &operator=(const SchemaBuilder &);
   flatbuffers::Offset<Schema> Finish() {
     auto o = flatbuffers::Offset<Schema>(fbb_.EndTable(start_, 5));
-    fbb_.Required(o, 4);  // objects
-    fbb_.Required(o, 6);  // enums
+    fbb_.Required(o, Schema::VT_OBJECTS);  // objects
+    fbb_.Required(o, Schema::VT_ENUMS);  // enums
     return o;
   }
 };
diff --git a/reflection/reflection.fbs b/reflection/reflection.fbs
index 77305f69f..57f234c6a 100644
--- a/reflection/reflection.fbs
+++ b/reflection/reflection.fbs
@@ -34,6 +34,11 @@ table Type {
                      // from an enum, index into "enums" below.
 }
 
+table KeyValue {
+    key:string (required, key);
+    value:string;
+}
+
 table EnumVal {
     name:string (required);
     value:long (key);
@@ -45,6 +50,7 @@ table Enum {
     values:[EnumVal] (required);  // In order of their values.
     is_union:bool = false;
     underlying_type:Type (required);
+    attributes:[KeyValue];
 }
 
 table Field {
@@ -57,6 +63,7 @@ table Field {
     deprecated:bool = false;
     required:bool = false;
     key:bool = false;
+    attributes:[KeyValue];
 }
 
 table Object {  // Used for both tables and structs.
@@ -65,6 +72,7 @@ table Object {  // Used for both tables and structs.
     is_struct:bool = false;
     minalign:int;
     bytesize:int;  // For structs.
+    attributes:[KeyValue];
 }
 
 table Schema {
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 1df44add1..e0eaa5d6a 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -1784,7 +1784,7 @@ CheckedError Parser::DoParse(const char *source, const char **include_paths,
       auto name = attribute_;
       EXPECT(kTokenStringConstant);
       EXPECT(';');
-      known_attributes_.insert(name);
+      known_attributes_[name] = false;
     } else if (token_ == kTokenService) {
       ECHECK(ParseService());
     } else {
@@ -1853,13 +1853,13 @@ void Parser::Serialize() {
   AssignIndices(enums_.vec);
   std::vector<Offset<reflection::Object>> object_offsets;
   for (auto it = structs_.vec.begin(); it != structs_.vec.end(); ++it) {
-    auto offset = (*it)->Serialize(&builder_);
+    auto offset = (*it)->Serialize(&builder_, *this);
     object_offsets.push_back(offset);
     (*it)->serialized_location = offset.o;
   }
   std::vector<Offset<reflection::Enum>> enum_offsets;
   for (auto it = enums_.vec.begin(); it != enums_.vec.end(); ++it) {
-    auto offset = (*it)->Serialize(&builder_);
+    auto offset = (*it)->Serialize(&builder_, *this);
     enum_offsets.push_back(offset);
     (*it)->serialized_location = offset.o;
   }
@@ -1875,13 +1875,13 @@ void Parser::Serialize() {
   builder_.Finish(schema_offset, reflection::SchemaIdentifier());
 }
 
-Offset<reflection::Object> StructDef::Serialize(FlatBufferBuilder *builder)
-                                                                         const {
+Offset<reflection::Object> StructDef::Serialize(FlatBufferBuilder *builder,
+                                                const Parser &parser) const {
   std::vector<Offset<reflection::Field>> field_offsets;
   for (auto it = fields.vec.begin(); it != fields.vec.end(); ++it) {
     field_offsets.push_back(
       (*it)->Serialize(builder,
-                       static_cast<uint16_t>(it - fields.vec.begin())));
+                       static_cast<uint16_t>(it - fields.vec.begin()), parser));
   }
   return reflection::CreateObject(*builder,
                                   builder->CreateString(name),
@@ -1889,11 +1889,13 @@ Offset<reflection::Object> StructDef::Serialize(FlatBufferBuilder *builder)
                                     &field_offsets),
                                   fixed,
                                   static_cast<int>(minalign),
-                                  static_cast<int>(bytesize));
+                                  static_cast<int>(bytesize),
+                                  SerializeAttributes(builder, parser));
 }
 
 Offset<reflection::Field> FieldDef::Serialize(FlatBufferBuilder *builder,
-                                              uint16_t id) const {
+                                              uint16_t id,
+                                              const Parser &parser) const {
   return reflection::CreateField(*builder,
                                  builder->CreateString(name),
                                  value.type.Serialize(builder),
@@ -1907,12 +1909,14 @@ Offset<reflection::Field> FieldDef::Serialize(FlatBufferBuilder *builder,
                                    : 0.0,
                                  deprecated,
                                  required,
-                                 key);
+                                 key,
+                                 SerializeAttributes(builder, parser));
   // TODO: value.constant is almost always "0", we could save quite a bit of
   // space by sharing it. Same for common values of value.type.
 }
 
-Offset<reflection::Enum> EnumDef::Serialize(FlatBufferBuilder *builder) const {
+Offset<reflection::Enum> EnumDef::Serialize(FlatBufferBuilder *builder,
+                                            const Parser &parser) const {
   std::vector<Offset<reflection::EnumVal>> enumval_offsets;
   for (auto it = vals.vec.begin(); it != vals.vec.end(); ++it) {
     enumval_offsets.push_back((*it)->Serialize(builder));
@@ -1921,7 +1925,8 @@ Offset<reflection::Enum> EnumDef::Serialize(FlatBufferBuilder *builder) const {
                                 builder->CreateString(name),
                                 builder->CreateVector(enumval_offsets),
                                 is_union,
-                                underlying_type.Serialize(builder));
+                                underlying_type.Serialize(builder),
+                                SerializeAttributes(builder, parser));
 }
 
 Offset<reflection::EnumVal> EnumVal::Serialize(FlatBufferBuilder *builder) const
@@ -1942,4 +1947,26 @@ Offset<reflection::Type> Type::Serialize(FlatBufferBuilder *builder) const {
                                              (enum_def ? enum_def->index : -1));
 }
 
+flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<
+  reflection::KeyValue>>>
+    Definition::SerializeAttributes(FlatBufferBuilder *builder,
+                                    const Parser &parser) const {
+  std::vector<flatbuffers::Offset<reflection::KeyValue>> attrs;
+  for (auto kv : attributes.dict) {
+    auto it = parser.known_attributes_.find(kv.first);
+    assert(it != parser.known_attributes_.end());
+    if (!it->second) {  // Custom attribute.
+      attrs.push_back(
+          reflection::CreateKeyValue(*builder, builder->CreateString(kv.first),
+                                     builder->CreateString(
+                                         kv.second->constant)));
+    }
+  }
+  if (attrs.size()) {
+    return builder->CreateVectorOfSortedTables(&attrs);
+  } else {
+    return 0;
+  }
+}
+
 }  // namespace flatbuffers
diff --git a/tests/monster_test.bfbs b/tests/monster_test.bfbs
index e5f51face696a1ee9b3aa64b70bba83df1c4645a..db1232821257da777a2adf0e6a8bf34226613243 100644
GIT binary patch
literal 2840
zcmaJ@O=w(I6h8Bl%ugnhX|3rfB0~wKh=@&tWRXRUHvWLAn3xukwlA4C&cK`ZhBt3Q
zr?_xYx)RB%6cNcnx{x5ng-Zz{;wp66MHfLz7p{s()mk0D@1A#Oo*2Av=G^zrch3Fp
zx#!$BRS{WST3it+OI5Oxmy%TE2%ZGLBF{tSA*Ug=w8%Jg6?!Kpk}ZmO1(93OujWNE
zu)PSm2iZ!&4*k~IWyDrnJMb|pBQ96TVI4l1kt#v)`56e~yzKXlzKZ!J2;YDD_h0~p
z$Q(t(w}e<&-f-Oq2T&W1qnNF_-DsuN?s)F1v+lX)T2b?i-)qBCgijVc)SqjgM&vj+
z*nxZCcOy5HM_8A8p)8+WJ_98e27>`PGe<SZ803|}3qok}Z$cIzjQi$qhIfXse}W(1
zf$DHD?xNRoEhpNzC*qR(;To@nuIs~EF=wSX^02(Q_B(DJzvUr@cIKJ73ONCpfGmYU
z`wf4?>(yQ3&-aX2HoMon;6*_>6v3HHbxqF5G4@|`Jk-JOqnwaWGKWv$c?aZfAXp8~
zcObX%T*0P3#(W-n9?x0Gc?fInM_{)gcNq-&3+R1J7oaag*P*weA47=G19J%+sxoKt
z%bH;hBh-KshE6|dtOtSD#Vh&bG0&u&-U9xp%ntE~Vtmu-HhVA4U2OQ9Cmp<70}iUV
z3q6f0=NU1665mbWuPMIp0QyOJ;Xr)v)a)?+H;T{K{um67pz98dpTOT&eC}=FpOEK<
zc)Q;uf6$a^;Gl{hK_5m1*!W4j<xl*Q;tRK+56STZ@s>aFn~KlxLsw+xKzujmPy9{A
z=PHi|gDE*?@a!e>;(76)h}%<KdLFp4)P^`*I|k>rJ5e9=uV9CoLP<y+^GSKuU~710
zT*mYvZoT0-(R#1ZKx1QEH+M=odjmctoG904PS|U%@3tAc_@~CkRCa-zkf#kUdH!*I
zMZ9EKU|*uoQD0N^`4v9At!&P1&BQ+4C~Wy30C!A%CTFl-L8c9!{Yoz6KZlMh;RepZ
z!ro(il)S70pT{mOclIXnMEs!Kxh44!^PC(uIOfFW@M6^OxOo0Wu}q<CBQN8~1aaIa
zW7|PK8}VIt-1L!{yX`Lg$8dYteKLN_-*o*b2>W21H{A8!0QYPaIpNpF?uPdTPm6oT
zNbz>Icb4VQ2wSdS_joMwv+_-oFme2<@C(NEDdbMw30pzfGG$`!xs!NTg*CZ0zieDz
z*G{D}hOgEF^XWTnrbsU6ekaLY*JGAOgZ^n)_>Sw>V-wG**%A3%{l}`N*2wq2{wch(
zdA}a}Q;|p8@g2_Z$8kJUGu*Z209U7Ug06h~m)0!L>UEqY^TU|T72~W#P6TDXRkV@k
z3CK45$e;1J2R-YaPw;yhbNqW~a!jtdi4VXPwHK=9Oc|B`7DhvJJL1Zmw6O5k>Nokm
z=|xF#U1F(g5b|AfH%>vBh)w7P2<^L&&mfl}^dF0R({g7Y&~Z;=n|`^9dDfiYXph9r
z0{2jHrk-~&&zQaZ8^`)-D6VuH+UAQpW`3_guBm<E0dxvGu(_h0#d|Zh-+@lrxR38*
zTLo*6Je332n1L|P|NXzAojqggl$m2r?67BHbIh~g81**q8g_*3PVMnZT=)F<#(Iil
z4$q8ncwUs%_zvQ`^AP33e%HFktKlG@l<6F;WAa~z?3wzO3~vg}#n8n}=*Rro+ICFe
e>P@0|q>Pd2=pW~ZGjnPESgG&&y{`G|g!w-^gWWO!

delta 1254
zcmZuxOGs2<6h8OPef@W4u7=JvF`Yu2sgxc@(fb8OMNRaeMT;;~q0p(U2HHgK+!PFl
zqIE=6P>X00Eh1aA5Q++lh=>Y;5DHo(S?2Ve{~sZu3+Mj#yub7K@8$SjCN+zQHf`Co
z7YCJtw%sY4$iugTbE{8uT@lrSc7#N4!6%^W0KEqdTd>2qb5}w8i*Ddpky2Do0p32<
zQmQ=EZjX(ZZ?{;(<tOW{#hkVpGGV1s5l^AQuEJ&<)Ws{UcKiMh?z0A0q~Pix2q8>L
zzlmnz6u3#ymce5K+lq(#Pxtf^P-yw~AC(HvwmYnG-f3s&-vyk@sG<!?hC#2vKg78Y
z^cl1Pd<xXX7wy&7HGXdARq=PFLKNAr*h=KXsR`jI^d`77kqa08)T~-Q!QF|RI%wFS
zkIRX?x?ni}5|4m;V7Txxe*^cm>Nw7GoP5~wONR+^KY5RnQw78N`+3O8s*>UCvwXwJ
zrlU!1S|b(S<d;snDxq-z=)7a)HbqCPdZ@|!#hq@h@rp615z#6H3(+=dV;i4v8|y-R
zdzcG~5(A3TgM86lH2(@L13fiN8*;RVPW7HVB{mCnPqdgu`HP!PA21R@MdRG)<)aHm
zk`U2?NiKLTy&i(NU?oxH#0V}k4XTL+0#U5rWI50Y$a;{ReS=4Oi#`2kM7>;UwEy*&
zCG{!h8Gg3;sY#xGh0<;KOBC6a9&zVGe*H{0#)8O3I&hQv%oB6j&#QG)y2);lNBoBL
zQ^VB=^mY8nZ&h9Rng_bXGlHhIcZ}Y<kE9l&30zrFEE1It^;1c}s92XOa=A;>Ps{^B
zgYxu*C|%(5LB8=glxskO>KW)N=p3lPPmt}6v8}-xQwf=!>NKT1K`1loL`&taN$bp1
zNzdULH>)P~$V5nu@<!FL<fGw|V~Ay;8`Djfxt)P`pyNz$2PNO}kgCg!O3ld#7^kl!
zM#{I;QWPEY2bHm6o=~lGqyM0QrN(Uj2KDgU80M4vkWa3%_@4+f%VZHOlHr+d3Z8Dz
i3&ER+_2fkN_Y?C-Sl8_7K2#CAk=|jGOE7*9TmJx|t^rU0

diff --git a/tests/namespace_test/namespace_test2_generated.h b/tests/namespace_test/namespace_test2_generated.h
index 1831454c2..d0cc5fab2 100644
--- a/tests/namespace_test/namespace_test2_generated.h
+++ b/tests/namespace_test/namespace_test2_generated.h
@@ -7,16 +7,6 @@
 
 #include "namespace_test1_generated.h"
 
-namespace NamespaceA {
-namespace NamespaceB {
-
-struct TableInNestedNS;
-
-struct StructInNestedNS;
-
-}  // namespace NamespaceB
-}  // namespace NamespaceA
-
 namespace NamespaceA {
 
 struct TableInFirstNS;
diff --git a/tests/test.cpp b/tests/test.cpp
index 42c7647ac..4c3aa543f 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -322,6 +322,10 @@ void ReflectionTest(uint8_t *flatbuf, size_t length) {
   TEST_EQ_STR(hp_field.name()->c_str(), "hp");
   TEST_EQ(hp_field.id(), 2);
   TEST_EQ(hp_field.type()->base_type(), reflection::Short);
+  auto friendly_field_ptr = fields->LookupByKey("friendly");
+  TEST_NOTNULL(friendly_field_ptr);
+  TEST_NOTNULL(friendly_field_ptr->attributes());
+  TEST_NOTNULL(friendly_field_ptr->attributes()->LookupByKey("priority"));
 
   // Now use it to dynamically access a buffer.
   auto &root = *flatbuffers::GetAnyRoot(flatbuf);

From 4a04bac250c66f946161063bb3932087bc084822 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 13 Apr 2016 12:02:22 -0700
Subject: [PATCH 118/185] Fixed struct -> class pre-declaration error.

Change-Id: I3730a6823d603982c4250d514e827e3f93d1f81e
Tested: on Linux.
---
 include/flatbuffers/idl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index e671c01e7..dc385efa3 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -112,7 +112,7 @@ inline size_t SizeOf(BaseType t) {
 
 struct StructDef;
 struct EnumDef;
-struct Parser;
+class Parser;
 
 // Represents any type in the IDL, which is a combination of the BaseType
 // and additional information for vectors/structs_.

From 8a64afabfd3c3f7f4602efbc6dac3f3cd067dd1d Mon Sep 17 00:00:00 2001
From: Lakedaemon <olivier.binda@wanadoo.fr>
Date: Wed, 13 Apr 2016 23:21:18 +0200
Subject: [PATCH 119/185] Transition 1 (with nice diffs) Go, Cpp and General
 code generators with class

---
 CMakeLists.txt                        |  1 +
 include/flatbuffers/code_generators.h | 64 +++++++++++++++++++++++++++
 src/idl_gen_cpp.cpp                   | 36 +++++++++------
 src/idl_gen_general.cpp               | 28 +++++++++---
 src/idl_gen_go.cpp                    | 21 ++++++---
 5 files changed, 126 insertions(+), 24 deletions(-)
 create mode 100644 include/flatbuffers/code_generators.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8449ffb61..47a66e6cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,7 @@ if(NOT FLATBUFFERS_BUILD_FLATC AND FLATBUFFERS_BUILD_TESTS)
 endif()
 
 set(FlatBuffers_Library_SRCS
+  include/flatbuffers/code_generators.h
   include/flatbuffers/flatbuffers.h
   include/flatbuffers/hash.h
   include/flatbuffers/idl.h
diff --git a/include/flatbuffers/code_generators.h b/include/flatbuffers/code_generators.h
new file mode 100644
index 000000000..666e1aa8c
--- /dev/null
+++ b/include/flatbuffers/code_generators.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef FLATBUFFERS_CODE_GENERATORS_H_
+#define FLATBUFFERS_CODE_GENERATORS_H_
+
+/** This file defines some classes, that code generators should extend to gain
+   common functionalities :
+
+   BaseGenerator is the base class for all (binary, textual, strongly typed,
+   dynamically typed, whatever) generators.
+   It is really abstract, general and flexible and doesn't do much appart from
+   holding the parser, a path and a filename being processed.
+   Still, it brings a common structure (normalization) among generators
+
+   The many advantages of object based generators will come later from   :
+
+   A) the CodeWriter class (semi-automatic indentation (python), semi-automatic
+   (C++) namespace scopes, export to different files (classic, top level
+   methods),
+   simpler code to generate string from things (comments (vector of strings),
+   indentation commands (TAB BAT), newlines (NL), numbers, const char* or
+   std::string)
+
+   B) the Generator subclass (heritance for supporting different versions of a
+   language, avoid field name clash, write text/binary to file, types
+   management,
+   common computations and sctructures :  enum analysis (function, array, map,
+   ordered list + binarysearch),...)
+
+*/
+namespace flatbuffers {
+
+class BaseGenerator {
+public:
+  BaseGenerator(const Parser &parser_, const std::string &path_,
+                const std::string &file_name_)
+      : parser(parser_), path(path_), file_name(file_name_){};
+  virtual bool generate() = 0;
+
+protected:
+  virtual ~BaseGenerator(){};
+
+  const Parser &parser;
+  const std::string &path;
+  const std::string &file_name;
+};
+
+} // namespace flatbuffers
+
+#endif // FLATBUFFERS_CODE_GENERATORS_H_
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index e043b0146..7ea09c281 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -19,6 +19,7 @@
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
+#include "flatbuffers/code_generators.h"
 
 namespace flatbuffers {
 namespace cpp {
@@ -708,10 +709,20 @@ struct IsAlnum {
   }
 };
 
-// Iterate through all definitions we haven't generate code for (enums, structs,
-// and tables) and output them to a single file.
-std::string GenerateCPP(const Parser &parser,
-                        const std::string &file_name) {
+static std::string GeneratedFileName(const std::string &path,
+                                     const std::string &file_name) {
+  return path + file_name + "_generated.h";
+}
+
+namespace cpp {
+class CppGenerator : public BaseGenerator {
+public:
+  CppGenerator(const Parser &parser_, const std::string &path_,
+               const std::string &file_name_)
+      : BaseGenerator(parser_, path_, file_name_){};
+  // Iterate through all definitions we haven't generate code for (enums, structs,
+  // and tables) and output them to a single file.
+  bool generate() {
   // Check if we have any code to generate at all, to avoid an empty header.
   for (auto it = parser.enums_.vec.begin(); it != parser.enums_.vec.end();
        ++it) {
@@ -722,7 +733,7 @@ std::string GenerateCPP(const Parser &parser,
     if (!(*it)->generated) goto generate_code;
   }
   // No code to generate, exit:
-  return std::string();
+  return true;
 
   generate_code:
 
@@ -885,20 +896,17 @@ std::string GenerateCPP(const Parser &parser,
   // Close the include guard.
   code += "\n#endif  // " + include_guard + "\n";
 
-  return code;
-}
+  return SaveFile(GeneratedFileName(path, file_name).c_str(), code, false);
+  }
+};
+} // namespace cpp
 
-static std::string GeneratedFileName(const std::string &path,
-                                     const std::string &file_name) {
-  return path + file_name + "_generated.h";
-}
 
 bool GenerateCPP(const Parser &parser,
                  const std::string &path,
                  const std::string &file_name) {
-    auto code = GenerateCPP(parser, file_name);
-    return !code.length() ||
-           SaveFile(GeneratedFileName(path, file_name).c_str(), code, false);
+  cpp::CppGenerator *generator = new cpp::CppGenerator(parser, path, file_name);
+  return generator->generate();
 }
 
 std::string CPPMakeRule(const Parser &parser,
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index e663ddb52..09913c4c3 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -19,6 +19,7 @@
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
+#include "flatbuffers/code_generators.h"
 #include <algorithm>
 
 namespace flatbuffers {
@@ -1146,11 +1147,18 @@ static bool SaveClass(const LanguageParameters &lang, const Parser &parser,
   return SaveFile(filename.c_str(), code, false);
 }
 
-bool GenerateGeneral(const Parser &parser,
-                     const std::string &path,
-                     const std::string & file_name) {
-
-  assert(parser.opts.lang <= IDLOptions::kMAX);
+/** it'll be split later in java/csharp... and moved to separate files */
+namespace general {
+/** members methods signature will be simpler as they won't have to pass parser,
+ * filename & path */
+/** more features coming through the JavaGenerator, CSharpGenerator ...*/
+class GeneralGenerator : public BaseGenerator {
+public:
+  GeneralGenerator(const Parser &parser_, const std::string &path_,
+                   const std::string &file_name_)
+      : BaseGenerator(parser_, path_, file_name_){};
+  bool generate() {
+ assert(parser.opts.lang <= IDLOptions::kMAX);
   auto lang = language_parameters[parser.opts.lang];
   std::string one_file_code;
 
@@ -1184,6 +1192,16 @@ bool GenerateGeneral(const Parser &parser,
     return SaveClass(lang, parser, file_name, one_file_code,path, true, true);
   }
   return true;
+  }
+};
+} // namespace general
+
+bool GenerateGeneral(const Parser &parser,
+                     const std::string &path,
+                     const std::string & file_name) {
+  general::GeneralGenerator *generator =
+      new general::GeneralGenerator(parser, path, file_name);
+  return generator->generate();
 }
 
 static std::string ClassFileName(const LanguageParameters &lang,
diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp
index 88ce1f2a5..473e0fe60 100644
--- a/src/idl_gen_go.cpp
+++ b/src/idl_gen_go.cpp
@@ -21,6 +21,7 @@
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
+#include "flatbuffers/code_generators.h"
 
 #ifdef _WIN32
 #include <direct.h>
@@ -660,11 +661,12 @@ static void GenStructBuilder(const StructDef &struct_def,
   EndBuilderBody(code_ptr);
 }
 
-}  // namespace go
-
-bool GenerateGo(const Parser &parser,
-                const std::string &path,
-                const std::string & /*file_name*/) {
+class GoGenerator : public BaseGenerator {
+public:
+  GoGenerator(const Parser &parser_, const std::string &path_,
+              const std::string &file_name_)
+      : BaseGenerator(parser_, path_, file_name_){};
+  bool generate() {
   for (auto it = parser.enums_.vec.begin();
        it != parser.enums_.vec.end(); ++it) {
     std::string enumcode;
@@ -682,6 +684,15 @@ bool GenerateGo(const Parser &parser,
   }
 
   return true;
+  }
+};
+}  // namespace go
+
+bool GenerateGo(const Parser &parser,
+                const std::string &path,
+                const std::string & file_name) {
+  go::GoGenerator *generator = new go::GoGenerator(parser, path, file_name);
+  return generator->generate();
 }
 
 }  // namespace flatbuffers

From 039ab48b7a21ddb8287863883e26bf63a6b6466e Mon Sep 17 00:00:00 2001
From: Nnamdi <nnamdio@gmail.com>
Date: Wed, 13 Apr 2016 23:04:27 +0100
Subject: [PATCH 120/185] Stop CreateUninitializedVector returning a pointer to
 invalid memory.

CreateUninitializedVector was performing the following actions:
    1. call StartVector.
    2. call make_space, and set buf to point to the reserved space.
    3. call EndVector.

The problem is that a call to EndVector can ultimately call make_space, which
if the buffer is full, will cause a reallocation, invalidating the value stored
in buf.  So setting buf needs to be delayed until after EndVector.

The following code, when run under valgrind shows a write to free'd memory before
the change, but no such error after:

int main()
{
    flatbuffers::FlatBufferBuilder fbb(128);
    char *buf = nullptr;
    fbb.CreateUninitializedVector(128, &buf);
    *buf = 0;
}
---
 include/flatbuffers/flatbuffers.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 8e4a79639..a33092f3d 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -1051,8 +1051,11 @@ FLATBUFFERS_FINAL_CLASS
                                       uint8_t **buf) {
     NotNested();
     StartVector(len, elemsize);
-    *buf = buf_.make_space(len * elemsize);
-    return EndVector(len);
+    buf_.make_space(len * elemsize);
+    auto vec_start = GetSize();
+    auto vec_end = EndVector(len);
+    *buf = buf_.data_at(vec_start);
+    return vec_end;
   }
 
   /// @brief Specialized version of `CreateVector` for non-copying use cases.

From 29d957ed5e58af0ce689c8c0312f061f17fc850f Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 13 Apr 2016 17:29:03 -0700
Subject: [PATCH 121/185] Fixed missing "f" on float default values in
 C++/Java/C#

Bug: 28145201
Change-Id: I5a1818c40c2f4fbd00cfec3362040407976f7a39
Tested: on Linux.
---
 src/idl_gen_cpp.cpp               |  12 ++++--
 src/idl_gen_general.cpp           |  60 +++++++++++++++---------------
 tests/MyGame/Example/Monster.cs   |   5 ++-
 tests/MyGame/Example/Monster.go   |  11 +++++-
 tests/MyGame/Example/Monster.java |   5 ++-
 tests/MyGame/Example/Monster.php  |  26 +++++++++++--
 tests/MyGame/Example/Monster.py   |  10 ++++-
 tests/monster_test.bfbs           | Bin 2840 -> 2912 bytes
 tests/monster_test.fbs            |   1 +
 tests/monster_test_generated.h    |  13 +++++--
 tests/monster_test_generated.js   |  18 ++++++++-
 tests/monsterdata_python_wire.mon | Bin 288 -> 288 bytes
 tests/monsterdata_test.mon        | Bin 384 -> 384 bytes
 13 files changed, 118 insertions(+), 43 deletions(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index e043b0146..c091ee12d 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -275,6 +275,12 @@ static void GenFullyQualifiedNameGetter(const Parser &parser, const std::string&
   }
 }
 
+std::string GenDefaultConstant(const FieldDef &field) {
+  return field.value.type.base_type == BASE_TYPE_FLOAT
+      ? field.value.constant + "f"
+      : field.value.constant;
+}
+
 // Generate an accessor struct, builder structs & function for a table.
 static void GenTable(const Parser &parser, StructDef &struct_def,
                      std::string *code_ptr) {
@@ -331,7 +337,7 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
           ">(" + offsetstr;
       // Default value as second arg for non-pointer types.
       if (IsScalar(field.value.type.base_type))
-        call += ", " + field.value.constant;
+        call += ", " + GenDefaultConstant(field);
       call += ")";
       code += GenUnderlyingCast(field, true, call);
       code += "; }\n";
@@ -470,7 +476,7 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
       code += "(" + struct_def.name + "::" + GenFieldOffsetName(field) + ", ";
       code += GenUnderlyingCast(field, false, field.name);
       if (IsScalar(field.value.type.base_type))
-        code += ", " + field.value.constant;
+        code += ", " + GenDefaultConstant(field);
       code += "); }\n";
     }
   }
@@ -520,7 +526,7 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
       } else if (field.value.type.base_type == BASE_TYPE_BOOL) {
         code += field.value.constant == "0" ? "false" : "true";
       } else {
-        code += field.value.constant;
+        code += GenDefaultConstant(field);
       }
     }
   }
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index e663ddb52..91f1aeb65 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -293,7 +293,7 @@ static Type DestinationType(const LanguageParameters &lang, const Parser &parser
   }
 }
 
-static std::string GenOffsetType(const LanguageParameters &lang, const Parser &parser, 
+static std::string GenOffsetType(const LanguageParameters &lang, const Parser &parser,
                                  const StructDef &struct_def) {
   if(lang.language == IDLOptions::kCSharp) {
     return "Offset<" + WrapInNameSpace(parser, struct_def) + ">";
@@ -428,7 +428,7 @@ static std::string GenEnumDefaultValue(const Parser &parser, const Value &value)
   return result;
 }
 
-static std::string GenDefaultValue(const LanguageParameters &lang, const Parser &parser, 
+static std::string GenDefaultValue(const LanguageParameters &lang, const Parser &parser,
                                    const Value &value, bool enableLangOverrides) {
   if (enableLangOverrides) {
     // handles both enum case and vector of enum case
@@ -438,9 +438,11 @@ static std::string GenDefaultValue(const LanguageParameters &lang, const Parser
       return GenEnumDefaultValue(parser, value);
     }
   }
-  return value.type.base_type == BASE_TYPE_BOOL
-           ? (value.constant == "0" ? "false" : "true")
-           : value.constant;
+  switch (value.type.base_type) {
+    case BASE_TYPE_FLOAT: return value.constant + "f";
+    case BASE_TYPE_BOOL: return value.constant == "0" ? "false" : "true";
+    default: return value.constant;
+  }
 }
 
 static std::string GenDefaultValue(const LanguageParameters &lang, const Parser &parser,
@@ -448,7 +450,7 @@ static std::string GenDefaultValue(const LanguageParameters &lang, const Parser
   return GenDefaultValue(lang, parser, value, true);
 }
 
-static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Parser &parser, 
+static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Parser &parser,
                                         const Value &value, bool enableLangOverrides) {
   if (!IsScalar(value.type.base_type)) {
     if (enableLangOverrides) {
@@ -470,7 +472,7 @@ static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Pa
   return GenDefaultValue(lang, parser, value, enableLangOverrides);
 }
 
-static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Parser &parser, 
+static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Parser &parser,
                                         const Value &value) {
   return GenDefaultValueBasic(lang, parser, value, true);
 }
@@ -573,7 +575,7 @@ static std::string GenSetter(const LanguageParameters &lang, const Parser &parse
                              const Type &type) {
   if (IsScalar(type.base_type)) {
     std::string setter = "bb." + FunctionStart(lang, 'P') + "ut";
-    if (GenTypeBasic(lang, parser, type, false) != "byte" && 
+    if (GenTypeBasic(lang, parser, type, false) != "byte" &&
         type.base_type != BASE_TYPE_BOOL) {
       setter += MakeCamel(GenTypeBasic(lang, parser, type, false));
     }
@@ -884,27 +886,27 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
           break;
       }
     }
-	// generate object accessors if is nested_flatbuffer
-	auto nested = field.attributes.Lookup("nested_flatbuffer");
-	if (nested) {
-		auto nested_qualified_name =
-			parser.namespaces_.back()->GetFullyQualifiedName(nested->constant);
-		auto nested_type = parser.structs_.Lookup(nested_qualified_name);
-		auto nested_type_name = WrapInNameSpace(parser, *nested_type);
-		auto nestedMethodName = MakeCamel(field.name, lang.first_camel_upper) 
-			+ "As" + nested_type_name;
-		auto getNestedMethodName = nestedMethodName;
-		if (lang.language == IDLOptions::kCSharp) {
-			getNestedMethodName = "Get" + nestedMethodName;
-		}
-		code += "  public " + nested_type_name + " ";
-		code += nestedMethodName + "() { return ";
-		code += getNestedMethodName + "(new " + nested_type_name + "()); }\n";
-		code += "  public " + nested_type_name + " " + getNestedMethodName;
-		code += "(" + nested_type_name + " obj) { ";
-		code += "int o = __offset(" + NumToString(field.value.offset) +"); ";
-		code += "return o != 0 ? obj.__init(__indirect(__vector(o)), bb) : null; }\n";
-	}
+  // generate object accessors if is nested_flatbuffer
+  auto nested = field.attributes.Lookup("nested_flatbuffer");
+  if (nested) {
+    auto nested_qualified_name =
+      parser.namespaces_.back()->GetFullyQualifiedName(nested->constant);
+    auto nested_type = parser.structs_.Lookup(nested_qualified_name);
+    auto nested_type_name = WrapInNameSpace(parser, *nested_type);
+    auto nestedMethodName = MakeCamel(field.name, lang.first_camel_upper)
+      + "As" + nested_type_name;
+    auto getNestedMethodName = nestedMethodName;
+    if (lang.language == IDLOptions::kCSharp) {
+      getNestedMethodName = "Get" + nestedMethodName;
+    }
+    code += "  public " + nested_type_name + " ";
+    code += nestedMethodName + "() { return ";
+    code += getNestedMethodName + "(new " + nested_type_name + "()); }\n";
+    code += "  public " + nested_type_name + " " + getNestedMethodName;
+    code += "(" + nested_type_name + " obj) { ";
+    code += "int o = __offset(" + NumToString(field.value.offset) +"); ";
+    code += "return o != 0 ? obj.__init(__indirect(__vector(o)), bb) : null; }\n";
+  }
     // generate mutators for scalar fields or vectors of scalars
     if (parser.opts.mutable_buffer) {
       auto underlying_type = field.value.type.base_type == BASE_TYPE_VECTOR
diff --git a/tests/MyGame/Example/Monster.cs b/tests/MyGame/Example/Monster.cs
index e456db8ca..e53afcc64 100644
--- a/tests/MyGame/Example/Monster.cs
+++ b/tests/MyGame/Example/Monster.cs
@@ -72,8 +72,10 @@ public sealed class Monster : Table {
   public int TestarrayofboolsLength { get { int o = __offset(52); return o != 0 ? __vector_len(o) : 0; } }
   public ArraySegment<byte>? GetTestarrayofboolsBytes() { return __vector_as_arraysegment(52); }
   public bool MutateTestarrayofbools(int j, bool testarrayofbools) { int o = __offset(52); if (o != 0) { bb.Put(__vector(o) + j * 1, (byte)(testarrayofbools ? 1 : 0)); return true; } else { return false; } }
+  public float Testf { get { int o = __offset(54); return o != 0 ? bb.GetFloat(o + bb_pos) : (float)3.14159f; } }
+  public bool MutateTestf(float testf) { int o = __offset(54); if (o != 0) { bb.PutFloat(o + bb_pos, testf); return true; } else { return false; } }
 
-  public static void StartMonster(FlatBufferBuilder builder) { builder.StartObject(25); }
+  public static void StartMonster(FlatBufferBuilder builder) { builder.StartObject(26); }
   public static void AddPos(FlatBufferBuilder builder, Offset<Vec3> posOffset) { builder.AddStruct(0, posOffset.Value, 0); }
   public static void AddMana(FlatBufferBuilder builder, short mana) { builder.AddShort(1, mana, 150); }
   public static void AddHp(FlatBufferBuilder builder, short hp) { builder.AddShort(2, hp, 100); }
@@ -109,6 +111,7 @@ public sealed class Monster : Table {
   public static void AddTestarrayofbools(FlatBufferBuilder builder, VectorOffset testarrayofboolsOffset) { builder.AddOffset(24, testarrayofboolsOffset.Value, 0); }
   public static VectorOffset CreateTestarrayofboolsVector(FlatBufferBuilder builder, bool[] data) { builder.StartVector(1, data.Length, 1); for (int i = data.Length - 1; i >= 0; i--) builder.AddBool(data[i]); return builder.EndVector(); }
   public static void StartTestarrayofboolsVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(1, numElems, 1); }
+  public static void AddTestf(FlatBufferBuilder builder, float testf) { builder.AddFloat(25, testf, 3.14159f); }
   public static Offset<Monster> EndMonster(FlatBufferBuilder builder) {
     int o = builder.EndObject();
     builder.Required(o, 10);  // name
diff --git a/tests/MyGame/Example/Monster.go b/tests/MyGame/Example/Monster.go
index ee9d51076..afdfe42d7 100644
--- a/tests/MyGame/Example/Monster.go
+++ b/tests/MyGame/Example/Monster.go
@@ -313,7 +313,15 @@ func (rcv *Monster) TestarrayofboolsLength() int {
 	return 0
 }
 
-func MonsterStart(builder *flatbuffers.Builder) { builder.StartObject(25) }
+func (rcv *Monster) Testf() float32 {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(54))
+	if o != 0 {
+		return rcv._tab.GetFloat32(o + rcv._tab.Pos)
+	}
+	return 3.14159
+}
+
+func MonsterStart(builder *flatbuffers.Builder) { builder.StartObject(26) }
 func MonsterAddPos(builder *flatbuffers.Builder, pos flatbuffers.UOffsetT) { builder.PrependStructSlot(0, flatbuffers.UOffsetT(pos), 0) }
 func MonsterAddMana(builder *flatbuffers.Builder, mana int16) { builder.PrependInt16Slot(1, mana, 150) }
 func MonsterAddHp(builder *flatbuffers.Builder, hp int16) { builder.PrependInt16Slot(2, hp, 100) }
@@ -350,4 +358,5 @@ func MonsterAddTesthashu64Fnv1a(builder *flatbuffers.Builder, testhashu64Fnv1a u
 func MonsterAddTestarrayofbools(builder *flatbuffers.Builder, testarrayofbools flatbuffers.UOffsetT) { builder.PrependUOffsetTSlot(24, flatbuffers.UOffsetT(testarrayofbools), 0) }
 func MonsterStartTestarrayofboolsVector(builder *flatbuffers.Builder, numElems int) flatbuffers.UOffsetT { return builder.StartVector(1, numElems, 1)
 }
+func MonsterAddTestf(builder *flatbuffers.Builder, testf float32) { builder.PrependFloat32Slot(25, testf, 3.14159) }
 func MonsterEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT { return builder.EndObject() }
diff --git a/tests/MyGame/Example/Monster.java b/tests/MyGame/Example/Monster.java
index 16c7386e6..0b9a29d1f 100644
--- a/tests/MyGame/Example/Monster.java
+++ b/tests/MyGame/Example/Monster.java
@@ -78,8 +78,10 @@ public final class Monster extends Table {
   public int testarrayofboolsLength() { int o = __offset(52); return o != 0 ? __vector_len(o) : 0; }
   public ByteBuffer testarrayofboolsAsByteBuffer() { return __vector_as_bytebuffer(52, 1); }
   public boolean mutateTestarrayofbools(int j, boolean testarrayofbools) { int o = __offset(52); if (o != 0) { bb.put(__vector(o) + j * 1, (byte)(testarrayofbools ? 1 : 0)); return true; } else { return false; } }
+  public float testf() { int o = __offset(54); return o != 0 ? bb.getFloat(o + bb_pos) : 3.14159f; }
+  public boolean mutateTestf(float testf) { int o = __offset(54); if (o != 0) { bb.putFloat(o + bb_pos, testf); return true; } else { return false; } }
 
-  public static void startMonster(FlatBufferBuilder builder) { builder.startObject(25); }
+  public static void startMonster(FlatBufferBuilder builder) { builder.startObject(26); }
   public static void addPos(FlatBufferBuilder builder, int posOffset) { builder.addStruct(0, posOffset, 0); }
   public static void addMana(FlatBufferBuilder builder, short mana) { builder.addShort(1, mana, 150); }
   public static void addHp(FlatBufferBuilder builder, short hp) { builder.addShort(2, hp, 100); }
@@ -115,6 +117,7 @@ public final class Monster extends Table {
   public static void addTestarrayofbools(FlatBufferBuilder builder, int testarrayofboolsOffset) { builder.addOffset(24, testarrayofboolsOffset, 0); }
   public static int createTestarrayofboolsVector(FlatBufferBuilder builder, boolean[] data) { builder.startVector(1, data.length, 1); for (int i = data.length - 1; i >= 0; i--) builder.addBoolean(data[i]); return builder.endVector(); }
   public static void startTestarrayofboolsVector(FlatBufferBuilder builder, int numElems) { builder.startVector(1, numElems, 1); }
+  public static void addTestf(FlatBufferBuilder builder, float testf) { builder.addFloat(25, testf, 3.14159f); }
   public static int endMonster(FlatBufferBuilder builder) {
     int o = builder.endObject();
     builder.required(o, 10);  // name
diff --git a/tests/MyGame/Example/Monster.php b/tests/MyGame/Example/Monster.php
index 48b9c7df2..70f4d34e6 100644
--- a/tests/MyGame/Example/Monster.php
+++ b/tests/MyGame/Example/Monster.php
@@ -333,22 +333,31 @@ class Monster extends Table
         return $o != 0 ? $this->__vector_len($o) : 0;
     }
 
+    /**
+     * @return float
+     */
+    public function getTestf()
+    {
+        $o = $this->__offset(54);
+        return $o != 0 ? $this->bb->getFloat($o + $this->bb_pos) : 3.14159;
+    }
+
     /**
      * @param FlatBufferBuilder $builder
      * @return void
      */
     public static function startMonster(FlatBufferBuilder $builder)
     {
-        $builder->StartObject(25);
+        $builder->StartObject(26);
     }
 
     /**
      * @param FlatBufferBuilder $builder
      * @return Monster
      */
-    public static function createMonster(FlatBufferBuilder $builder, $pos, $mana, $hp, $name, $inventory, $color, $test_type, $test, $test4, $testarrayofstring, $testarrayoftables, $enemy, $testnestedflatbuffer, $testempty, $testbool, $testhashs32_fnv1, $testhashu32_fnv1, $testhashs64_fnv1, $testhashu64_fnv1, $testhashs32_fnv1a, $testhashu32_fnv1a, $testhashs64_fnv1a, $testhashu64_fnv1a, $testarrayofbools)
+    public static function createMonster(FlatBufferBuilder $builder, $pos, $mana, $hp, $name, $inventory, $color, $test_type, $test, $test4, $testarrayofstring, $testarrayoftables, $enemy, $testnestedflatbuffer, $testempty, $testbool, $testhashs32_fnv1, $testhashu32_fnv1, $testhashs64_fnv1, $testhashu64_fnv1, $testhashs32_fnv1a, $testhashu32_fnv1a, $testhashs64_fnv1a, $testhashu64_fnv1a, $testarrayofbools, $testf)
     {
-        $builder->startObject(25);
+        $builder->startObject(26);
         self::addPos($builder, $pos);
         self::addMana($builder, $mana);
         self::addHp($builder, $hp);
@@ -373,6 +382,7 @@ class Monster extends Table
         self::addTesthashs64Fnv1a($builder, $testhashs64_fnv1a);
         self::addTesthashu64Fnv1a($builder, $testhashu64_fnv1a);
         self::addTestarrayofbools($builder, $testarrayofbools);
+        self::addTestf($builder, $testf);
         $o = $builder->endObject();
         $builder->required($o, 10);  // name
         return $o;
@@ -757,6 +767,16 @@ class Monster extends Table
         $builder->startVector(1, $numElems, 1);
     }
 
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param float
+     * @return void
+     */
+    public static function addTestf(FlatBufferBuilder $builder, $testf)
+    {
+        $builder->addFloatX(25, $testf, 3.14159);
+    }
+
     /**
      * @param FlatBufferBuilder $builder
      * @return int table offset
diff --git a/tests/MyGame/Example/Monster.py b/tests/MyGame/Example/Monster.py
index 171355c62..8a19b24fb 100644
--- a/tests/MyGame/Example/Monster.py
+++ b/tests/MyGame/Example/Monster.py
@@ -262,7 +262,14 @@ class Monster(object):
             return self._tab.VectorLen(o)
         return 0
 
-def MonsterStart(builder): builder.StartObject(25)
+    # Monster
+    def Testf(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(54))
+        if o != 0:
+            return self._tab.Get(flatbuffers.number_types.Float32Flags, o + self._tab.Pos)
+        return 3.14159
+
+def MonsterStart(builder): builder.StartObject(26)
 def MonsterAddPos(builder, pos): builder.PrependStructSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(pos), 0)
 def MonsterAddMana(builder, mana): builder.PrependInt16Slot(1, mana, 150)
 def MonsterAddHp(builder, hp): builder.PrependInt16Slot(2, hp, 100)
@@ -293,4 +300,5 @@ def MonsterAddTesthashs64Fnv1a(builder, testhashs64Fnv1a): builder.PrependInt64S
 def MonsterAddTesthashu64Fnv1a(builder, testhashu64Fnv1a): builder.PrependUint64Slot(23, testhashu64Fnv1a, 0)
 def MonsterAddTestarrayofbools(builder, testarrayofbools): builder.PrependUOffsetTRelativeSlot(24, flatbuffers.number_types.UOffsetTFlags.py_type(testarrayofbools), 0)
 def MonsterStartTestarrayofboolsVector(builder, numElems): return builder.StartVector(1, numElems, 1)
+def MonsterAddTestf(builder, testf): builder.PrependFloat32Slot(25, testf, 3.14159)
 def MonsterEnd(builder): return builder.EndObject()
diff --git a/tests/monster_test.bfbs b/tests/monster_test.bfbs
index db1232821257da777a2adf0e6a8bf34226613243..084798598be104aec8b445d97c35e37acb01939d 100644
GIT binary patch
delta 358
zcmXAly)Oho7>9qe=i}B#qS!mmtz0CEEl3ndBqCRkD9*V=B~gf=5{bB;#OA6iT&7Wo
zN=d~ZAUcgG6$+6n6bglKnj6njJoC)#`<s2=-P7z#_GEk_^rS9H0sickN<GqzFST$z
zEv2YULKEtZwN-Q8xGH#&-*}iebGF|MX4-A%I;bX;SIUb>n|9U|avSWXU;w;t=TOS9
z+}V9ILep30oINvPCg3u?M9;r)5|X_)$7ahed-=m*jx8o>GUP6O#yX`Cuj3~i<CuB{
zE+8f!;Aip?l%UA7cU~Mp47Z#w@f%*iN4P?6NFlTIF;VhclF>DtEEJ@iW)$EM_G<Z$
apHaWaR`geO`=Gjmzy80p_xjOWO8)|ySv@%b

delta 331
zcmaDLHbZQJj;;a|0|Ofa1A_#RUc=77z{17Aki*HqumMQBa4;}11LX{W_z4hCm>3z%
zIBVisd8P*(6VKT(I!xwe6c_#V@Be=mpezXc`TMy7DTcVomW=X}89<f|5DNgY*Z2Sb
zffO?%ka#q?kWto}i$Mga2WSNY&?>MRpcCML707ZgN=?lJ$_gN<;{l2@PCm-m%(!8)
zCzEu&B#^%b=*SsB%?dy#+yLSWK)wLbfF2;*0!Ui``7A&j0mK$S^(TO8CjjvskYj-K
z5+MBm$g}~{6+k)#NG|}=e}EXIo&%^R;m7~~5)39__sRgpKz=GoE#9opY{&rs*Ge*`

diff --git a/tests/monster_test.fbs b/tests/monster_test.fbs
index 998beedff..28a4d5a03 100755
--- a/tests/monster_test.fbs
+++ b/tests/monster_test.fbs
@@ -59,6 +59,7 @@ table Monster {
   testhashu32_fnv1a:uint (id:21, hash:"fnv1a_32");
   testhashs64_fnv1a:long (id:22, hash:"fnv1a_64");
   testhashu64_fnv1a:ulong (id:23, hash:"fnv1a_64");
+  testf:float = 3.14159 (id:25);
 }
 
 rpc_service MonsterStorage {
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index ef7f577f5..f66f4c5dd 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -203,7 +203,8 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
     VT_TESTHASHU32_FNV1A = 46,
     VT_TESTHASHS64_FNV1A = 48,
     VT_TESTHASHU64_FNV1A = 50,
-    VT_TESTARRAYOFBOOLS = 52
+    VT_TESTARRAYOFBOOLS = 52,
+    VT_TESTF = 54
   };
   const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
   Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
@@ -258,6 +259,8 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   bool mutate_testhashu64_fnv1a(uint64_t _testhashu64_fnv1a) { return SetField(VT_TESTHASHU64_FNV1A, _testhashu64_fnv1a); }
   const flatbuffers::Vector<uint8_t> *testarrayofbools() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_TESTARRAYOFBOOLS); }
   flatbuffers::Vector<uint8_t> *mutable_testarrayofbools() { return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_TESTARRAYOFBOOLS); }
+  float testf() const { return GetField<float>(VT_TESTF, 3.14159f); }
+  bool mutate_testf(float _testf) { return SetField(VT_TESTF, _testf); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<Vec3>(verifier, VT_POS) &&
@@ -296,6 +299,7 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
            VerifyField<uint64_t>(verifier, VT_TESTHASHU64_FNV1A) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_TESTARRAYOFBOOLS) &&
            verifier.Verify(testarrayofbools()) &&
+           VerifyField<float>(verifier, VT_TESTF) &&
            verifier.EndTable();
   }
 };
@@ -327,10 +331,11 @@ struct MonsterBuilder {
   void add_testhashs64_fnv1a(int64_t testhashs64_fnv1a) { fbb_.AddElement<int64_t>(Monster::VT_TESTHASHS64_FNV1A, testhashs64_fnv1a, 0); }
   void add_testhashu64_fnv1a(uint64_t testhashu64_fnv1a) { fbb_.AddElement<uint64_t>(Monster::VT_TESTHASHU64_FNV1A, testhashu64_fnv1a, 0); }
   void add_testarrayofbools(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testarrayofbools) { fbb_.AddOffset(Monster::VT_TESTARRAYOFBOOLS, testarrayofbools); }
+  void add_testf(float testf) { fbb_.AddElement<float>(Monster::VT_TESTF, testf, 3.14159f); }
   MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   MonsterBuilder &operator=(const MonsterBuilder &);
   flatbuffers::Offset<Monster> Finish() {
-    auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 25));
+    auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 26));
     fbb_.Required(o, Monster::VT_NAME);  // name
     return o;
   }
@@ -360,12 +365,14 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
    uint32_t testhashu32_fnv1a = 0,
    int64_t testhashs64_fnv1a = 0,
    uint64_t testhashu64_fnv1a = 0,
-   flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testarrayofbools = 0) {
+   flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testarrayofbools = 0,
+   float testf = 3.14159f) {
   MonsterBuilder builder_(_fbb);
   builder_.add_testhashu64_fnv1a(testhashu64_fnv1a);
   builder_.add_testhashs64_fnv1a(testhashs64_fnv1a);
   builder_.add_testhashu64_fnv1(testhashu64_fnv1);
   builder_.add_testhashs64_fnv1(testhashs64_fnv1);
+  builder_.add_testf(testf);
   builder_.add_testarrayofbools(testarrayofbools);
   builder_.add_testhashu32_fnv1a(testhashu32_fnv1a);
   builder_.add_testhashs32_fnv1a(testhashs32_fnv1a);
diff --git a/tests/monster_test_generated.js b/tests/monster_test_generated.js
index df1fc2647..c13246ed5 100644
--- a/tests/monster_test_generated.js
+++ b/tests/monster_test_generated.js
@@ -677,11 +677,19 @@ MyGame.Example.Monster.prototype.testarrayofboolsArray = function() {
   return offset ? new Int8Array(this.bb.bytes().buffer, this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null;
 };
 
+/**
+ * @returns {number}
+ */
+MyGame.Example.Monster.prototype.testf = function() {
+  var offset = this.bb.__offset(this.bb_pos, 54);
+  return offset ? this.bb.readFloat32(this.bb_pos + offset) : 3.14159;
+};
+
 /**
  * @param {flatbuffers.Builder} builder
  */
 MyGame.Example.Monster.startMonster = function(builder) {
-  builder.startObject(25);
+  builder.startObject(26);
 };
 
 /**
@@ -989,6 +997,14 @@ MyGame.Example.Monster.startTestarrayofboolsVector = function(builder, numElems)
   builder.startVector(1, numElems, 1);
 };
 
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {number} testf
+ */
+MyGame.Example.Monster.addTestf = function(builder, testf) {
+  builder.addFieldFloat32(25, testf, 3.14159);
+};
+
 /**
  * @param {flatbuffers.Builder} builder
  * @returns {flatbuffers.Offset}
diff --git a/tests/monsterdata_python_wire.mon b/tests/monsterdata_python_wire.mon
index c6c397848263e65f744f91d5fc3882f06641f674..a574e3108e1e4c8d0a226480929925a6495efda6 100644
GIT binary patch
delta 45
scmZ3$w1A1zfdK+6CUToHGcZ_8bd2Y;VBmlVPE?eictC*BV&YAA0HKQrXaE2J

delta 36
jcmZ3$w1A1*fdK~0CUTlGnoV?!XJ%k9o463fzUdACZo~(L

diff --git a/tests/monsterdata_test.mon b/tests/monsterdata_test.mon
index 69d1d7538e406a7d46bc5d85bbb565ea95e960ca..ef04a53951641b737132ba4f3bab4c5e0f93737e 100644
GIT binary patch
delta 51
zcmZo*ZeSMlU|?YI_4f+~Qea>)QP`B3fx%*;XE)=XiC3K&EhbAdf<-0=GU@{W@OBCy

delta 51
zcmZo*ZeSMnU|?YI_4f+~Qcz$vQP7mpY@%m3<F1KUotYUJ%qB}R0!1bVGU@{W>s|^H


From 38597160f2b79a9620d70c43754248c41a5fdfeb Mon Sep 17 00:00:00 2001
From: Lakedaemon <olivier.binda@wanadoo.fr>
Date: Fri, 15 Apr 2016 13:20:26 +0200
Subject: [PATCH 122/185] Enforcing the google C++ style guide

---
 include/flatbuffers/code_generators.h |  45 +---
 src/idl_gen_cpp.cpp                   | 321 +++++++++++++-------------
 src/idl_gen_general.cpp               |  78 +++----
 src/idl_gen_go.cpp                    |  41 ++--
 4 files changed, 227 insertions(+), 258 deletions(-)

diff --git a/include/flatbuffers/code_generators.h b/include/flatbuffers/code_generators.h
index 666e1aa8c..6b27ea780 100644
--- a/include/flatbuffers/code_generators.h
+++ b/include/flatbuffers/code_generators.h
@@ -17,48 +17,23 @@
 #ifndef FLATBUFFERS_CODE_GENERATORS_H_
 #define FLATBUFFERS_CODE_GENERATORS_H_
 
-/** This file defines some classes, that code generators should extend to gain
-   common functionalities :
-
-   BaseGenerator is the base class for all (binary, textual, strongly typed,
-   dynamically typed, whatever) generators.
-   It is really abstract, general and flexible and doesn't do much appart from
-   holding the parser, a path and a filename being processed.
-   Still, it brings a common structure (normalization) among generators
-
-   The many advantages of object based generators will come later from   :
-
-   A) the CodeWriter class (semi-automatic indentation (python), semi-automatic
-   (C++) namespace scopes, export to different files (classic, top level
-   methods),
-   simpler code to generate string from things (comments (vector of strings),
-   indentation commands (TAB BAT), newlines (NL), numbers, const char* or
-   std::string)
-
-   B) the Generator subclass (heritance for supporting different versions of a
-   language, avoid field name clash, write text/binary to file, types
-   management,
-   common computations and sctructures :  enum analysis (function, array, map,
-   ordered list + binarysearch),...)
-
-*/
 namespace flatbuffers {
 
 class BaseGenerator {
-public:
-  BaseGenerator(const Parser &parser_, const std::string &path_,
-                const std::string &file_name_)
-      : parser(parser_), path(path_), file_name(file_name_){};
+ public:
+  BaseGenerator(const Parser &parser, const std::string &path,
+                const std::string &file_name)
+      : parser_(parser), path_(path), file_name_(file_name){};
   virtual bool generate() = 0;
 
-protected:
+ protected:
   virtual ~BaseGenerator(){};
 
-  const Parser &parser;
-  const std::string &path;
-  const std::string &file_name;
+  const Parser &parser_;
+  const std::string &path_;
+  const std::string &file_name_;
 };
 
-} // namespace flatbuffers
+}  // namespace flatbuffers
 
-#endif // FLATBUFFERS_CODE_GENERATORS_H_
+#endif  // FLATBUFFERS_CODE_GENERATORS_H_
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 7ea09c281..c1b6ba566 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -716,194 +716,195 @@ static std::string GeneratedFileName(const std::string &path,
 
 namespace cpp {
 class CppGenerator : public BaseGenerator {
-public:
-  CppGenerator(const Parser &parser_, const std::string &path_,
-               const std::string &file_name_)
-      : BaseGenerator(parser_, path_, file_name_){};
-  // Iterate through all definitions we haven't generate code for (enums, structs,
+ public:
+  CppGenerator(const Parser &parser, const std::string &path,
+               const std::string &file_name)
+      : BaseGenerator(parser, path, file_name){};
+  // Iterate through all definitions we haven't generate code for (enums,
+  // structs,
   // and tables) and output them to a single file.
   bool generate() {
-  // Check if we have any code to generate at all, to avoid an empty header.
-  for (auto it = parser.enums_.vec.begin(); it != parser.enums_.vec.end();
-       ++it) {
-    if (!(*it)->generated) goto generate_code;
-  }
-  for (auto it = parser.structs_.vec.begin(); it != parser.structs_.vec.end();
-       ++it) {
-    if (!(*it)->generated) goto generate_code;
-  }
-  // No code to generate, exit:
-  return true;
+    // Check if we have any code to generate at all, to avoid an empty header.
+    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
+         ++it) {
+      if (!(*it)->generated) goto generate_code;
+    }
+    for (auto it = parser_.structs_.vec.begin(); it != parser_.structs_.vec.end();
+         ++it) {
+      if (!(*it)->generated) goto generate_code;
+    }
+    // No code to generate, exit:
+    return true;
 
   generate_code:
 
-  using namespace cpp;
+    using namespace cpp;
 
-  std::string code;
-  code = "// automatically generated by the FlatBuffers compiler,"
-         " do not modify\n\n";
+    std::string code;
+    code =
+        "// automatically generated by the FlatBuffers compiler,"
+        " do not modify\n\n";
 
-  // Generate include guard.
-  std::string include_guard_ident = file_name;
-  // Remove any non-alpha-numeric characters that may appear in a filename.
-  include_guard_ident.erase(
-    std::remove_if(include_guard_ident.begin(),
-                   include_guard_ident.end(),
-                   IsAlnum()),
-    include_guard_ident.end());
-  std::string include_guard = "FLATBUFFERS_GENERATED_" + include_guard_ident;
-  include_guard += "_";
-  // For further uniqueness, also add the namespace.
-  auto name_space = parser.namespaces_.back();
-  for (auto it = name_space->components.begin();
-           it != name_space->components.end(); ++it) {
-    include_guard += *it + "_";
-  }
-  include_guard += "H_";
-  std::transform(include_guard.begin(), include_guard.end(),
-                 include_guard.begin(), ::toupper);
-  code += "#ifndef " + include_guard + "\n";
-  code += "#define " + include_guard + "\n\n";
+    // Generate include guard.
+    std::string include_guard_ident = file_name_;
+    // Remove any non-alpha-numeric characters that may appear in a filename.
+    include_guard_ident.erase(
+        std::remove_if(include_guard_ident.begin(), include_guard_ident.end(),
+                       IsAlnum()),
+        include_guard_ident.end());
+    std::string include_guard = "FLATBUFFERS_GENERATED_" + include_guard_ident;
+    include_guard += "_";
+    // For further uniqueness, also add the namespace.
+    auto name_space = parser_.namespaces_.back();
+    for (auto it = name_space->components.begin();
+         it != name_space->components.end(); ++it) {
+      include_guard += *it + "_";
+    }
+    include_guard += "H_";
+    std::transform(include_guard.begin(), include_guard.end(),
+                   include_guard.begin(), ::toupper);
+    code += "#ifndef " + include_guard + "\n";
+    code += "#define " + include_guard + "\n\n";
 
-  code += "#include \"flatbuffers/flatbuffers.h\"\n\n";
+    code += "#include \"flatbuffers/flatbuffers.h\"\n\n";
 
-  if (parser.opts.include_dependence_headers) {
-    int num_includes = 0;
-    for (auto it = parser.included_files_.begin();
-         it != parser.included_files_.end(); ++it) {
-      auto basename = flatbuffers::StripPath(
-                        flatbuffers::StripExtension(it->first));
-      if (basename != file_name) {
-        code += "#include \"" + basename + "_generated.h\"\n";
-        num_includes++;
+    if (parser_.opts.include_dependence_headers) {
+      int num_includes = 0;
+      for (auto it = parser_.included_files_.begin();
+           it != parser_.included_files_.end(); ++it) {
+        auto basename =
+            flatbuffers::StripPath(flatbuffers::StripExtension(it->first));
+        if (basename != file_name_) {
+          code += "#include \"" + basename + "_generated.h\"\n";
+          num_includes++;
+        }
+      }
+      if (num_includes) code += "\n";
+    }
+
+    assert(!code_generator_cur_name_space);
+
+    // Generate forward declarations for all structs/tables, since they may
+    // have circular references.
+    for (auto it = parser_.structs_.vec.begin(); it != parser_.structs_.vec.end();
+         ++it) {
+      auto &struct_def = **it;
+      if (!struct_def.generated) {
+        CheckNameSpace(struct_def, &code);
+        code += "struct " + struct_def.name + ";\n\n";
       }
     }
-    if (num_includes) code += "\n";
-  }
 
-  assert(!code_generator_cur_name_space);
-
-  // Generate forward declarations for all structs/tables, since they may
-  // have circular references.
-  for (auto it = parser.structs_.vec.begin();
-       it != parser.structs_.vec.end(); ++it) {
-    auto &struct_def = **it;
-    if (!struct_def.generated) {
-      CheckNameSpace(struct_def, &code);
-      code += "struct " + struct_def.name + ";\n\n";
+    // Generate code for all the enum declarations.
+    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
+         ++it) {
+      auto &enum_def = **it;
+      if (!enum_def.generated) {
+        CheckNameSpace(**it, &code);
+        GenEnum(parser_, **it, &code);
+      }
     }
-  }
 
-  // Generate code for all the enum declarations.
-  for (auto it = parser.enums_.vec.begin();
-       it != parser.enums_.vec.end(); ++it) {
-    auto &enum_def = **it;
-    if (!enum_def.generated) {
-      CheckNameSpace(**it, &code);
-      GenEnum(parser, **it, &code);
+    // Generate code for all structs, then all tables.
+    for (auto it = parser_.structs_.vec.begin(); it != parser_.structs_.vec.end();
+         ++it) {
+      auto &struct_def = **it;
+      if (struct_def.fixed && !struct_def.generated) {
+        CheckNameSpace(struct_def, &code);
+        GenStruct(parser_, struct_def, &code);
+      }
     }
-  }
-
-  // Generate code for all structs, then all tables.
-  for (auto it = parser.structs_.vec.begin();
-       it != parser.structs_.vec.end(); ++it) {
-    auto &struct_def = **it;
-    if (struct_def.fixed && !struct_def.generated) {
-      CheckNameSpace(struct_def, &code);
-      GenStruct(parser, struct_def, &code);
+    for (auto it = parser_.structs_.vec.begin(); it != parser_.structs_.vec.end();
+         ++it) {
+      auto &struct_def = **it;
+      if (!struct_def.fixed && !struct_def.generated) {
+        CheckNameSpace(struct_def, &code);
+        GenTable(parser_, struct_def, &code);
+      }
     }
-  }
-  for (auto it = parser.structs_.vec.begin();
-       it != parser.structs_.vec.end(); ++it) {
-    auto &struct_def = **it;
-    if (!struct_def.fixed && !struct_def.generated) {
-      CheckNameSpace(struct_def, &code);
-      GenTable(parser, struct_def, &code);
+
+    // Generate code for union verifiers.
+    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
+         ++it) {
+      auto &enum_def = **it;
+      if (enum_def.is_union && !enum_def.generated) {
+        CheckNameSpace(enum_def, &code);
+        GenEnumPost(parser_, enum_def, &code);
+      }
     }
-  }
 
-  // Generate code for union verifiers.
-  for (auto it = parser.enums_.vec.begin();
-       it != parser.enums_.vec.end(); ++it) {
-    auto &enum_def = **it;
-    if (enum_def.is_union && !enum_def.generated) {
-      CheckNameSpace(enum_def, &code);
-      GenEnumPost(parser, enum_def, &code);
-    }
-  }
+    // Generate convenient global helper functions:
+    if (parser_.root_struct_def_) {
+      CheckNameSpace(*parser_.root_struct_def_, &code);
+      auto &name = parser_.root_struct_def_->name;
+      std::string qualified_name =
+          parser_.namespaces_.back()->GetFullyQualifiedName(name);
+      std::string cpp_qualified_name = TranslateNameSpace(qualified_name);
 
-  // Generate convenient global helper functions:
-  if (parser.root_struct_def_) {
-    CheckNameSpace(*parser.root_struct_def_, &code);
-    auto &name = parser.root_struct_def_->name;
-    std::string qualified_name =
-        parser.namespaces_.back()->GetFullyQualifiedName(name);
-    std::string cpp_qualified_name = TranslateNameSpace(qualified_name);
-
-    // The root datatype accessor:
-    code += "inline const " + cpp_qualified_name + " *Get";
-    code += name;
-    code += "(const void *buf) { return flatbuffers::GetRoot<";
-    code += cpp_qualified_name + ">(buf); }\n\n";
-    if (parser.opts.mutable_buffer) {
-      code += "inline " + name + " *GetMutable";
+      // The root datatype accessor:
+      code += "inline const " + cpp_qualified_name + " *Get";
       code += name;
-      code += "(void *buf) { return flatbuffers::GetMutableRoot<";
-      code += name + ">(buf); }\n\n";
+      code += "(const void *buf) { return flatbuffers::GetRoot<";
+      code += cpp_qualified_name + ">(buf); }\n\n";
+      if (parser_.opts.mutable_buffer) {
+        code += "inline " + name + " *GetMutable";
+        code += name;
+        code += "(void *buf) { return flatbuffers::GetMutableRoot<";
+        code += name + ">(buf); }\n\n";
+      }
+
+      // The root verifier:
+      code += "inline bool Verify";
+      code += name;
+      code +=
+          "Buffer(flatbuffers::Verifier &verifier) { "
+          "return verifier.VerifyBuffer<";
+      code += cpp_qualified_name + ">(); }\n\n";
+
+      if (parser_.file_identifier_.length()) {
+        // Return the identifier
+        code += "inline const char *" + name;
+        code += "Identifier() { return \"" + parser_.file_identifier_;
+        code += "\"; }\n\n";
+
+        // Check if a buffer has the identifier.
+        code += "inline bool " + name;
+        code += "BufferHasIdentifier(const void *buf) { return flatbuffers::";
+        code += "BufferHasIdentifier(buf, ";
+        code += name + "Identifier()); }\n\n";
+      }
+
+      if (parser_.file_extension_.length()) {
+        // Return the extension
+        code += "inline const char *" + name;
+        code += "Extension() { return \"" + parser_.file_extension_;
+        code += "\"; }\n\n";
+      }
+
+      // Finish a buffer with a given root object:
+      code += "inline void Finish" + name;
+      code +=
+          "Buffer(flatbuffers::FlatBufferBuilder &fbb, flatbuffers::Offset<";
+      code += cpp_qualified_name + "> root) { fbb.Finish(root";
+      if (parser_.file_identifier_.length())
+        code += ", " + name + "Identifier()";
+      code += "); }\n\n";
     }
 
-    // The root verifier:
-    code += "inline bool Verify";
-    code += name;
-    code += "Buffer(flatbuffers::Verifier &verifier) { "
-            "return verifier.VerifyBuffer<";
-    code += cpp_qualified_name + ">(); }\n\n";
+    assert(code_generator_cur_name_space);
+    CloseNestedNameSpaces(code_generator_cur_name_space, &code);
 
-    if (parser.file_identifier_.length()) {
-      // Return the identifier
-      code += "inline const char *" + name;
-      code += "Identifier() { return \"" + parser.file_identifier_;
-      code += "\"; }\n\n";
+    code_generator_cur_name_space = nullptr;
 
-      // Check if a buffer has the identifier.
-      code += "inline bool " + name;
-      code += "BufferHasIdentifier(const void *buf) { return flatbuffers::";
-      code += "BufferHasIdentifier(buf, ";
-      code += name + "Identifier()); }\n\n";
-    }
+    // Close the include guard.
+    code += "\n#endif  // " + include_guard + "\n";
 
-    if (parser.file_extension_.length()) {
-      // Return the extension
-      code += "inline const char *" + name;
-      code += "Extension() { return \"" + parser.file_extension_;
-      code += "\"; }\n\n";
-    }
-
-    // Finish a buffer with a given root object:
-    code += "inline void Finish" + name;
-    code += "Buffer(flatbuffers::FlatBufferBuilder &fbb, flatbuffers::Offset<";
-    code += cpp_qualified_name + "> root) { fbb.Finish(root";
-    if (parser.file_identifier_.length())
-      code += ", " + name + "Identifier()";
-    code += "); }\n\n";
-  }
-
-  assert(code_generator_cur_name_space);
-  CloseNestedNameSpaces(code_generator_cur_name_space, &code);
-
-  code_generator_cur_name_space = nullptr;
-
-  // Close the include guard.
-  code += "\n#endif  // " + include_guard + "\n";
-
-  return SaveFile(GeneratedFileName(path, file_name).c_str(), code, false);
+    return SaveFile(GeneratedFileName(path_, file_name_).c_str(), code, false);
   }
 };
-} // namespace cpp
+}  // namespace cpp
 
-
-bool GenerateCPP(const Parser &parser,
-                 const std::string &path,
+bool GenerateCPP(const Parser &parser, const std::string &path,
                  const std::string &file_name) {
   cpp::CppGenerator *generator = new cpp::CppGenerator(parser, path, file_name);
   return generator->generate();
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index 09913c4c3..a763d969b 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -1147,58 +1147,54 @@ static bool SaveClass(const LanguageParameters &lang, const Parser &parser,
   return SaveFile(filename.c_str(), code, false);
 }
 
-/** it'll be split later in java/csharp... and moved to separate files */
 namespace general {
-/** members methods signature will be simpler as they won't have to pass parser,
- * filename & path */
-/** more features coming through the JavaGenerator, CSharpGenerator ...*/
 class GeneralGenerator : public BaseGenerator {
-public:
-  GeneralGenerator(const Parser &parser_, const std::string &path_,
-                   const std::string &file_name_)
-      : BaseGenerator(parser_, path_, file_name_){};
+ public:
+  GeneralGenerator(const Parser &parser, const std::string &path,
+                   const std::string &file_name)
+      : BaseGenerator(parser, path, file_name){};
   bool generate() {
- assert(parser.opts.lang <= IDLOptions::kMAX);
-  auto lang = language_parameters[parser.opts.lang];
-  std::string one_file_code;
+    assert(parser_.opts.lang <= IDLOptions::kMAX);
+    auto lang = language_parameters[parser_.opts.lang];
+    std::string one_file_code;
 
-  for (auto it = parser.enums_.vec.begin();
-       it != parser.enums_.vec.end(); ++it) {
-    std::string enumcode;
-    GenEnum(lang, parser, **it, &enumcode);
-    if (parser.opts.one_file) {
-      one_file_code += enumcode;
+    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
+         ++it) {
+      std::string enumcode;
+      GenEnum(lang, parser_, **it, &enumcode);
+      if (parser_.opts.one_file) {
+        one_file_code += enumcode;
+      } else {
+        if (!SaveClass(lang, parser_, (**it).name, enumcode, path_, false,
+                       false))
+          return false;
+      }
     }
-    else {
-      if (!SaveClass(lang, parser, (**it).name, enumcode, path, false, false))
-        return false;
-    }
-  }
 
-  for (auto it = parser.structs_.vec.begin();
-       it != parser.structs_.vec.end(); ++it) {
-    std::string declcode;
-    GenStruct(lang, parser, **it, &declcode);
-    if (parser.opts.one_file) {
-      one_file_code += declcode;
+    for (auto it = parser_.structs_.vec.begin();
+         it != parser_.structs_.vec.end(); ++it) {
+      std::string declcode;
+      GenStruct(lang, parser_, **it, &declcode);
+      if (parser_.opts.one_file) {
+        one_file_code += declcode;
+      } else {
+        if (!SaveClass(lang, parser_, (**it).name, declcode, path_, true,
+                       false))
+          return false;
+      }
     }
-    else {
-      if (!SaveClass(lang, parser, (**it).name, declcode, path, true, false))
-        return false;
-    }
-  }
 
-  if (parser.opts.one_file) {
-    return SaveClass(lang, parser, file_name, one_file_code,path, true, true);
-  }
-  return true;
+    if (parser_.opts.one_file) {
+      return SaveClass(lang, parser_, file_name_, one_file_code, path_, true,
+                       true);
+    }
+    return true;
   }
 };
-} // namespace general
+}  // namespace general
 
-bool GenerateGeneral(const Parser &parser,
-                     const std::string &path,
-                     const std::string & file_name) {
+bool GenerateGeneral(const Parser &parser, const std::string &path,
+                     const std::string &file_name) {
   general::GeneralGenerator *generator =
       new general::GeneralGenerator(parser, path, file_name);
   return generator->generate();
diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp
index 473e0fe60..f674d1f47 100644
--- a/src/idl_gen_go.cpp
+++ b/src/idl_gen_go.cpp
@@ -662,35 +662,32 @@ static void GenStructBuilder(const StructDef &struct_def,
 }
 
 class GoGenerator : public BaseGenerator {
-public:
-  GoGenerator(const Parser &parser_, const std::string &path_,
-              const std::string &file_name_)
-      : BaseGenerator(parser_, path_, file_name_){};
+ public:
+  GoGenerator(const Parser &parser, const std::string &path,
+              const std::string &file_name)
+      : BaseGenerator(parser, path, file_name){};
   bool generate() {
-  for (auto it = parser.enums_.vec.begin();
-       it != parser.enums_.vec.end(); ++it) {
-    std::string enumcode;
-    go::GenEnum(**it, &enumcode);
-    if (!go::SaveType(parser, **it, enumcode, path, false))
-      return false;
-  }
+    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
+         ++it) {
+      std::string enumcode;
+      go::GenEnum(**it, &enumcode);
+      if (!go::SaveType(parser_, **it, enumcode, path_, false)) return false;
+    }
 
-  for (auto it = parser.structs_.vec.begin();
-       it != parser.structs_.vec.end(); ++it) {
-    std::string declcode;
-    go::GenStruct(**it, &declcode, parser.root_struct_def_);
-    if (!go::SaveType(parser, **it, declcode, path, true))
-      return false;
-  }
+    for (auto it = parser_.structs_.vec.begin();
+         it != parser_.structs_.vec.end(); ++it) {
+      std::string declcode;
+      go::GenStruct(**it, &declcode, parser_.root_struct_def_);
+      if (!go::SaveType(parser_, **it, declcode, path_, true)) return false;
+    }
 
-  return true;
+    return true;
   }
 };
 }  // namespace go
 
-bool GenerateGo(const Parser &parser,
-                const std::string &path,
-                const std::string & file_name) {
+bool GenerateGo(const Parser &parser, const std::string &path,
+                const std::string &file_name) {
   go::GoGenerator *generator = new go::GoGenerator(parser, path, file_name);
   return generator->generate();
 }

From fdfaf233616a001f36717586917a12638b55d716 Mon Sep 17 00:00:00 2001
From: pjulien <pjulien@gmail.com>
Date: Sat, 16 Apr 2016 20:09:28 -0400
Subject: [PATCH 123/185] 3847

---
 .../google/flatbuffers/FlatBufferBuilder.java  |  8 ++++----
 java/com/google/flatbuffers/Table.java         | 18 ++++++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 java/com/google/flatbuffers/FlatBufferBuilder.java

diff --git a/java/com/google/flatbuffers/FlatBufferBuilder.java b/java/com/google/flatbuffers/FlatBufferBuilder.java
old mode 100644
new mode 100755
index e86471397..107da88d9
--- a/java/com/google/flatbuffers/FlatBufferBuilder.java
+++ b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -28,8 +28,7 @@ import java.nio.charset.Charset;
 
 /**
  * Class that helps you build a FlatBuffer.  See the section
- * @ref flatbuffers_guide_use_java_c-sharp "Use in Java/C#" in the
- * main FlatBuffers documentation.
+ * "Use in Java/C#" in the main FlatBuffers documentation.
  */
 public class FlatBufferBuilder {
     /// @cond FLATBUFFERS_INTERNAL
@@ -428,8 +427,7 @@ public class FlatBufferBuilder {
     * call this directly. The `FlatBuffers` compiler will generate helper methods
     * that call this method internally.
     * <p>
-    * For example, using the "Monster" code found on the
-    * @ref flatbuffers_guide_use_java_c-sharp "landing page". An
+    * For example, using the "Monster" code found on the "landing page". An
     * object of type `Monster` can be created using the following code:
     *
     * <pre>{@code
@@ -708,6 +706,8 @@ public class FlatBufferBuilder {
      * Get the ByteBuffer representing the FlatBuffer. Only call this after you've
      * called `finish()`. The actual data starts at the ByteBuffer's current position,
      * not necessarily at `0`.
+     *
+     * @return The {@link ByteBuffer} representing the FlatBuffer
      */
     public ByteBuffer dataBuffer() {
         finished();
diff --git a/java/com/google/flatbuffers/Table.java b/java/com/google/flatbuffers/Table.java
index 3d10012a8..36a9bcf90 100644
--- a/java/com/google/flatbuffers/Table.java
+++ b/java/com/google/flatbuffers/Table.java
@@ -113,9 +113,13 @@ public class Table {
   /**
    * Get a whole vector as a ByteBuffer.
    *
-   * This is efficient, since it only allocates a new bytebuffer object, but does not actually copy
-   * the data, it still refers to the same bytes as the original ByteBuffer. Also useful with nested
-   * FlatBuffers, etc.
+   * This is efficient, since it only allocates a new {@link ByteBuffer} object,
+   * but does not actually copy the data, it still refers to the same bytes
+   * as the original ByteBuffer. Also useful with nested FlatBuffers, etc.
+   *
+   * @param vector_offset The position of the vector in the byte buffer
+   * @param elem_size The size of each element in the array
+   * @return The {@link ByteBuffer} for the array
    */
   protected ByteBuffer __vector_as_bytebuffer(int vector_offset, int elem_size) {
     int o = __offset(vector_offset);
@@ -142,10 +146,12 @@ public class Table {
   }
 
   /**
-   * Check if a ByteBuffer contains a file identifier.
+   * Check if a {@link ByteBuffer} contains a file identifier.
    *
-   * @param bb A `ByteBuffer` to check if it contains the identifier `ident`.
-   * @param ident A `String` identifier of the flatbuffer file.
+   * @param bb A {@code ByteBuffer} to check if it contains the identifier
+   * `ident`.
+   * @param ident A `String` identifier of the FlatBuffer file.
+   * @return True if the buffer contains the file identifier
    */
   protected static boolean __has_identifier(ByteBuffer bb, String ident) {
     if (ident.length() != FILE_IDENTIFIER_LENGTH)

From 4d7890c2c912d926f5e7a11cc2106bb37b5f0158 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 18 Apr 2016 11:48:53 -0700
Subject: [PATCH 124/185] Fixed whole-number float default values missing a .0
 suffix.

A previous commit that added "f" for C++/Java/C# would break
on gcc of constants like 3f, which are now output as 3.0f

Tested: on Linux

Change-Id: If9cabbe3c6d6948a5050b8b123bda9c06e181f52
---
 src/idl_parser.cpp                |   4 ++++
 tests/MyGame/Example/Monster.cs   |   5 ++++-
 tests/MyGame/Example/Monster.go   |  11 ++++++++++-
 tests/MyGame/Example/Monster.java |   5 ++++-
 tests/MyGame/Example/Monster.php  |  26 +++++++++++++++++++++++---
 tests/MyGame/Example/Monster.py   |  10 +++++++++-
 tests/monster_test.bfbs           | Bin 2912 -> 2968 bytes
 tests/monster_test.fbs            |   1 +
 tests/monster_test_generated.h    |  13 ++++++++++---
 tests/monster_test_generated.js   |  18 +++++++++++++++++-
 tests/monsterdata_python_wire.mon | Bin 288 -> 288 bytes
 tests/monsterdata_test.mon        | Bin 384 -> 384 bytes
 12 files changed, 82 insertions(+), 11 deletions(-)

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index e0eaa5d6a..28fd6a377 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -543,6 +543,10 @@ CheckedError Parser::ParseField(StructDef &struct_def) {
     if (!IsScalar(type.base_type))
       return Error("default values currently only supported for scalars");
     ECHECK(ParseSingleValue(field->value));
+    if (IsFloat(field->value.type.base_type)) {
+      if (!strpbrk(field->value.constant.c_str(), ".eE"))
+        field->value.constant += ".0";
+    }
   }
 
   if (type.enum_def &&
diff --git a/tests/MyGame/Example/Monster.cs b/tests/MyGame/Example/Monster.cs
index e53afcc64..cd39d9515 100644
--- a/tests/MyGame/Example/Monster.cs
+++ b/tests/MyGame/Example/Monster.cs
@@ -74,8 +74,10 @@ public sealed class Monster : Table {
   public bool MutateTestarrayofbools(int j, bool testarrayofbools) { int o = __offset(52); if (o != 0) { bb.Put(__vector(o) + j * 1, (byte)(testarrayofbools ? 1 : 0)); return true; } else { return false; } }
   public float Testf { get { int o = __offset(54); return o != 0 ? bb.GetFloat(o + bb_pos) : (float)3.14159f; } }
   public bool MutateTestf(float testf) { int o = __offset(54); if (o != 0) { bb.PutFloat(o + bb_pos, testf); return true; } else { return false; } }
+  public float Testf2 { get { int o = __offset(56); return o != 0 ? bb.GetFloat(o + bb_pos) : (float)3.0f; } }
+  public bool MutateTestf2(float testf2) { int o = __offset(56); if (o != 0) { bb.PutFloat(o + bb_pos, testf2); return true; } else { return false; } }
 
-  public static void StartMonster(FlatBufferBuilder builder) { builder.StartObject(26); }
+  public static void StartMonster(FlatBufferBuilder builder) { builder.StartObject(27); }
   public static void AddPos(FlatBufferBuilder builder, Offset<Vec3> posOffset) { builder.AddStruct(0, posOffset.Value, 0); }
   public static void AddMana(FlatBufferBuilder builder, short mana) { builder.AddShort(1, mana, 150); }
   public static void AddHp(FlatBufferBuilder builder, short hp) { builder.AddShort(2, hp, 100); }
@@ -112,6 +114,7 @@ public sealed class Monster : Table {
   public static VectorOffset CreateTestarrayofboolsVector(FlatBufferBuilder builder, bool[] data) { builder.StartVector(1, data.Length, 1); for (int i = data.Length - 1; i >= 0; i--) builder.AddBool(data[i]); return builder.EndVector(); }
   public static void StartTestarrayofboolsVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(1, numElems, 1); }
   public static void AddTestf(FlatBufferBuilder builder, float testf) { builder.AddFloat(25, testf, 3.14159f); }
+  public static void AddTestf2(FlatBufferBuilder builder, float testf2) { builder.AddFloat(26, testf2, 3.0f); }
   public static Offset<Monster> EndMonster(FlatBufferBuilder builder) {
     int o = builder.EndObject();
     builder.Required(o, 10);  // name
diff --git a/tests/MyGame/Example/Monster.go b/tests/MyGame/Example/Monster.go
index afdfe42d7..4de8fdc48 100644
--- a/tests/MyGame/Example/Monster.go
+++ b/tests/MyGame/Example/Monster.go
@@ -321,7 +321,15 @@ func (rcv *Monster) Testf() float32 {
 	return 3.14159
 }
 
-func MonsterStart(builder *flatbuffers.Builder) { builder.StartObject(26) }
+func (rcv *Monster) Testf2() float32 {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(56))
+	if o != 0 {
+		return rcv._tab.GetFloat32(o + rcv._tab.Pos)
+	}
+	return 3.0
+}
+
+func MonsterStart(builder *flatbuffers.Builder) { builder.StartObject(27) }
 func MonsterAddPos(builder *flatbuffers.Builder, pos flatbuffers.UOffsetT) { builder.PrependStructSlot(0, flatbuffers.UOffsetT(pos), 0) }
 func MonsterAddMana(builder *flatbuffers.Builder, mana int16) { builder.PrependInt16Slot(1, mana, 150) }
 func MonsterAddHp(builder *flatbuffers.Builder, hp int16) { builder.PrependInt16Slot(2, hp, 100) }
@@ -359,4 +367,5 @@ func MonsterAddTestarrayofbools(builder *flatbuffers.Builder, testarrayofbools f
 func MonsterStartTestarrayofboolsVector(builder *flatbuffers.Builder, numElems int) flatbuffers.UOffsetT { return builder.StartVector(1, numElems, 1)
 }
 func MonsterAddTestf(builder *flatbuffers.Builder, testf float32) { builder.PrependFloat32Slot(25, testf, 3.14159) }
+func MonsterAddTestf2(builder *flatbuffers.Builder, testf2 float32) { builder.PrependFloat32Slot(26, testf2, 3.0) }
 func MonsterEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT { return builder.EndObject() }
diff --git a/tests/MyGame/Example/Monster.java b/tests/MyGame/Example/Monster.java
index 0b9a29d1f..487eba6eb 100644
--- a/tests/MyGame/Example/Monster.java
+++ b/tests/MyGame/Example/Monster.java
@@ -80,8 +80,10 @@ public final class Monster extends Table {
   public boolean mutateTestarrayofbools(int j, boolean testarrayofbools) { int o = __offset(52); if (o != 0) { bb.put(__vector(o) + j * 1, (byte)(testarrayofbools ? 1 : 0)); return true; } else { return false; } }
   public float testf() { int o = __offset(54); return o != 0 ? bb.getFloat(o + bb_pos) : 3.14159f; }
   public boolean mutateTestf(float testf) { int o = __offset(54); if (o != 0) { bb.putFloat(o + bb_pos, testf); return true; } else { return false; } }
+  public float testf2() { int o = __offset(56); return o != 0 ? bb.getFloat(o + bb_pos) : 3.0f; }
+  public boolean mutateTestf2(float testf2) { int o = __offset(56); if (o != 0) { bb.putFloat(o + bb_pos, testf2); return true; } else { return false; } }
 
-  public static void startMonster(FlatBufferBuilder builder) { builder.startObject(26); }
+  public static void startMonster(FlatBufferBuilder builder) { builder.startObject(27); }
   public static void addPos(FlatBufferBuilder builder, int posOffset) { builder.addStruct(0, posOffset, 0); }
   public static void addMana(FlatBufferBuilder builder, short mana) { builder.addShort(1, mana, 150); }
   public static void addHp(FlatBufferBuilder builder, short hp) { builder.addShort(2, hp, 100); }
@@ -118,6 +120,7 @@ public final class Monster extends Table {
   public static int createTestarrayofboolsVector(FlatBufferBuilder builder, boolean[] data) { builder.startVector(1, data.length, 1); for (int i = data.length - 1; i >= 0; i--) builder.addBoolean(data[i]); return builder.endVector(); }
   public static void startTestarrayofboolsVector(FlatBufferBuilder builder, int numElems) { builder.startVector(1, numElems, 1); }
   public static void addTestf(FlatBufferBuilder builder, float testf) { builder.addFloat(25, testf, 3.14159f); }
+  public static void addTestf2(FlatBufferBuilder builder, float testf2) { builder.addFloat(26, testf2, 3.0f); }
   public static int endMonster(FlatBufferBuilder builder) {
     int o = builder.endObject();
     builder.required(o, 10);  // name
diff --git a/tests/MyGame/Example/Monster.php b/tests/MyGame/Example/Monster.php
index 70f4d34e6..e02413879 100644
--- a/tests/MyGame/Example/Monster.php
+++ b/tests/MyGame/Example/Monster.php
@@ -342,22 +342,31 @@ class Monster extends Table
         return $o != 0 ? $this->bb->getFloat($o + $this->bb_pos) : 3.14159;
     }
 
+    /**
+     * @return float
+     */
+    public function getTestf2()
+    {
+        $o = $this->__offset(56);
+        return $o != 0 ? $this->bb->getFloat($o + $this->bb_pos) : 3.0;
+    }
+
     /**
      * @param FlatBufferBuilder $builder
      * @return void
      */
     public static function startMonster(FlatBufferBuilder $builder)
     {
-        $builder->StartObject(26);
+        $builder->StartObject(27);
     }
 
     /**
      * @param FlatBufferBuilder $builder
      * @return Monster
      */
-    public static function createMonster(FlatBufferBuilder $builder, $pos, $mana, $hp, $name, $inventory, $color, $test_type, $test, $test4, $testarrayofstring, $testarrayoftables, $enemy, $testnestedflatbuffer, $testempty, $testbool, $testhashs32_fnv1, $testhashu32_fnv1, $testhashs64_fnv1, $testhashu64_fnv1, $testhashs32_fnv1a, $testhashu32_fnv1a, $testhashs64_fnv1a, $testhashu64_fnv1a, $testarrayofbools, $testf)
+    public static function createMonster(FlatBufferBuilder $builder, $pos, $mana, $hp, $name, $inventory, $color, $test_type, $test, $test4, $testarrayofstring, $testarrayoftables, $enemy, $testnestedflatbuffer, $testempty, $testbool, $testhashs32_fnv1, $testhashu32_fnv1, $testhashs64_fnv1, $testhashu64_fnv1, $testhashs32_fnv1a, $testhashu32_fnv1a, $testhashs64_fnv1a, $testhashu64_fnv1a, $testarrayofbools, $testf, $testf2)
     {
-        $builder->startObject(26);
+        $builder->startObject(27);
         self::addPos($builder, $pos);
         self::addMana($builder, $mana);
         self::addHp($builder, $hp);
@@ -383,6 +392,7 @@ class Monster extends Table
         self::addTesthashu64Fnv1a($builder, $testhashu64_fnv1a);
         self::addTestarrayofbools($builder, $testarrayofbools);
         self::addTestf($builder, $testf);
+        self::addTestf2($builder, $testf2);
         $o = $builder->endObject();
         $builder->required($o, 10);  // name
         return $o;
@@ -777,6 +787,16 @@ class Monster extends Table
         $builder->addFloatX(25, $testf, 3.14159);
     }
 
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param float
+     * @return void
+     */
+    public static function addTestf2(FlatBufferBuilder $builder, $testf2)
+    {
+        $builder->addFloatX(26, $testf2, 3.0);
+    }
+
     /**
      * @param FlatBufferBuilder $builder
      * @return int table offset
diff --git a/tests/MyGame/Example/Monster.py b/tests/MyGame/Example/Monster.py
index 8a19b24fb..2e7c000ed 100644
--- a/tests/MyGame/Example/Monster.py
+++ b/tests/MyGame/Example/Monster.py
@@ -269,7 +269,14 @@ class Monster(object):
             return self._tab.Get(flatbuffers.number_types.Float32Flags, o + self._tab.Pos)
         return 3.14159
 
-def MonsterStart(builder): builder.StartObject(26)
+    # Monster
+    def Testf2(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(56))
+        if o != 0:
+            return self._tab.Get(flatbuffers.number_types.Float32Flags, o + self._tab.Pos)
+        return 3.0
+
+def MonsterStart(builder): builder.StartObject(27)
 def MonsterAddPos(builder, pos): builder.PrependStructSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(pos), 0)
 def MonsterAddMana(builder, mana): builder.PrependInt16Slot(1, mana, 150)
 def MonsterAddHp(builder, hp): builder.PrependInt16Slot(2, hp, 100)
@@ -301,4 +308,5 @@ def MonsterAddTesthashu64Fnv1a(builder, testhashu64Fnv1a): builder.PrependUint64
 def MonsterAddTestarrayofbools(builder, testarrayofbools): builder.PrependUOffsetTRelativeSlot(24, flatbuffers.number_types.UOffsetTFlags.py_type(testarrayofbools), 0)
 def MonsterStartTestarrayofboolsVector(builder, numElems): return builder.StartVector(1, numElems, 1)
 def MonsterAddTestf(builder, testf): builder.PrependFloat32Slot(25, testf, 3.14159)
+def MonsterAddTestf2(builder, testf2): builder.PrependFloat32Slot(26, testf2, 3.0)
 def MonsterEnd(builder): return builder.EndObject()
diff --git a/tests/monster_test.bfbs b/tests/monster_test.bfbs
index 084798598be104aec8b445d97c35e37acb01939d..16a5bff54486d2a74df2898b54792caf71a1676a 100644
GIT binary patch
delta 364
zcmYk2F)su`6vyA&L)P6%w!ke%j!v<Xjf#-CM$jCI<|HDT6_o_rleiDCn`uPl3lIs#
zeE=GX<VuA?M5$1bD2(4+Atw3F|Gjzt$$K*|!)KK&nx61P`a~o|BVVLd6nXC#iAy4P
z<OOOmyg`<4Zs>V_S<{{TaZ&4LKr2JvKi2k8bTrl)ONeZnIjxQC5iLLf51-Z|1!a3R
z2Rc4qltJ#$LFm}^Fu~vIC0agAl6|VdKVO-1HTQa|v03%1$5rx()**9VpiM5WqZwL;
zwu4#=o}i6?1r1<}h9{76HU(qEO$NM$5AtU;gcPpHowsAH9hF&T$1gI8xaHT~?*1`N
Tj?&#3k*lxngG)CZFY|u^zJNL+

delta 303
zcmW-dAy30l6h^<>0viMpM8|-Y%pfWtL10Lh3^CjoOHfM?3qfM|0R$2%Cup8Q5EK#=
z`~ZSO%p)cUnV6U)VQP<4#Odkl{o4Dbcjd2@+pX<5kme*s_@^K>7o^vDX@Yx2DP*<-
zL+E9lV|&P+tCnQ_y4Bp0l}pp9_cIK0T1Tw|q*J$N)wM2nyRZzwulFc4F7NKbHrV;?
zy?6H(mm*$fm00;7&O>q^c4KGmFsNLubDU6QNXK*bY|ctCKEa<j#VPYPJVHu7!UOUN
nG-01-V?LZf3U8dB@CY~XHExqzRZN#f8s&c_udbI$cv<`dH;FQ0

diff --git a/tests/monster_test.fbs b/tests/monster_test.fbs
index 28a4d5a03..014f8fc72 100755
--- a/tests/monster_test.fbs
+++ b/tests/monster_test.fbs
@@ -60,6 +60,7 @@ table Monster {
   testhashs64_fnv1a:long (id:22, hash:"fnv1a_64");
   testhashu64_fnv1a:ulong (id:23, hash:"fnv1a_64");
   testf:float = 3.14159 (id:25);
+  testf2:float = 3 (id:26);
 }
 
 rpc_service MonsterStorage {
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index f66f4c5dd..9fe72f0cd 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -204,7 +204,8 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
     VT_TESTHASHS64_FNV1A = 48,
     VT_TESTHASHU64_FNV1A = 50,
     VT_TESTARRAYOFBOOLS = 52,
-    VT_TESTF = 54
+    VT_TESTF = 54,
+    VT_TESTF2 = 56
   };
   const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
   Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
@@ -261,6 +262,8 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   flatbuffers::Vector<uint8_t> *mutable_testarrayofbools() { return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_TESTARRAYOFBOOLS); }
   float testf() const { return GetField<float>(VT_TESTF, 3.14159f); }
   bool mutate_testf(float _testf) { return SetField(VT_TESTF, _testf); }
+  float testf2() const { return GetField<float>(VT_TESTF2, 3.0f); }
+  bool mutate_testf2(float _testf2) { return SetField(VT_TESTF2, _testf2); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<Vec3>(verifier, VT_POS) &&
@@ -300,6 +303,7 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_TESTARRAYOFBOOLS) &&
            verifier.Verify(testarrayofbools()) &&
            VerifyField<float>(verifier, VT_TESTF) &&
+           VerifyField<float>(verifier, VT_TESTF2) &&
            verifier.EndTable();
   }
 };
@@ -332,10 +336,11 @@ struct MonsterBuilder {
   void add_testhashu64_fnv1a(uint64_t testhashu64_fnv1a) { fbb_.AddElement<uint64_t>(Monster::VT_TESTHASHU64_FNV1A, testhashu64_fnv1a, 0); }
   void add_testarrayofbools(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testarrayofbools) { fbb_.AddOffset(Monster::VT_TESTARRAYOFBOOLS, testarrayofbools); }
   void add_testf(float testf) { fbb_.AddElement<float>(Monster::VT_TESTF, testf, 3.14159f); }
+  void add_testf2(float testf2) { fbb_.AddElement<float>(Monster::VT_TESTF2, testf2, 3.0f); }
   MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   MonsterBuilder &operator=(const MonsterBuilder &);
   flatbuffers::Offset<Monster> Finish() {
-    auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 26));
+    auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 27));
     fbb_.Required(o, Monster::VT_NAME);  // name
     return o;
   }
@@ -366,12 +371,14 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
    int64_t testhashs64_fnv1a = 0,
    uint64_t testhashu64_fnv1a = 0,
    flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testarrayofbools = 0,
-   float testf = 3.14159f) {
+   float testf = 3.14159f,
+   float testf2 = 3.0f) {
   MonsterBuilder builder_(_fbb);
   builder_.add_testhashu64_fnv1a(testhashu64_fnv1a);
   builder_.add_testhashs64_fnv1a(testhashs64_fnv1a);
   builder_.add_testhashu64_fnv1(testhashu64_fnv1);
   builder_.add_testhashs64_fnv1(testhashs64_fnv1);
+  builder_.add_testf2(testf2);
   builder_.add_testf(testf);
   builder_.add_testarrayofbools(testarrayofbools);
   builder_.add_testhashu32_fnv1a(testhashu32_fnv1a);
diff --git a/tests/monster_test_generated.js b/tests/monster_test_generated.js
index c13246ed5..eed24b5ea 100644
--- a/tests/monster_test_generated.js
+++ b/tests/monster_test_generated.js
@@ -685,11 +685,19 @@ MyGame.Example.Monster.prototype.testf = function() {
   return offset ? this.bb.readFloat32(this.bb_pos + offset) : 3.14159;
 };
 
+/**
+ * @returns {number}
+ */
+MyGame.Example.Monster.prototype.testf2 = function() {
+  var offset = this.bb.__offset(this.bb_pos, 56);
+  return offset ? this.bb.readFloat32(this.bb_pos + offset) : 3.0;
+};
+
 /**
  * @param {flatbuffers.Builder} builder
  */
 MyGame.Example.Monster.startMonster = function(builder) {
-  builder.startObject(26);
+  builder.startObject(27);
 };
 
 /**
@@ -1005,6 +1013,14 @@ MyGame.Example.Monster.addTestf = function(builder, testf) {
   builder.addFieldFloat32(25, testf, 3.14159);
 };
 
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {number} testf2
+ */
+MyGame.Example.Monster.addTestf2 = function(builder, testf2) {
+  builder.addFieldFloat32(26, testf2, 3.0);
+};
+
 /**
  * @param {flatbuffers.Builder} builder
  * @returns {flatbuffers.Offset}
diff --git a/tests/monsterdata_python_wire.mon b/tests/monsterdata_python_wire.mon
index a574e3108e1e4c8d0a226480929925a6495efda6..8cc54d795aeba99ee343d106fe92309e423e52f1 100644
GIT binary patch
delta 70
zcmZ3$w1A1zfdK@p7+fZDn{tB~3=9rH>@m^PTAB&Sr~%>}AO^AJ7&I8T7({?9tBDKE
JnL*S|cK|@K3A+FQ

delta 70
zcmZ3$w1A1*fdK+67(6C&nsQnIc`iWgGttvp79_(2#1%lC0cFcEXfSXwh%i`8oNvx(
IG4ZB505#1Cvj6}9

diff --git a/tests/monsterdata_test.mon b/tests/monsterdata_test.mon
index ef04a53951641b737132ba4f3bab4c5e0f93737e..4c032bcfeae89ef809a3cd19c47d8fd381b1481d 100644
GIT binary patch
delta 79
zcmZo*ZeSMlU|?YI_4f+~Qb1tE&@fThlo`mF=xNW{02GM;Vuy(ng&9>QE>-3P$}lhj
U;jW2Sok6N5OEQ{+=|Dz(04D|xJpcdz

delta 79
zcmZo*ZeSMnU|?YI_4f+~Qea@g&@xfbl+j|Mr#)v2P$UM3T_#QxX4IItRGAl~gc*n#
VfpE{ni_VM|lf@a$fn*?~J^&gv4nqI{


From 286587d1516376f24072f9c88b1d68e46b01e642 Mon Sep 17 00:00:00 2001
From: pjulien <pjulien@gmail.com>
Date: Mon, 18 Apr 2016 20:02:27 -0400
Subject: [PATCH 125/185] Fix for #3853

Removes the following allocations:
- ``CharsetDecoder`` is reused between calls
- ``CharBuffer#wrap`` removed in favor of heap
  based char buffer that is reused
- Temporary ``char[]``, an intermediate copy inside ``StringCoding``
- Another ``char[]``, this is needed because ``StringCoding`` uses
  a ``CharBuffer`` internally but returns a ``char[]``.  Extra
  characters need to be trimmed so this means yet another allocation
- Yet another ``char[]`` directly from ``__string`` for non-heap
  based buffers

Removes the following copies
- No copy is performed to trim the allocation since a ``CharBuffer``
  is used directly
- For non-heap based byte buffers, removes the copy that was
  previously done in the __string function

This does need to get the TLS entry which implies at least some
contention on the thread object table and a fence.
---
 java/com/google/flatbuffers/Table.java | 50 +++++++++++++++++++-------
 1 file changed, 38 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 java/com/google/flatbuffers/Table.java

diff --git a/java/com/google/flatbuffers/Table.java b/java/com/google/flatbuffers/Table.java
old mode 100644
new mode 100755
index 36a9bcf90..f6ae4706b
--- a/java/com/google/flatbuffers/Table.java
+++ b/java/com/google/flatbuffers/Table.java
@@ -19,6 +19,11 @@ package com.google.flatbuffers;
 import static com.google.flatbuffers.Constants.*;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
 
 /// @cond FLATBUFFERS_INTERNAL
 
@@ -26,6 +31,13 @@ import java.nio.ByteOrder;
  * All tables in the generated code derive from this class, and add their own accessors.
  */
 public class Table {
+  private final static ThreadLocal<CharsetDecoder> UTF8_DECODER = new ThreadLocal<CharsetDecoder>() {
+    @Override
+    protected CharsetDecoder initialValue() {
+      return Charset.forName("UTF-8").newDecoder();
+    }
+  };
+  private final static ThreadLocal<CharBuffer> CHAR_BUFFER = new ThreadLocal<CharBuffer>();
   /** Used to hold the position of the `bb` buffer. */
   protected int bb_pos;
   /** The underlying ByteBuffer to hold the data of the Table. */
@@ -71,20 +83,34 @@ public class Table {
    * @return Returns a `String` from the data stored inside the FlatBuffer at `offset`.
    */
   protected String __string(int offset) {
+    CharsetDecoder decoder = UTF8_DECODER.get();
+    decoder.reset();
+
     offset += bb.getInt(offset);
-    if (bb.hasArray()) {
-      return new String(bb.array(), bb.arrayOffset() + offset + SIZEOF_INT, bb.getInt(offset),
-                        FlatBufferBuilder.utf8charset);
-    } else {
-      // We can't access .array(), since the ByteBuffer is read-only,
-      // off-heap or a memory map
-      ByteBuffer bb = this.bb.duplicate().order(ByteOrder.LITTLE_ENDIAN);
-      // We're forced to make an extra copy:
-      byte[] copy = new byte[bb.getInt(offset)];
-      bb.position(offset + SIZEOF_INT);
-      bb.get(copy);
-      return new String(copy, 0, copy.length, FlatBufferBuilder.utf8charset);
+    ByteBuffer src = bb.duplicate().order(ByteOrder.LITTLE_ENDIAN);
+    int length = src.getInt(offset);
+    src.position(offset + SIZEOF_INT);
+    src.limit(offset + SIZEOF_INT + length);
+
+    int required = (int)((float)length * decoder.maxCharsPerByte());
+    CharBuffer dst = CHAR_BUFFER.get();
+    if (dst == null || dst.capacity() < required) {
+      dst = CharBuffer.allocate(Math.max(required, 128));
+      CHAR_BUFFER.set(dst);
     }
+
+    dst.clear();
+
+    try {
+      CoderResult cr = decoder.decode(src, dst, true);
+      if (!cr.isUnderflow()) {
+        cr.throwException();
+      }
+    } catch (CharacterCodingException x) {
+      throw new Error(x);
+    }
+
+    return dst.flip().toString();
   }
 
   /**

From b0146b3d9a0e5f48269ad5186dc9c75023685b85 Mon Sep 17 00:00:00 2001
From: pjulien <pjulien@gmail.com>
Date: Mon, 18 Apr 2016 20:19:56 -0400
Subject: [PATCH 126/185] fix file permission

---
 java/com/google/flatbuffers/Table.java | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 java/com/google/flatbuffers/Table.java

diff --git a/java/com/google/flatbuffers/Table.java b/java/com/google/flatbuffers/Table.java
old mode 100755
new mode 100644

From 9fb87f813b77f4dbb96ae8fa9420f5f77b247489 Mon Sep 17 00:00:00 2001
From: pjulien <pjulien@gmail.com>
Date: Mon, 18 Apr 2016 21:43:28 -0400
Subject: [PATCH 127/185] size the allocation to the required bytes

---
 java/com/google/flatbuffers/Table.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/com/google/flatbuffers/Table.java b/java/com/google/flatbuffers/Table.java
index f6ae4706b..408765420 100644
--- a/java/com/google/flatbuffers/Table.java
+++ b/java/com/google/flatbuffers/Table.java
@@ -95,7 +95,7 @@ public class Table {
     int required = (int)((float)length * decoder.maxCharsPerByte());
     CharBuffer dst = CHAR_BUFFER.get();
     if (dst == null || dst.capacity() < required) {
-      dst = CharBuffer.allocate(Math.max(required, 128));
+      dst = CharBuffer.allocate(required);
       CHAR_BUFFER.set(dst);
     }
 

From fd542c71e35774f640073cb6fb3fa939d2f19f87 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 20 Apr 2016 12:05:21 -0700
Subject: [PATCH 128/185] Fixed float suffix not being added on implicit float
 defaults.

Change-Id: I8dcbb5e93836356511d411ef86452babd3dd3c0b
Tested: on Linux.
---
 src/idl_parser.cpp                |   8 ++++----
 tests/MyGame/Example/Monster.cs   |   5 ++++-
 tests/MyGame/Example/Monster.go   |  11 ++++++++++-
 tests/MyGame/Example/Monster.java |   5 ++++-
 tests/MyGame/Example/Monster.php  |  26 +++++++++++++++++++++++---
 tests/MyGame/Example/Monster.py   |  10 +++++++++-
 tests/monster_test.bfbs           | Bin 2968 -> 3008 bytes
 tests/monster_test.fbs            |   1 +
 tests/monster_test_generated.h    |  13 ++++++++++---
 tests/monster_test_generated.js   |  18 +++++++++++++++++-
 tests/monsterdata_test.mon        | Bin 384 -> 384 bytes
 11 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 28fd6a377..4c7820933 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -543,10 +543,10 @@ CheckedError Parser::ParseField(StructDef &struct_def) {
     if (!IsScalar(type.base_type))
       return Error("default values currently only supported for scalars");
     ECHECK(ParseSingleValue(field->value));
-    if (IsFloat(field->value.type.base_type)) {
-      if (!strpbrk(field->value.constant.c_str(), ".eE"))
-        field->value.constant += ".0";
-    }
+  }
+  if (IsFloat(field->value.type.base_type)) {
+    if (!strpbrk(field->value.constant.c_str(), ".eE"))
+      field->value.constant += ".0";
   }
 
   if (type.enum_def &&
diff --git a/tests/MyGame/Example/Monster.cs b/tests/MyGame/Example/Monster.cs
index cd39d9515..abe95ec84 100644
--- a/tests/MyGame/Example/Monster.cs
+++ b/tests/MyGame/Example/Monster.cs
@@ -76,8 +76,10 @@ public sealed class Monster : Table {
   public bool MutateTestf(float testf) { int o = __offset(54); if (o != 0) { bb.PutFloat(o + bb_pos, testf); return true; } else { return false; } }
   public float Testf2 { get { int o = __offset(56); return o != 0 ? bb.GetFloat(o + bb_pos) : (float)3.0f; } }
   public bool MutateTestf2(float testf2) { int o = __offset(56); if (o != 0) { bb.PutFloat(o + bb_pos, testf2); return true; } else { return false; } }
+  public float Testf3 { get { int o = __offset(58); return o != 0 ? bb.GetFloat(o + bb_pos) : (float)0.0f; } }
+  public bool MutateTestf3(float testf3) { int o = __offset(58); if (o != 0) { bb.PutFloat(o + bb_pos, testf3); return true; } else { return false; } }
 
-  public static void StartMonster(FlatBufferBuilder builder) { builder.StartObject(27); }
+  public static void StartMonster(FlatBufferBuilder builder) { builder.StartObject(28); }
   public static void AddPos(FlatBufferBuilder builder, Offset<Vec3> posOffset) { builder.AddStruct(0, posOffset.Value, 0); }
   public static void AddMana(FlatBufferBuilder builder, short mana) { builder.AddShort(1, mana, 150); }
   public static void AddHp(FlatBufferBuilder builder, short hp) { builder.AddShort(2, hp, 100); }
@@ -115,6 +117,7 @@ public sealed class Monster : Table {
   public static void StartTestarrayofboolsVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(1, numElems, 1); }
   public static void AddTestf(FlatBufferBuilder builder, float testf) { builder.AddFloat(25, testf, 3.14159f); }
   public static void AddTestf2(FlatBufferBuilder builder, float testf2) { builder.AddFloat(26, testf2, 3.0f); }
+  public static void AddTestf3(FlatBufferBuilder builder, float testf3) { builder.AddFloat(27, testf3, 0.0f); }
   public static Offset<Monster> EndMonster(FlatBufferBuilder builder) {
     int o = builder.EndObject();
     builder.Required(o, 10);  // name
diff --git a/tests/MyGame/Example/Monster.go b/tests/MyGame/Example/Monster.go
index 4de8fdc48..5aa4a73e9 100644
--- a/tests/MyGame/Example/Monster.go
+++ b/tests/MyGame/Example/Monster.go
@@ -329,7 +329,15 @@ func (rcv *Monster) Testf2() float32 {
 	return 3.0
 }
 
-func MonsterStart(builder *flatbuffers.Builder) { builder.StartObject(27) }
+func (rcv *Monster) Testf3() float32 {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(58))
+	if o != 0 {
+		return rcv._tab.GetFloat32(o + rcv._tab.Pos)
+	}
+	return 0.0
+}
+
+func MonsterStart(builder *flatbuffers.Builder) { builder.StartObject(28) }
 func MonsterAddPos(builder *flatbuffers.Builder, pos flatbuffers.UOffsetT) { builder.PrependStructSlot(0, flatbuffers.UOffsetT(pos), 0) }
 func MonsterAddMana(builder *flatbuffers.Builder, mana int16) { builder.PrependInt16Slot(1, mana, 150) }
 func MonsterAddHp(builder *flatbuffers.Builder, hp int16) { builder.PrependInt16Slot(2, hp, 100) }
@@ -368,4 +376,5 @@ func MonsterStartTestarrayofboolsVector(builder *flatbuffers.Builder, numElems i
 }
 func MonsterAddTestf(builder *flatbuffers.Builder, testf float32) { builder.PrependFloat32Slot(25, testf, 3.14159) }
 func MonsterAddTestf2(builder *flatbuffers.Builder, testf2 float32) { builder.PrependFloat32Slot(26, testf2, 3.0) }
+func MonsterAddTestf3(builder *flatbuffers.Builder, testf3 float32) { builder.PrependFloat32Slot(27, testf3, 0.0) }
 func MonsterEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT { return builder.EndObject() }
diff --git a/tests/MyGame/Example/Monster.java b/tests/MyGame/Example/Monster.java
index 487eba6eb..69c975436 100644
--- a/tests/MyGame/Example/Monster.java
+++ b/tests/MyGame/Example/Monster.java
@@ -82,8 +82,10 @@ public final class Monster extends Table {
   public boolean mutateTestf(float testf) { int o = __offset(54); if (o != 0) { bb.putFloat(o + bb_pos, testf); return true; } else { return false; } }
   public float testf2() { int o = __offset(56); return o != 0 ? bb.getFloat(o + bb_pos) : 3.0f; }
   public boolean mutateTestf2(float testf2) { int o = __offset(56); if (o != 0) { bb.putFloat(o + bb_pos, testf2); return true; } else { return false; } }
+  public float testf3() { int o = __offset(58); return o != 0 ? bb.getFloat(o + bb_pos) : 0.0f; }
+  public boolean mutateTestf3(float testf3) { int o = __offset(58); if (o != 0) { bb.putFloat(o + bb_pos, testf3); return true; } else { return false; } }
 
-  public static void startMonster(FlatBufferBuilder builder) { builder.startObject(27); }
+  public static void startMonster(FlatBufferBuilder builder) { builder.startObject(28); }
   public static void addPos(FlatBufferBuilder builder, int posOffset) { builder.addStruct(0, posOffset, 0); }
   public static void addMana(FlatBufferBuilder builder, short mana) { builder.addShort(1, mana, 150); }
   public static void addHp(FlatBufferBuilder builder, short hp) { builder.addShort(2, hp, 100); }
@@ -121,6 +123,7 @@ public final class Monster extends Table {
   public static void startTestarrayofboolsVector(FlatBufferBuilder builder, int numElems) { builder.startVector(1, numElems, 1); }
   public static void addTestf(FlatBufferBuilder builder, float testf) { builder.addFloat(25, testf, 3.14159f); }
   public static void addTestf2(FlatBufferBuilder builder, float testf2) { builder.addFloat(26, testf2, 3.0f); }
+  public static void addTestf3(FlatBufferBuilder builder, float testf3) { builder.addFloat(27, testf3, 0.0f); }
   public static int endMonster(FlatBufferBuilder builder) {
     int o = builder.endObject();
     builder.required(o, 10);  // name
diff --git a/tests/MyGame/Example/Monster.php b/tests/MyGame/Example/Monster.php
index e02413879..879b76247 100644
--- a/tests/MyGame/Example/Monster.php
+++ b/tests/MyGame/Example/Monster.php
@@ -351,22 +351,31 @@ class Monster extends Table
         return $o != 0 ? $this->bb->getFloat($o + $this->bb_pos) : 3.0;
     }
 
+    /**
+     * @return float
+     */
+    public function getTestf3()
+    {
+        $o = $this->__offset(58);
+        return $o != 0 ? $this->bb->getFloat($o + $this->bb_pos) : 0.0;
+    }
+
     /**
      * @param FlatBufferBuilder $builder
      * @return void
      */
     public static function startMonster(FlatBufferBuilder $builder)
     {
-        $builder->StartObject(27);
+        $builder->StartObject(28);
     }
 
     /**
      * @param FlatBufferBuilder $builder
      * @return Monster
      */
-    public static function createMonster(FlatBufferBuilder $builder, $pos, $mana, $hp, $name, $inventory, $color, $test_type, $test, $test4, $testarrayofstring, $testarrayoftables, $enemy, $testnestedflatbuffer, $testempty, $testbool, $testhashs32_fnv1, $testhashu32_fnv1, $testhashs64_fnv1, $testhashu64_fnv1, $testhashs32_fnv1a, $testhashu32_fnv1a, $testhashs64_fnv1a, $testhashu64_fnv1a, $testarrayofbools, $testf, $testf2)
+    public static function createMonster(FlatBufferBuilder $builder, $pos, $mana, $hp, $name, $inventory, $color, $test_type, $test, $test4, $testarrayofstring, $testarrayoftables, $enemy, $testnestedflatbuffer, $testempty, $testbool, $testhashs32_fnv1, $testhashu32_fnv1, $testhashs64_fnv1, $testhashu64_fnv1, $testhashs32_fnv1a, $testhashu32_fnv1a, $testhashs64_fnv1a, $testhashu64_fnv1a, $testarrayofbools, $testf, $testf2, $testf3)
     {
-        $builder->startObject(27);
+        $builder->startObject(28);
         self::addPos($builder, $pos);
         self::addMana($builder, $mana);
         self::addHp($builder, $hp);
@@ -393,6 +402,7 @@ class Monster extends Table
         self::addTestarrayofbools($builder, $testarrayofbools);
         self::addTestf($builder, $testf);
         self::addTestf2($builder, $testf2);
+        self::addTestf3($builder, $testf3);
         $o = $builder->endObject();
         $builder->required($o, 10);  // name
         return $o;
@@ -797,6 +807,16 @@ class Monster extends Table
         $builder->addFloatX(26, $testf2, 3.0);
     }
 
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param float
+     * @return void
+     */
+    public static function addTestf3(FlatBufferBuilder $builder, $testf3)
+    {
+        $builder->addFloatX(27, $testf3, 0.0);
+    }
+
     /**
      * @param FlatBufferBuilder $builder
      * @return int table offset
diff --git a/tests/MyGame/Example/Monster.py b/tests/MyGame/Example/Monster.py
index 2e7c000ed..42b79939b 100644
--- a/tests/MyGame/Example/Monster.py
+++ b/tests/MyGame/Example/Monster.py
@@ -276,7 +276,14 @@ class Monster(object):
             return self._tab.Get(flatbuffers.number_types.Float32Flags, o + self._tab.Pos)
         return 3.0
 
-def MonsterStart(builder): builder.StartObject(27)
+    # Monster
+    def Testf3(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(58))
+        if o != 0:
+            return self._tab.Get(flatbuffers.number_types.Float32Flags, o + self._tab.Pos)
+        return 0.0
+
+def MonsterStart(builder): builder.StartObject(28)
 def MonsterAddPos(builder, pos): builder.PrependStructSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(pos), 0)
 def MonsterAddMana(builder, mana): builder.PrependInt16Slot(1, mana, 150)
 def MonsterAddHp(builder, hp): builder.PrependInt16Slot(2, hp, 100)
@@ -309,4 +316,5 @@ def MonsterAddTestarrayofbools(builder, testarrayofbools): builder.PrependUOffse
 def MonsterStartTestarrayofboolsVector(builder, numElems): return builder.StartVector(1, numElems, 1)
 def MonsterAddTestf(builder, testf): builder.PrependFloat32Slot(25, testf, 3.14159)
 def MonsterAddTestf2(builder, testf2): builder.PrependFloat32Slot(26, testf2, 3.0)
+def MonsterAddTestf3(builder, testf3): builder.PrependFloat32Slot(27, testf3, 0.0)
 def MonsterEnd(builder): return builder.EndObject()
diff --git a/tests/monster_test.bfbs b/tests/monster_test.bfbs
index 16a5bff54486d2a74df2898b54792caf71a1676a..e16b2bd13ce4dce50406e3a089d132f4ebf28688 100644
GIT binary patch
delta 203
zcmWm8uMYun9LDkIdw%RjVY}^S=MT^cHxpFBCS33jkZlCPun|PJ3ob||2-g%*5EM-i
zHANSB3$H!j=lPUx?4I4VUkq$1$w>~ndFdUt7G@RRHf9&~%*)tO+wx{*NkLj_rlc!5
z&q!nPMAq>9<CZ||Ph!B^$I_Ax*s^s{L6bf)(gO}eZ;&zW)II(3`F=gs#Rp3&FlI68
R4M+W|H04OmA0O7){sDE}CiwsW

delta 177
zcmX>gK0|zhg`f@x149cJ1H&6m1_lFe28JUOJ)0R5CZ3(ncxrMg<8wxX$-Yd|_0kLs
z3_2_f3=+%?3=4pC1S<nW0Fa&lq<MgN2M7b@T7dWl5bpr0_W;rYKpexwz|a81B|tF^
xAeI5LBN!PNwgB-5ApZ`KmH^@sAl?AvgVbL5|Np-fg9U>KNIe6?W`5?4900$~A9Mf!

diff --git a/tests/monster_test.fbs b/tests/monster_test.fbs
index 014f8fc72..f302ce444 100755
--- a/tests/monster_test.fbs
+++ b/tests/monster_test.fbs
@@ -61,6 +61,7 @@ table Monster {
   testhashu64_fnv1a:ulong (id:23, hash:"fnv1a_64");
   testf:float = 3.14159 (id:25);
   testf2:float = 3 (id:26);
+  testf3:float (id:27);
 }
 
 rpc_service MonsterStorage {
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index 9fe72f0cd..594c6f7c8 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -205,7 +205,8 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
     VT_TESTHASHU64_FNV1A = 50,
     VT_TESTARRAYOFBOOLS = 52,
     VT_TESTF = 54,
-    VT_TESTF2 = 56
+    VT_TESTF2 = 56,
+    VT_TESTF3 = 58
   };
   const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
   Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
@@ -264,6 +265,8 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   bool mutate_testf(float _testf) { return SetField(VT_TESTF, _testf); }
   float testf2() const { return GetField<float>(VT_TESTF2, 3.0f); }
   bool mutate_testf2(float _testf2) { return SetField(VT_TESTF2, _testf2); }
+  float testf3() const { return GetField<float>(VT_TESTF3, 0.0f); }
+  bool mutate_testf3(float _testf3) { return SetField(VT_TESTF3, _testf3); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<Vec3>(verifier, VT_POS) &&
@@ -304,6 +307,7 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
            verifier.Verify(testarrayofbools()) &&
            VerifyField<float>(verifier, VT_TESTF) &&
            VerifyField<float>(verifier, VT_TESTF2) &&
+           VerifyField<float>(verifier, VT_TESTF3) &&
            verifier.EndTable();
   }
 };
@@ -337,10 +341,11 @@ struct MonsterBuilder {
   void add_testarrayofbools(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testarrayofbools) { fbb_.AddOffset(Monster::VT_TESTARRAYOFBOOLS, testarrayofbools); }
   void add_testf(float testf) { fbb_.AddElement<float>(Monster::VT_TESTF, testf, 3.14159f); }
   void add_testf2(float testf2) { fbb_.AddElement<float>(Monster::VT_TESTF2, testf2, 3.0f); }
+  void add_testf3(float testf3) { fbb_.AddElement<float>(Monster::VT_TESTF3, testf3, 0.0f); }
   MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   MonsterBuilder &operator=(const MonsterBuilder &);
   flatbuffers::Offset<Monster> Finish() {
-    auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 27));
+    auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 28));
     fbb_.Required(o, Monster::VT_NAME);  // name
     return o;
   }
@@ -372,12 +377,14 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
    uint64_t testhashu64_fnv1a = 0,
    flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testarrayofbools = 0,
    float testf = 3.14159f,
-   float testf2 = 3.0f) {
+   float testf2 = 3.0f,
+   float testf3 = 0.0f) {
   MonsterBuilder builder_(_fbb);
   builder_.add_testhashu64_fnv1a(testhashu64_fnv1a);
   builder_.add_testhashs64_fnv1a(testhashs64_fnv1a);
   builder_.add_testhashu64_fnv1(testhashu64_fnv1);
   builder_.add_testhashs64_fnv1(testhashs64_fnv1);
+  builder_.add_testf3(testf3);
   builder_.add_testf2(testf2);
   builder_.add_testf(testf);
   builder_.add_testarrayofbools(testarrayofbools);
diff --git a/tests/monster_test_generated.js b/tests/monster_test_generated.js
index eed24b5ea..8316fbc69 100644
--- a/tests/monster_test_generated.js
+++ b/tests/monster_test_generated.js
@@ -693,11 +693,19 @@ MyGame.Example.Monster.prototype.testf2 = function() {
   return offset ? this.bb.readFloat32(this.bb_pos + offset) : 3.0;
 };
 
+/**
+ * @returns {number}
+ */
+MyGame.Example.Monster.prototype.testf3 = function() {
+  var offset = this.bb.__offset(this.bb_pos, 58);
+  return offset ? this.bb.readFloat32(this.bb_pos + offset) : 0.0;
+};
+
 /**
  * @param {flatbuffers.Builder} builder
  */
 MyGame.Example.Monster.startMonster = function(builder) {
-  builder.startObject(27);
+  builder.startObject(28);
 };
 
 /**
@@ -1021,6 +1029,14 @@ MyGame.Example.Monster.addTestf2 = function(builder, testf2) {
   builder.addFieldFloat32(26, testf2, 3.0);
 };
 
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {number} testf3
+ */
+MyGame.Example.Monster.addTestf3 = function(builder, testf3) {
+  builder.addFieldFloat32(27, testf3, 0.0);
+};
+
 /**
  * @param {flatbuffers.Builder} builder
  * @returns {flatbuffers.Offset}
diff --git a/tests/monsterdata_test.mon b/tests/monsterdata_test.mon
index 4c032bcfeae89ef809a3cd19c47d8fd381b1481d..7a7fbf707f84e8b7ef957001da0ce8b3d9a89324 100644
GIT binary patch
delta 47
wcmZo*ZeZs1U|?YI_4f+~QVcc|`7N12lxI8Ro{1No8EqzuGlE4X2Qumd0Oi&SBme*a

delta 57
zcmZo*ZeZs3U|?YI_4f+~Qb1rek=K&ZYNBU5<F1Jpoq2%*3>**{2A0W+jQWgLlLHy`
E0WpCJE&u=k


From 6908826f9506fc0149d7bb60e0cc45aafa532f4a Mon Sep 17 00:00:00 2001
From: pjulien <pjulien@gmail.com>
Date: Sat, 16 Apr 2016 20:49:36 -0400
Subject: [PATCH 129/185] Fix for #3849

This avoids the following allocations over repeated use:

- A ``CharsetEncoder``
- A byte array to contain the contents of the string
- A wrapper, via ``ByteBuffer#wrap``, for the previously mentioned byte
  array

This also removes a copy of the temporary byte array.  This extra copy
is needed because ``String#getBytes`` returns a byte array and its
length must match the exact size of the contents.

This implementation requires that the builder retain a ``ByteBuffer``
and ``CharEncoder``.  This is considered slower only for users that
will only allocate a single string in their buffers or none at all.

The improvement is especially potent if the builder is constantly reused
by its caller.  This also eliminates the penalty for users that do not
use strings at all since the cost of allocating these fields is
now amortized.

The only allocation left in this code is a ``CharBuffer`` wrapper.  It's
possible to eliminate this allocation using an additional copy but need
further profiling to see which is the bigger problem.
---
 .../google/flatbuffers/FlatBufferBuilder.java | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/java/com/google/flatbuffers/FlatBufferBuilder.java b/java/com/google/flatbuffers/FlatBufferBuilder.java
index e86471397..092a239f8 100644
--- a/java/com/google/flatbuffers/FlatBufferBuilder.java
+++ b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -17,6 +17,11 @@
 package com.google.flatbuffers;
 
 import static com.google.flatbuffers.Constants.*;
+
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
 import java.util.Arrays;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -46,6 +51,8 @@ public class FlatBufferBuilder {
     int num_vtables = 0;            // Number of entries in `vtables` in use.
     int vector_num_elems = 0;       // For the current vector being built.
     boolean force_defaults = false; // False omits default values from the serialized data.
+    CharsetEncoder encoder = utf8charset.newEncoder();
+    ByteBuffer dst;
     /// @endcond
 
    /**
@@ -368,12 +375,26 @@ public class FlatBufferBuilder {
     * @return The offset in the buffer where the encoded string starts.
     */
     public int createString(String s) {
-        byte[] utf8 = s.getBytes(utf8charset);
-        addByte((byte)0);
-        startVector(1, utf8.length, 1);
-        bb.position(space -= utf8.length);
-        bb.put(utf8, 0, utf8.length);
-        return endVector();
+        int length = s.length();
+        int estimatedDstCapacity = (int) (length * encoder.maxBytesPerChar());
+        if (dst == null || dst.capacity() < estimatedDstCapacity) {
+            dst = ByteBuffer.allocate(Math.max(128, estimatedDstCapacity));
+        }
+
+        dst.clear();
+
+        CharBuffer src = CharBuffer.wrap(s);
+        CoderResult result = encoder.encode(src, dst, true);
+        if (result.isError()) {
+            try {
+                result.throwException();
+            } catch (CharacterCodingException x) {
+                throw new Error(x);
+            }
+        }
+
+        dst.flip();
+        return createString(dst);
     }
 
    /**

From f6330ab8f137871f786fc72a7700b54da21f0603 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Fri, 22 Apr 2016 11:26:47 -0700
Subject: [PATCH 130/185] Fixed SkipByteOrderMark advancing cursor_ too early.

Change-Id: Ie60f01d935ca6b4aa6ce0eab7598602ac0758342
Tested: on Linux.
---
 src/idl_parser.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 4c7820933..28aa0835d 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -205,8 +205,10 @@ CheckedError Parser::ParseHexNum(int nibbles, int64_t *val) {
 CheckedError Parser::SkipByteOrderMark() {
   if (static_cast<unsigned char>(*cursor_) != 0xef) return NoError();
   cursor_++;
-  if (static_cast<unsigned char>(*cursor_++) != 0xbb) return Error("invalid utf-8 byte order mark");
-  if (static_cast<unsigned char>(*cursor_++) != 0xbf) return Error("invalid utf-8 byte order mark");
+  if (static_cast<unsigned char>(*cursor_) != 0xbb) return Error("invalid utf-8 byte order mark");
+  cursor_++;
+  if (static_cast<unsigned char>(*cursor_) != 0xbf) return Error("invalid utf-8 byte order mark");
+  cursor_++;
   return NoError();
 }
 

From c17cf022ea323e4684dcc6f0b324e2769b7727c8 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Fri, 22 Apr 2016 11:31:35 -0700
Subject: [PATCH 131/185] Fixed a verifier check that didn't return from its
 parent.

Change-Id: I1aef5fdba72de0c3bb8276c9f50fffa494f26e29
Tested: on Linux.
---
 include/flatbuffers/flatbuffers.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index a33092f3d..c78583cad 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -1222,7 +1222,8 @@ class Verifier FLATBUFFERS_FINAL_CLASS {
     // must be 0.
     auto size = ReadScalar<uoffset_t>(vec);
     auto max_elems = FLATBUFFERS_MAX_BUFFER_SIZE / elem_size;
-    Check(size < max_elems);  // Protect against byte_size overflowing.
+    if (!Check(size < max_elems))
+      return false;  // Protect against byte_size overflowing.
     auto byte_size = sizeof(size) + elem_size * size;
     *end = vec + byte_size;
     return Verify(vec, byte_size);

From e8ac0f293e5e8a957e95c5ae72eefb0bf4d1be0e Mon Sep 17 00:00:00 2001
From: rw <me@rwinslow.com>
Date: Sat, 23 Apr 2016 12:31:24 -0700
Subject: [PATCH 132/185] Fix heap allocation when reading a string.

---
 go/table.go  | 3 ++-
 go/unsafe.go | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/go/table.go b/go/table.go
index 695b92da8..976a7dba1 100644
--- a/go/table.go
+++ b/go/table.go
@@ -26,7 +26,8 @@ func (t *Table) Indirect(off UOffsetT) UOffsetT {
 
 // String gets a string from data stored inside the flatbuffer.
 func (t *Table) String(off UOffsetT) string {
-	return string(t.ByteVector(off))
+	b := t.ByteVector(off)
+	return byteSliceToString(b)
 }
 
 // ByteVector gets a byte slice from data stored inside the flatbuffer.
diff --git a/go/unsafe.go b/go/unsafe.go
index e90ccb09d..566e8b0bb 100644
--- a/go/unsafe.go
+++ b/go/unsafe.go
@@ -43,3 +43,8 @@ var (
 	// SizeVOffsetT is the byte size of an VOffsetT.
 	SizeVOffsetT = int(unsafe.Sizeof(VOffsetT(0)))
 )
+
+// byteSliceToString converts a []byte to string without a heap allocation.
+func byteSliceToString(b []byte) string {
+	return *(*string)(unsafe.Pointer(&b))
+}

From 599f5e3915b8a745d6a198595065b44c5888dfc8 Mon Sep 17 00:00:00 2001
From: pjulien <pjulien@gmail.com>
Date: Mon, 25 Apr 2016 22:07:57 -0400
Subject: [PATCH 133/185] Can now use ``CharSequence`` of ``String``.  Works
 with

1. [AsciiString]
(http://netty.io/4.1/api/io/netty/util/AsciiString.html)
2. [CharBuffer]
(https://docs.oracle.com/javase/8/docs/api/java/nio/CharBuffer.html)
3. [StringBuilder]
(https://docs.oracle.com/javase/8/docs/api/java/lang/StringBuilder.html)
---
 java/com/google/flatbuffers/FlatBufferBuilder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 java/com/google/flatbuffers/FlatBufferBuilder.java

diff --git a/java/com/google/flatbuffers/FlatBufferBuilder.java b/java/com/google/flatbuffers/FlatBufferBuilder.java
old mode 100755
new mode 100644
index 480bb9d35..deaece8cd
--- a/java/com/google/flatbuffers/FlatBufferBuilder.java
+++ b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -373,7 +373,7 @@ public class FlatBufferBuilder {
     * @param s The string to encode.
     * @return The offset in the buffer where the encoded string starts.
     */
-    public int createString(String s) {
+    public int createString(CharSequence s) {
         int length = s.length();
         int estimatedDstCapacity = (int) (length * encoder.maxBytesPerChar());
         if (dst == null || dst.capacity() < estimatedDstCapacity) {

From 6765c19d45509fdcffd5ee62cac5cacea32bd397 Mon Sep 17 00:00:00 2001
From: Lakedaemon <olivier.binda@wanadoo.fr>
Date: Tue, 26 Apr 2016 17:08:13 +0200
Subject: [PATCH 134/185] memory leak fix + php/js/python transition to class
 based generator

---
 src/idl_gen_cpp.cpp     |   4 +-
 src/idl_gen_general.cpp |   5 +-
 src/idl_gen_go.cpp      |   4 +-
 src/idl_gen_js.cpp      | 113 +++++++++++++++++++++++-----------------
 src/idl_gen_php.cpp     |  65 +++++++++++++++--------
 src/idl_gen_python.cpp  |  60 ++++++++++++++-------
 6 files changed, 153 insertions(+), 98 deletions(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index c1b6ba566..0e5d823f3 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -906,8 +906,8 @@ class CppGenerator : public BaseGenerator {
 
 bool GenerateCPP(const Parser &parser, const std::string &path,
                  const std::string &file_name) {
-  cpp::CppGenerator *generator = new cpp::CppGenerator(parser, path, file_name);
-  return generator->generate();
+  cpp::CppGenerator generator(parser, path, file_name);
+  return generator.generate();
 }
 
 std::string CPPMakeRule(const Parser &parser,
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index a763d969b..e28661e82 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -1195,9 +1195,8 @@ class GeneralGenerator : public BaseGenerator {
 
 bool GenerateGeneral(const Parser &parser, const std::string &path,
                      const std::string &file_name) {
-  general::GeneralGenerator *generator =
-      new general::GeneralGenerator(parser, path, file_name);
-  return generator->generate();
+  general::GeneralGenerator generator(parser, path, file_name);
+  return generator.generate();
 }
 
 static std::string ClassFileName(const LanguageParameters &lang,
diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp
index f674d1f47..bce8f95bc 100644
--- a/src/idl_gen_go.cpp
+++ b/src/idl_gen_go.cpp
@@ -688,8 +688,8 @@ class GoGenerator : public BaseGenerator {
 
 bool GenerateGo(const Parser &parser, const std::string &path,
                 const std::string &file_name) {
-  go::GoGenerator *generator = new go::GoGenerator(parser, path, file_name);
-  return generator->generate();
+  go::GoGenerator generator(parser, path, file_name);
+  return generator.generate();
 }
 
 }  // namespace flatbuffers
diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp
index f824bc688..de81f2764 100644
--- a/src/idl_gen_js.cpp
+++ b/src/idl_gen_js.cpp
@@ -19,6 +19,7 @@
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
+#include "flatbuffers/code_generators.h"
 
 namespace flatbuffers {
 namespace js {
@@ -661,60 +662,76 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
 
 }  // namespace js
 
-// Iterate through all definitions we haven't generate code for (enums, structs,
-// and tables) and output them to a single file.
-std::string GenerateJS(const Parser &parser) {
-  using namespace js;
-
-  // Generate code for all the enum declarations.
-  std::string enum_code, exports_code;
-  for (auto it = parser.enums_.vec.begin();
-       it != parser.enums_.vec.end(); ++it) {
-    GenEnum(**it, &enum_code, &exports_code);
-  }
-
-  // Generate code for all structs, then all tables.
-  std::string decl_code;
-  for (auto it = parser.structs_.vec.begin();
-       it != parser.structs_.vec.end(); ++it) {
-    GenStruct(parser, **it, &decl_code, &exports_code);
-  }
-
-  // Only output file-level code if there were any declarations.
-  if (enum_code.length() || decl_code.length()) {
-    std::string code;
-    code = "// automatically generated by the FlatBuffers compiler,"
-           " do not modify\n\n";
-
-    // Generate code for all the namespace declarations.
-    GenNamespaces(parser, &code, &exports_code);
-
-    // Output the main declaration code from above.
-    code += enum_code;
-    code += decl_code;
-
-    if (!exports_code.empty() && !parser.opts.skip_js_exports) {
-      code += "// Exports for Node.js and RequireJS\n";
-      code += exports_code;
-    }
-
-    return code;
-  }
-
-  return std::string();
-}
-
 static std::string GeneratedFileName(const std::string &path,
                                      const std::string &file_name) {
   return path + file_name + "_generated.js";
 }
 
-bool GenerateJS(const Parser &parser,
-                const std::string &path,
-                const std::string &file_name) {
-    auto code = GenerateJS(parser);
+namespace js {
+// Iterate through all definitions we haven't generate code for (enums, structs,
+// and tables) and output them to a single file.
+class JsGenerator : public BaseGenerator {
+ public:
+  JsGenerator(const Parser &parser, const std::string &path,
+              const std::string &file_name)
+      : BaseGenerator(parser, path, file_name){};
+  // Iterate through all definitions we haven't generate code for (enums,
+  // structs, and tables) and output them to a single file.
+  bool generate() {
+    std::string enum_code, struct_code, exports_code, code;
+    generateEnums(&enum_code, &exports_code);
+    generateStructs(&struct_code, &exports_code);
+
+    // Only output file-level code if there were any declarations.
+    if (enum_code.length() || struct_code.length()) {
+      code +=
+          "// automatically generated by the FlatBuffers compiler, do not "
+          "modify\n\n";
+
+      // Generate code for all the namespace declarations.
+      GenNamespaces(parser_, &code, &exports_code);
+
+      // Output the main declaration code from above.
+      code += enum_code;
+      code += struct_code;
+
+      if (!exports_code.empty() && !parser_.opts.skip_js_exports) {
+        code += "// Exports for Node.js and RequireJS\n";
+        code += exports_code;
+      }
+    }
+
     return !code.length() ||
-           SaveFile(GeneratedFileName(path, file_name).c_str(), code, false);
+           SaveFile(GeneratedFileName(path_, file_name_).c_str(), code, false);
+  }
+
+ private:
+  // Generate code for all enums.
+  void generateEnums(std::string *enum_code_ptr,
+                     std::string *exports_code_ptr) {
+    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
+         ++it) {
+      auto &enum_def = **it;
+      GenEnum(enum_def, enum_code_ptr, exports_code_ptr);
+    }
+  }
+
+  // Generate code for all structs.
+  void generateStructs(std::string *decl_code_ptr,
+                       std::string *exports_code_ptr) {
+    for (auto it = parser_.structs_.vec.begin();
+         it != parser_.structs_.vec.end(); ++it) {
+      auto &struct_def = **it;
+      GenStruct(parser_, struct_def, decl_code_ptr, exports_code_ptr);
+    }
+  }
+};
+}  // namespace js
+
+bool GenerateJS(const Parser &parser, const std::string &path,
+                const std::string &file_name) {
+  js::JsGenerator generator(parser, path, file_name);
+  return generator.generate();
 }
 
 std::string JSMakeRule(const Parser &parser,
diff --git a/src/idl_gen_php.cpp b/src/idl_gen_php.cpp
index 5b904a077..b43ea6702 100644
--- a/src/idl_gen_php.cpp
+++ b/src/idl_gen_php.cpp
@@ -21,6 +21,7 @@
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
+#include "flatbuffers/code_generators.h"
 
 namespace flatbuffers {
 namespace php {
@@ -974,29 +975,47 @@ namespace php {
       code += Indent + "}\n";
     }
 
-}  // namespace php
+    class PhpGenerator : public BaseGenerator {
+     public:
+      PhpGenerator(const Parser &parser, const std::string &path,
+                   const std::string &file_name)
+          : BaseGenerator(parser, path, file_name){};
+      bool generate() {
+        if (!generateEnums()) return false;
+        if (!generateStructs()) return false;
+        return true;
+      }
 
-  bool GeneratePhp(const Parser &parser,
-    const std::string &path,
-    const std::string & /*file_name*/) {
-    for (auto it = parser.enums_.vec.begin();
-    it != parser.enums_.vec.end(); ++it) {
-      std::string enumcode;
-      php::GenEnum(**it, &enumcode);
+     private:
+      bool generateEnums() {
+        for (auto it = parser_.enums_.vec.begin();
+             it != parser_.enums_.vec.end(); ++it) {
+          auto &enum_def = **it;
+          std::string enumcode;
+          GenEnum(enum_def, &enumcode);
+          if (!SaveType(parser_, enum_def, enumcode, path_, false))
+            return false;
+        }
+        return true;
+      }
 
-      if (!php::SaveType(parser, **it, enumcode, path, false))
-        return false;
+      bool generateStructs() {
+        for (auto it = parser_.structs_.vec.begin();
+             it != parser_.structs_.vec.end(); ++it) {
+          auto &struct_def = **it;
+          std::string declcode;
+          GenStruct(parser_, struct_def, &declcode);
+          if (!SaveType(parser_, struct_def, declcode, path_, true))
+            return false;
+        }
+        return true;
+      }
+    };
+    }  // 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();
     }
-
-    for (auto it = parser.structs_.vec.begin();
-    it != parser.structs_.vec.end(); ++it) {
-      std::string declcode;
-      php::GenStruct(parser, **it, &declcode);
-
-      if (!php::SaveType(parser, **it, declcode, path, true))
-        return false;
-    }
-
-    return true;
-}
-}  // namespace flatbuffers
+    }  // namespace flatbuffers
diff --git a/src/idl_gen_python.cpp b/src/idl_gen_python.cpp
index 7cd09cfcd..ee6d16874 100644
--- a/src/idl_gen_python.cpp
+++ b/src/idl_gen_python.cpp
@@ -21,6 +21,7 @@
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
+#include "flatbuffers/code_generators.h"
 
 namespace flatbuffers {
 namespace python {
@@ -634,28 +635,47 @@ static void GenStructBuilder(const StructDef &struct_def,
   EndBuilderBody(code_ptr);
 }
 
+class PythonGenerator : public BaseGenerator {
+ public:
+  PythonGenerator(const Parser &parser, const std::string &path,
+                  const std::string &file_name)
+      : BaseGenerator(parser, path, file_name){};
+  bool generate() {
+    if (!generateEnums()) return false;
+    if (!generateStructs()) return false;
+    return true;
+  }
+
+ private:
+  bool generateEnums() {
+    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
+         ++it) {
+      auto &enum_def = **it;
+      std::string enumcode;
+      GenEnum(enum_def, &enumcode);
+      if (!SaveType(parser_, enum_def, enumcode, path_, false)) return false;
+    }
+    return true;
+  }
+
+  bool generateStructs() {
+    for (auto it = parser_.structs_.vec.begin();
+         it != parser_.structs_.vec.end(); ++it) {
+      auto &struct_def = **it;
+      std::string declcode;
+      GenStruct(struct_def, &declcode, parser_.root_struct_def_);
+      if (!SaveType(parser_, struct_def, declcode, path_, true)) return false;
+    }
+    return true;
+  }
+};
+
 }  // namespace python
 
-bool GeneratePython(const Parser &parser,
-                    const std::string &path,
-                    const std::string & /*file_name*/) {
-  for (auto it = parser.enums_.vec.begin();
-       it != parser.enums_.vec.end(); ++it) {
-    std::string enumcode;
-    python::GenEnum(**it, &enumcode);
-    if (!python::SaveType(parser, **it, enumcode, path, false))
-      return false;
-  }
-
-  for (auto it = parser.structs_.vec.begin();
-       it != parser.structs_.vec.end(); ++it) {
-    std::string declcode;
-    python::GenStruct(**it, &declcode, parser.root_struct_def_);
-    if (!python::SaveType(parser, **it, declcode, path, true))
-      return false;
-  }
-
-  return true;
+bool GeneratePython(const Parser &parser, const std::string &path,
+                    const std::string &file_name) {
+  python::PythonGenerator generator(parser, path, file_name);
+  return generator.generate();
 }
 
 }  // namespace flatbuffers

From 3400727ffff0c0ab5b834632fea91948f7f43d66 Mon Sep 17 00:00:00 2001
From: Ben Gertzfield <beng@fb.com>
Date: Fri, 29 Apr 2016 12:57:48 -0700
Subject: [PATCH 135/185] Fix undefined behavior in CheckBitsFit bit-shift on
 size_t

---
 src/idl_parser.cpp | 17 ++++++++++-------
 tests/test.cpp     | 28 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 28aa0835d..a606781b5 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -69,13 +69,16 @@ inline CheckedError NoError() { return CheckedError(false); }
 
 // Ensure that integer values we parse fit inside the declared integer type.
 CheckedError Parser::CheckBitsFit(int64_t val, size_t bits) {
-  // Bits we allow to be used.
-  auto mask = static_cast<int64_t>((1ull << bits) - 1);
-  if (bits < 64 &&
-      (val & ~mask) != 0 &&  // Positive or unsigned.
-      (val |  mask) != -1)   // Negative.
-    return Error("constant does not fit in a " + NumToString(bits) +
-                 "-bit field");
+  // Left-shifting a 64-bit value by 64 bits or more is undefined
+  // behavior (C99 6.5.7), so check *before* we shift.
+  if (bits < 64) {
+    // Bits we allow to be used.
+    auto mask = static_cast<int64_t>((1ull << bits) - 1);
+    if ((val & ~mask) != 0 &&  // Positive or unsigned.
+        (val |  mask) != -1)   // Negative.
+      return Error("constant does not fit in a " + NumToString(bits) +
+                   "-bit field");
+  }
   return NoError();
 }
 
diff --git a/tests/test.cpp b/tests/test.cpp
index 4c3aa543f..e636f1f3c 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -819,6 +819,33 @@ void EnumStringsTest() {
                         "{ F:[ \"E.C\", \"E.A E.B E.C\" ] }"), true);
 }
 
+void IntegerOutOfRangeTest() {
+  TestError("table T { F:byte; } root_type T; { F:256 }",
+            "constant does not fit");
+  TestError("table T { F:byte; } root_type T; { F:-257 }",
+            "constant does not fit");
+  TestError("table T { F:ubyte; } root_type T; { F:256 }",
+            "constant does not fit");
+  TestError("table T { F:ubyte; } root_type T; { F:-257 }",
+            "constant does not fit");
+  TestError("table T { F:short; } root_type T; { F:65536 }",
+            "constant does not fit");
+  TestError("table T { F:short; } root_type T; { F:-65537 }",
+            "constant does not fit");
+  TestError("table T { F:ushort; } root_type T; { F:65536 }",
+            "constant does not fit");
+  TestError("table T { F:ushort; } root_type T; { F:-65537 }",
+            "constant does not fit");
+  TestError("table T { F:int; } root_type T; { F:4294967296 }",
+            "constant does not fit");
+  TestError("table T { F:int; } root_type T; { F:-4294967297 }",
+            "constant does not fit");
+  TestError("table T { F:uint; } root_type T; { F:4294967296 }",
+            "constant does not fit");
+  TestError("table T { F:uint; } root_type T; { F:-4294967297 }",
+            "constant does not fit");
+}
+
 void UnicodeTest() {
   flatbuffers::Parser parser;
   TEST_EQ(parser.Parse("table T { F:string; }"
@@ -878,6 +905,7 @@ int main(int /*argc*/, const char * /*argv*/[]) {
   ErrorTest();
   ScientificTest();
   EnumStringsTest();
+  IntegerOutOfRangeTest();
   UnicodeTest();
   UnknownFieldsTest();
 

From 3a8bc309e2ded37707d2f64935e3a8e14e3bf3db Mon Sep 17 00:00:00 2001
From: Xiaolei Yu <dreifachstein@gmail.com>
Date: Sun, 1 May 2016 11:15:53 +0800
Subject: [PATCH 136/185] Use the build output flatc to compile test schemas by
 default.

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47a66e6cc..b1e56d6b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,9 @@ endif()
 
 if(FLATBUFFERS_BUILD_FLATC)
   add_executable(flatc ${FlatBuffers_Compiler_SRCS})
+  if(NOT FLATBUFFERS_FLATC_EXECUTABLE)
+    set(FLATBUFFERS_FLATC_EXECUTABLE $<TARGET_FILE:flatc>)
+  endif()
 endif()
 
 if(FLATBUFFERS_BUILD_FLATHASH)

From 023fec627e1a6fdbefa2a0d0a767bd4ccd35d276 Mon Sep 17 00:00:00 2001
From: Martin Ankerl <martin.ankerl@gmail.com>
Date: Tue, 3 May 2016 17:20:14 +0200
Subject: [PATCH 137/185] Added helpers to access objects while creating the
 flatbuffer.

GetObject and GetMutableObject are similar to GetRoot and GetMutableRoot,
and can be useful when wanting to access data that has just been created.
Unfortunately there is a danger in using these methods, as it is possible
that the buffer reallocates which will invalidate the pointers.
---
 include/flatbuffers/flatbuffers.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index c78583cad..07b7cadec 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -1151,6 +1151,17 @@ template<typename T> const T *GetRoot(const void *buf) {
   return GetMutableRoot<T>(const_cast<void *>(buf));
 }
 
+/// Helpers to get a typed pointer to objects that are currently beeing built.
+/// @warning Creating new objects will lead to reallocations and invalidates the pointer!
+template<typename T> T *GetMutableObject(FlatBufferBuilder &fbb, Offset<T> offset) {
+  return reinterpret_cast<T *>(fbb.GetCurrentBufferPointer() +
+    fbb.GetSize() - offset.o);
+}
+
+template<typename T> const T *GetObject(FlatBufferBuilder &fbb, Offset<T> offset) {
+  return GetMutableObject<T>(fbb, offset);
+}
+
 // Helper to see if the identifier in a buffer has the expected value.
 inline bool BufferHasIdentifier(const void *buf, const char *identifier) {
   return strncmp(reinterpret_cast<const char *>(buf) + sizeof(uoffset_t),

From 747a8c628e4781941e2bbb6999bf339bca25f252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mahmut=20Ali=20=C3=96ZKURAN?=
 <ozkuran@users.noreply.github.com>
Date: Wed, 18 May 2016 12:02:32 +0300
Subject: [PATCH 138/185] Fixed Library Location in CppUsage.md

Fixed Library Location
"https://github.com/google/flatbuffers/tree/master/include/flatbuffers"
in CppUsage.md
---
 docs/source/CppUsage.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/source/CppUsage.md b/docs/source/CppUsage.md
index 8c7f6a7d4..d4abe66e4 100755
--- a/docs/source/CppUsage.md
+++ b/docs/source/CppUsage.md
@@ -26,8 +26,7 @@ your program by including the header. As noted, this header relies on
 
 The code for the FlatBuffers C++ library can be found at
 `flatbuffers/include/flatbuffers`. You can browse the library code on the
-[FlatBuffers GitHub page](https://github.com/google/flatbuffers/tree/master/
-include/flatbuffers).
+[FlatBuffers GitHub page](https://github.com/google/flatbuffers/tree/master/include/flatbuffers).
 
 ## Testing the FlatBuffers C++ library
 

From 69eef0a0ece27a2f07397e763b5bac389a98c4d8 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 18 May 2016 18:00:25 -0700
Subject: [PATCH 139/185] Fixes verifier not catching odd vtable sizes.

Bug: 28762769
Change-Id: Iec370482f67c4585e97dd5175c1a4258ddba47fe
Tested: on Linux.
---
 include/flatbuffers/flatbuffers.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index c78583cad..0fa31250f 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -1383,6 +1383,7 @@ class Table {
     // Check the vtable size field, then check vtable fits in its entirety.
     return verifier.VerifyComplexity() &&
            verifier.Verify<voffset_t>(vtable) &&
+           (ReadScalar<voffset_t>(vtable) & (sizeof(voffset_t) - 1)) == 0 &&
            verifier.Verify(vtable, ReadScalar<voffset_t>(vtable));
   }
 

From 9d8ae1b0c39832f91c9f2eac959a2c3cb5c5526f Mon Sep 17 00:00:00 2001
From: pjulien <pjulien@gmail.com>
Date: Sat, 21 May 2016 09:19:43 -0400
Subject: [PATCH 140/185] If the user passes in a {{CharBuffer}} himser, reward
 him by eliminating the last remaining allocation in string creation

---
 java/com/google/flatbuffers/FlatBufferBuilder.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/com/google/flatbuffers/FlatBufferBuilder.java b/java/com/google/flatbuffers/FlatBufferBuilder.java
index deaece8cd..58189afcc 100644
--- a/java/com/google/flatbuffers/FlatBufferBuilder.java
+++ b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -382,7 +382,8 @@ public class FlatBufferBuilder {
 
         dst.clear();
 
-        CharBuffer src = CharBuffer.wrap(s);
+        CharBuffer src = s instanceof CharBuffer ? (CharBuffer) s :
+            CharBuffer.wrap(s);
         CoderResult result = encoder.encode(src, dst, true);
         if (result.isError()) {
             try {

From 1a161a8333ec1fa382a06485b7ffad955c001151 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 23 May 2016 09:51:41 -0700
Subject: [PATCH 141/185] Added missing licenses to some sh/cs/py files.

Bug: https://github.com/google/flatbuffers/issues/3872
Change-Id: I5d551168e9bc925e867e5e4ddf5d809418fd44eb
Tested: on Linux.
---
 biicode/support/bii-travis.sh                  | 14 ++++++++++++++
 python/flatbuffers/compat.py                   | 14 ++++++++++++++
 python/flatbuffers/packer.py                   | 14 ++++++++++++++
 python/setup.py                                | 14 ++++++++++++++
 reflection/generate_code.sh                    | 16 ++++++++++++++++
 .../FlatBuffersTestClassAttribute.cs           | 18 +++++++++++++++++-
 .../FlatBuffersTestMethodAttribute.cs          | 18 +++++++++++++++++-
 tests/FlatBuffers.Test/FuzzTestData.cs         | 18 +++++++++++++++++-
 tests/FlatBuffers.Test/Lcg.cs                  | 16 ++++++++++++++++
 tests/FlatBuffers.Test/TestTable.cs            | 16 ++++++++++++++++
 tests/JavaScriptTest.sh                        | 14 ++++++++++++++
 11 files changed, 169 insertions(+), 3 deletions(-)

diff --git a/biicode/support/bii-travis.sh b/biicode/support/bii-travis.sh
index 0f5d2f960..d327a47c6 100755
--- a/biicode/support/bii-travis.sh
+++ b/biicode/support/bii-travis.sh
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 sudo apt-get update -qq
 sudo apt-get install libglu1-mesa-dev xorg-dev
 wget http://www.biicode.com/downloads/latest/ubuntu64
diff --git a/python/flatbuffers/compat.py b/python/flatbuffers/compat.py
index c592901c0..e0315351d 100644
--- a/python/flatbuffers/compat.py
+++ b/python/flatbuffers/compat.py
@@ -1,3 +1,17 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """ A tiny version of `six` to help with backwards compability. """
 
 import sys
diff --git a/python/flatbuffers/packer.py b/python/flatbuffers/packer.py
index c525f180b..20ee9f116 100644
--- a/python/flatbuffers/packer.py
+++ b/python/flatbuffers/packer.py
@@ -1,3 +1,17 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """
 Provide pre-compiled struct packers for encoding and decoding.
 
diff --git a/python/setup.py b/python/setup.py
index 822c92626..39afef34b 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -1,3 +1,17 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from setuptools import setup
 
 setup(
diff --git a/reflection/generate_code.sh b/reflection/generate_code.sh
index 90f655d22..c679caf08 100644
--- a/reflection/generate_code.sh
+++ b/reflection/generate_code.sh
@@ -1 +1,17 @@
+#!/bin/bash
+
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ../flatc -c --no-prefix -o ../include/flatbuffers reflection.fbs
diff --git a/tests/FlatBuffers.Test/FlatBuffersTestClassAttribute.cs b/tests/FlatBuffers.Test/FlatBuffersTestClassAttribute.cs
index f43b8ce79..ce629518e 100644
--- a/tests/FlatBuffers.Test/FlatBuffersTestClassAttribute.cs
+++ b/tests/FlatBuffers.Test/FlatBuffersTestClassAttribute.cs
@@ -1,4 +1,20 @@
-using System;
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/tests/FlatBuffers.Test/FlatBuffersTestMethodAttribute.cs b/tests/FlatBuffers.Test/FlatBuffersTestMethodAttribute.cs
index 38d448868..1da867abd 100644
--- a/tests/FlatBuffers.Test/FlatBuffersTestMethodAttribute.cs
+++ b/tests/FlatBuffers.Test/FlatBuffersTestMethodAttribute.cs
@@ -1,4 +1,20 @@
-using System;
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ using System;
 
 namespace FlatBuffers.Test
 {
diff --git a/tests/FlatBuffers.Test/FuzzTestData.cs b/tests/FlatBuffers.Test/FuzzTestData.cs
index b0447adbf..a7c120a8b 100644
--- a/tests/FlatBuffers.Test/FuzzTestData.cs
+++ b/tests/FlatBuffers.Test/FuzzTestData.cs
@@ -1,4 +1,20 @@
-using System;
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
 
 namespace FlatBuffers.Test
 {
diff --git a/tests/FlatBuffers.Test/Lcg.cs b/tests/FlatBuffers.Test/Lcg.cs
index 1182640dc..c329ed84a 100644
--- a/tests/FlatBuffers.Test/Lcg.cs
+++ b/tests/FlatBuffers.Test/Lcg.cs
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 namespace FlatBuffers.Test
 {
     /// <summary>
diff --git a/tests/FlatBuffers.Test/TestTable.cs b/tests/FlatBuffers.Test/TestTable.cs
index 89a507ec7..c51237b21 100644
--- a/tests/FlatBuffers.Test/TestTable.cs
+++ b/tests/FlatBuffers.Test/TestTable.cs
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 namespace FlatBuffers.Test
 {
     /// <summary>
diff --git a/tests/JavaScriptTest.sh b/tests/JavaScriptTest.sh
index 3d3100756..799c55e20 100755
--- a/tests/JavaScriptTest.sh
+++ b/tests/JavaScriptTest.sh
@@ -1,5 +1,19 @@
 #!/bin/sh
 
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 pushd "$(dirname $0)" >/dev/null
 ../flatc -b monster_test.fbs unicode_test.json
 node JavaScriptTest

From 8c0d56d55abcc0559f1472979ed31a817e678731 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 23 May 2016 12:24:44 -0700
Subject: [PATCH 142/185] Removed BOM marker from some files.

Also removed some trailing whitespace.

Change-Id: I40bf4f776ca4d467b7ee6f2c9a7500c13700f9d5
---
 net/FlatBuffers/ByteBuffer.cs                 |  2 +-
 net/FlatBuffers/FlatBufferBuilder.cs          |  8 +-
 net/FlatBuffers/FlatBufferConstants.cs        |  2 +-
 net/FlatBuffers/Properties/AssemblyInfo.cs    |  4 +-
 net/FlatBuffers/Struct.cs                     |  2 +-
 tests/FlatBuffers.Test/Assert.cs              |  2 +-
 tests/FlatBuffers.Test/ByteBufferTests.cs     |  2 +-
 .../FlatBufferBuilderTests.cs                 |  2 +-
 .../FlatBuffers.Test/FlatBuffers.Test.csproj  |  2 +-
 .../FlatBuffers.Test/FlatBuffersFuzzTests.cs  | 76 +++++++++----------
 .../FlatBuffersTestClassAttribute.cs          |  2 +-
 .../FlatBuffersTestMethodAttribute.cs         |  2 +-
 tests/FlatBuffers.Test/FuzzTestData.cs        |  2 +-
 tests/FlatBuffers.Test/Program.cs             |  2 +-
 .../Properties/AssemblyInfo.cs                |  4 +-
 15 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/net/FlatBuffers/ByteBuffer.cs b/net/FlatBuffers/ByteBuffer.cs
index 7ca491dc5..5fa1ac7a5 100755
--- a/net/FlatBuffers/ByteBuffer.cs
+++ b/net/FlatBuffers/ByteBuffer.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2014 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/net/FlatBuffers/FlatBufferBuilder.cs b/net/FlatBuffers/FlatBufferBuilder.cs
index c320ea8cc..590e6ac0d 100644
--- a/net/FlatBuffers/FlatBufferBuilder.cs
+++ b/net/FlatBuffers/FlatBufferBuilder.cs
@@ -80,9 +80,9 @@ namespace FlatBuffers
         /// <summary>
         /// Gets and sets a Boolean to disable the optimization when serializing
         /// default values to a Table.
-        /// 
+        ///
         /// In order to save space, fields that are set to their default value
-        /// don't get serialized into the buffer. 
+        /// don't get serialized into the buffer.
         /// </summary>
         public bool ForceDefaults { get; set; }
 
@@ -349,7 +349,7 @@ namespace FlatBuffers
         /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
         /// <param name="d">The default value to compare the value against</param>
         public void AddBool(int o, bool x, bool d) { if (ForceDefaults || x != d) { AddBool(x); Slot(o); } }
-        
+
         /// <summary>
         /// Adds a SByte to the Table at index `o` in its vtable using the value `x` and default `d`
         /// </summary>
@@ -358,7 +358,7 @@ namespace FlatBuffers
         /// and <see cref="ForceDefaults"/> is false, the value will be skipped.</param>
         /// <param name="d">The default value to compare the value against</param>
         public void AddSbyte(int o, sbyte x, sbyte d) { if (ForceDefaults || x != d) { AddSbyte(x); Slot(o); } }
-        
+
         /// <summary>
         /// Adds a Byte to the Table at index `o` in its vtable using the value `x` and default `d`
         /// </summary>
diff --git a/net/FlatBuffers/FlatBufferConstants.cs b/net/FlatBuffers/FlatBufferConstants.cs
index 162ed1923..ab3092c48 100644
--- a/net/FlatBuffers/FlatBufferConstants.cs
+++ b/net/FlatBuffers/FlatBufferConstants.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2014 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/net/FlatBuffers/Properties/AssemblyInfo.cs b/net/FlatBuffers/Properties/AssemblyInfo.cs
index 1065ff8f2..1edfac47a 100644
--- a/net/FlatBuffers/Properties/AssemblyInfo.cs
+++ b/net/FlatBuffers/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2014 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +26,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("FlatBuffers")]
-[assembly: AssemblyCopyright("Copyright ©  2015 Google Inc")]
+[assembly: AssemblyCopyright("Copyright (c) 2015 Google Inc")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/net/FlatBuffers/Struct.cs b/net/FlatBuffers/Struct.cs
index 4cd280124..ab16f28cb 100644
--- a/net/FlatBuffers/Struct.cs
+++ b/net/FlatBuffers/Struct.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2014 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/FlatBuffers.Test/Assert.cs b/tests/FlatBuffers.Test/Assert.cs
index 83344cf3b..488c338f1 100644
--- a/tests/FlatBuffers.Test/Assert.cs
+++ b/tests/FlatBuffers.Test/Assert.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2014 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/FlatBuffers.Test/ByteBufferTests.cs b/tests/FlatBuffers.Test/ByteBufferTests.cs
index 0241e96e2..b86c36587 100644
--- a/tests/FlatBuffers.Test/ByteBufferTests.cs
+++ b/tests/FlatBuffers.Test/ByteBufferTests.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2014 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/FlatBuffers.Test/FlatBufferBuilderTests.cs b/tests/FlatBuffers.Test/FlatBufferBuilderTests.cs
index 529c813b3..f02df445e 100644
--- a/tests/FlatBuffers.Test/FlatBufferBuilderTests.cs
+++ b/tests/FlatBuffers.Test/FlatBufferBuilderTests.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2016 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/FlatBuffers.Test/FlatBuffers.Test.csproj b/tests/FlatBuffers.Test/FlatBuffers.Test.csproj
index 4055fa6ab..cc7c5cf82 100644
--- a/tests/FlatBuffers.Test/FlatBuffers.Test.csproj
+++ b/tests/FlatBuffers.Test/FlatBuffers.Test.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/tests/FlatBuffers.Test/FlatBuffersFuzzTests.cs b/tests/FlatBuffers.Test/FlatBuffersFuzzTests.cs
index 744575119..e8182d77d 100644
--- a/tests/FlatBuffers.Test/FlatBuffersFuzzTests.cs
+++ b/tests/FlatBuffers.Test/FlatBuffersFuzzTests.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2015 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -124,13 +124,13 @@ namespace FlatBuffers.Test
             builder.CreateString("moop");
             Assert.ArrayEqual(new byte[]
             {
-                0, 0, 0, 0, 
-                0, 0, 0, 0, 
+                0, 0, 0, 0,
+                0, 0, 0, 0,
                 0, 0, 0, 0,  // Padding to 32 bytes
-                4, 0, 0, 0, 
+                4, 0, 0, 0,
                 (byte)'m', (byte)'o', (byte)'o', (byte)'p',
                 0, 0, 0, 0, // zero terminator with 3 byte pad
-                3, 0, 0, 0, 
+                3, 0, 0, 0,
                 (byte)'f', (byte)'o', (byte)'o', 0
             }, builder.DataBuffer.Data);
         }
@@ -142,19 +142,19 @@ namespace FlatBuffers.Test
             builder.CreateString("\x01\x02\x03");
             Assert.ArrayEqual(new byte[]
             {
-                3, 0, 0, 0, 
+                3, 0, 0, 0,
                 0x01, 0x02, 0x03, 0
             }, builder.DataBuffer.Data); // No padding
             builder.CreateString("\x04\x05\x06\x07");
             Assert.ArrayEqual(new byte[]
             {
-                0, 0, 0, 0, 
-                0, 0, 0, 0, 
+                0, 0, 0, 0,
+                0, 0, 0, 0,
                 0, 0, 0, 0,  // Padding to 32 bytes
-                4, 0, 0, 0, 
+                4, 0, 0, 0,
                 0x04, 0x05, 0x06, 0x07,
                 0, 0, 0, 0, // zero terminator with 3 byte pad
-                3, 0, 0, 0, 
+                3, 0, 0, 0,
                 0x01, 0x02, 0x03, 0
             }, builder.DataBuffer.Data); // No padding
         }
@@ -168,9 +168,9 @@ namespace FlatBuffers.Test
             builder.EndObject();
             Assert.ArrayEqual(new byte[]
             {
-                4, 0, 4, 0, 
+                4, 0, 4, 0,
                 4, 0, 0, 0
-            }, 
+            },
                 builder.DataBuffer.Data);
         }
 
@@ -287,20 +287,20 @@ namespace FlatBuffers.Test
             var vecEnd = builder.EndVector();
 
             builder.StartObject(1);
-            
+
             builder.AddOffset(0, vecEnd.Value, 0);
             builder.EndObject();
             Assert.ArrayEqual(new byte[]
             {
-                0, 0, 0, 0, 
                 0, 0, 0, 0,
-                0, 0, 0, 0, 
+                0, 0, 0, 0,
+                0, 0, 0, 0,
                 0, 0,       // Padding to 32 bytes
                 6, 0, // vtable bytes
                 8, 0, // object length inc vtable offset
                 4, 0, // start of vector offset value 0
                 6, 0, 0, 0, // int32 offset for start of vtable
-                4, 0, 0, 0, 
+                4, 0, 0, 0,
                 0, 0, 0, 0,
             },
                 builder.DataBuffer.Data);
@@ -320,7 +320,7 @@ namespace FlatBuffers.Test
             Assert.ArrayEqual(new byte[]
             {
                 0, 0, 0, 0,
-                0, 0, 0, 0, // Padding to 32 bytes       
+                0, 0, 0, 0, // Padding to 32 bytes
                 8, 0, // vtable bytes
                 12, 0, // object length inc vtable offset
                 10, 0,     // offset to int16 value 0
@@ -349,9 +349,9 @@ namespace FlatBuffers.Test
             builder.EndObject();
             Assert.ArrayEqual(new byte[]
             {
-                0, 0, 0, 0, // Padding to 32 bytes       
+                0, 0, 0, 0, // Padding to 32 bytes
                 8, 0, // vtable bytes
-                12, 0, // object length 
+                12, 0, // object length
                 6, 0,     // start of value 0 from end of vtable
                 8, 0,     // start of value 1 from end of buffer
                 8, 0, 0, 0, // int32 offset for start of vtable
@@ -382,9 +382,9 @@ namespace FlatBuffers.Test
             {
                 0, 0, 0, 0,
                 0, 0, 0, 0,
-                0, 0, // Padding to 32 bytes       
+                0, 0, // Padding to 32 bytes
                 6, 0, // vtable bytes
-                16, 0, // object length 
+                16, 0, // object length
                 4, 0,     // start of struct from here
                 6, 0, 0, 0, // int32 offset for start of vtable
                 0x78, 0x56, 0x34, 0x12,  // struct value 2
@@ -413,9 +413,9 @@ namespace FlatBuffers.Test
             {
                 0, 0, 0, 0,
                 0, 0, 0, 0,
-                0, 0, // Padding to 32 bytes       
+                0, 0, // Padding to 32 bytes
                 6, 0, // vtable bytes
-                8, 0, // object length 
+                8, 0, // object length
                 4, 0,     // offset of vector offset
                 6, 0, 0, 0, // int32 offset for start of vtable
                 4, 0, 0, 0, // Vector start offset
@@ -442,16 +442,16 @@ namespace FlatBuffers.Test
             {
                 0, 0, 0, 0,
                 0, 0, 0, 0,
-                0, 0, 0, 0, //Padding to 32 bytes 
-                12, 0, 0, 0,     // root of table, pointing to vtable offset  
+                0, 0, 0, 0, //Padding to 32 bytes
+                12, 0, 0, 0,     // root of table, pointing to vtable offset
                 8, 0, // vtable bytes
-                8, 0, // object length 
+                8, 0, // object length
                 7, 0, // start of value 0
                 4, 0, // start of value 1
                 8, 0, 0, 0, // int32 offset for start of vtable
                 66, 0, // value 1
                 0, 33, // value 0
-   
+
             },
                 builder.DataBuffer.Data);
         }
@@ -480,23 +480,23 @@ namespace FlatBuffers.Test
                 0, 0, 0, 0,
                 0, 0, 0, 0,
                 0, 0, 0, 0,       // padding to 64 bytes
-                16, 0, 0, 0,     // root of table, pointing to vtable offset (obj1) 
+                16, 0, 0, 0,     // root of table, pointing to vtable offset (obj1)
                 0, 0, // padding
 
                 10, 0, // vtable bytes
-                8, 0, // object length 
+                8, 0, // object length
                 7, 0, // start of value 0
                 6, 0, // start of value 1
                 5, 0, // start of value 2
                 10, 0, 0, 0, // int32 offset for start of vtable
                 0, // pad
                 77, // values 2, 1, 0
-                66, 
+                66,
                 55,
 
                 12, 0, 0, 0,     // root of table, pointing to vtable offset (obj0)
                 8, 0, // vtable bytes
-                8, 0, // object length 
+                8, 0, // object length
                 7, 0, // start of value 0
                 6, 0, // start of value 1
                 8, 0, 0, 0, // int32 offset for start of vtable
@@ -531,7 +531,7 @@ namespace FlatBuffers.Test
 
                 24, 0, 0, 0,     // root of table, pointing to vtable offset (obj0)
                 20, 0, // vtable bytes
-                12, 0, // object length 
+                12, 0, // object length
                 11, 0, // start of value 0
                 10, 0, // start of value 1
                 9, 0, // start of value 2
@@ -542,10 +542,10 @@ namespace FlatBuffers.Test
                 4, 0, // start of value 7
 
                 20, 0, 0, 0, // int32 offset for start of vtable
-          
+
                 1, 1, 1, 1,  // values
                 1, 1, 1, 1,
-                
+
             },
                 builder.DataBuffer.Data);
         }
@@ -557,17 +557,17 @@ namespace FlatBuffers.Test
             builder.StartObject(1);
             builder.AddFloat(0, 1, 0);
             builder.EndObject();
-         
+
 
             Assert.ArrayEqual(new byte[]
             {
                 0, 0,
                 6, 0, // vtable bytes
-                8, 0, // object length 
+                8, 0, // object length
                 4, 0, // start of value 0
                 6, 0, 0, 0, // int32 offset for start of vtable
                 0, 0, 128, 63,  // value
-                
+
             },
                 builder.DataBuffer.Data);
         }
@@ -660,7 +660,7 @@ namespace FlatBuffers.Test
             }
 
             _lcg.Reset();
-            
+
             // Test all objects are readable and return expected values...
             for (var i = 0; i < objectCount; ++i)
             {
diff --git a/tests/FlatBuffers.Test/FlatBuffersTestClassAttribute.cs b/tests/FlatBuffers.Test/FlatBuffersTestClassAttribute.cs
index ce629518e..f31e38b3b 100644
--- a/tests/FlatBuffers.Test/FlatBuffersTestClassAttribute.cs
+++ b/tests/FlatBuffers.Test/FlatBuffersTestClassAttribute.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2016 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/FlatBuffers.Test/FlatBuffersTestMethodAttribute.cs b/tests/FlatBuffers.Test/FlatBuffersTestMethodAttribute.cs
index 1da867abd..989dae5b2 100644
--- a/tests/FlatBuffers.Test/FlatBuffersTestMethodAttribute.cs
+++ b/tests/FlatBuffers.Test/FlatBuffersTestMethodAttribute.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2016 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/FlatBuffers.Test/FuzzTestData.cs b/tests/FlatBuffers.Test/FuzzTestData.cs
index a7c120a8b..119e44eb1 100644
--- a/tests/FlatBuffers.Test/FuzzTestData.cs
+++ b/tests/FlatBuffers.Test/FuzzTestData.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2016 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/FlatBuffers.Test/Program.cs b/tests/FlatBuffers.Test/Program.cs
index aa497cef4..f8cec4e1d 100644
--- a/tests/FlatBuffers.Test/Program.cs
+++ b/tests/FlatBuffers.Test/Program.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2014 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/FlatBuffers.Test/Properties/AssemblyInfo.cs b/tests/FlatBuffers.Test/Properties/AssemblyInfo.cs
index 73be32683..2e33f0828 100644
--- a/tests/FlatBuffers.Test/Properties/AssemblyInfo.cs
+++ b/tests/FlatBuffers.Test/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2014 Google Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +26,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("FlatBuffers.Test")]
-[assembly: AssemblyCopyright("Copyright © 2014  Google Inc")]
+[assembly: AssemblyCopyright("Copyright (c) 2014  Google Inc")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

From 1aa3ee2170c0ab9075f4f24e61544518d5f60cda Mon Sep 17 00:00:00 2001
From: pjulien <pjulien@gmail.com>
Date: Mon, 23 May 2016 16:47:41 -0400
Subject: [PATCH 143/185] Clarify documentation based on review comments

---
 java/com/google/flatbuffers/FlatBufferBuilder.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/com/google/flatbuffers/FlatBufferBuilder.java b/java/com/google/flatbuffers/FlatBufferBuilder.java
index 58189afcc..fecb213f6 100644
--- a/java/com/google/flatbuffers/FlatBufferBuilder.java
+++ b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -368,7 +368,8 @@ public class FlatBufferBuilder {
     /// @endcond
 
    /**
-    * Encode the string `s` in the buffer using UTF-8.
+    * Encode the string `s` in the buffer using UTF-8.  If {@code s} is
+    * already a {@link CharBuffer}, this method is allocation free.
     *
     * @param s The string to encode.
     * @return The offset in the buffer where the encoded string starts.

From a42a99029fb05c7f47959f7634da7ba23d4ea25a Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 23 May 2016 13:53:08 -0700
Subject: [PATCH 144/185] Made .sh files all have same comment formatting.

Change-Id: Ie7cc268a8823aec1d06c8b7cbef54068d832de3a
---
 android/build_apk.sh          | 1 +
 biicode/support/bii-travis.sh | 2 +-
 reflection/generate_code.sh   | 2 +-
 samples/android/build_apk.sh  | 1 +
 samples/android_sample.sh     | 3 ++-
 samples/csharp_sample.sh      | 3 ++-
 samples/go_sample.sh          | 3 ++-
 samples/java_sample.sh        | 3 ++-
 samples/javascript_sample.sh  | 3 ++-
 samples/php_sample.sh         | 3 ++-
 samples/python_sample.sh      | 3 ++-
 tests/GoTest.sh               | 1 +
 tests/JavaScriptTest.sh       | 2 +-
 tests/JavaTest.sh             | 2 +-
 tests/PythonTest.sh           | 1 +
 tests/generate_code.sh        | 2 +-
 16 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/android/build_apk.sh b/android/build_apk.sh
index 4967ee6dd..1b9f4a451 100755
--- a/android/build_apk.sh
+++ b/android/build_apk.sh
@@ -1,4 +1,5 @@
 #!/bin/bash -eu
+#
 # Copyright (c) 2013 Google, Inc.
 #
 # This software is provided 'as-is', without any express or implied
diff --git a/biicode/support/bii-travis.sh b/biicode/support/bii-travis.sh
index d327a47c6..67854c7ce 100755
--- a/biicode/support/bii-travis.sh
+++ b/biicode/support/bii-travis.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+#
 # Copyright 2016 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/reflection/generate_code.sh b/reflection/generate_code.sh
index c679caf08..da8a18130 100644
--- a/reflection/generate_code.sh
+++ b/reflection/generate_code.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+#
 # Copyright 2016 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/samples/android/build_apk.sh b/samples/android/build_apk.sh
index 4967ee6dd..1b9f4a451 100755
--- a/samples/android/build_apk.sh
+++ b/samples/android/build_apk.sh
@@ -1,4 +1,5 @@
 #!/bin/bash -eu
+#
 # Copyright (c) 2013 Google, Inc.
 #
 # This software is provided 'as-is', without any express or implied
diff --git a/samples/android_sample.sh b/samples/android_sample.sh
index 9e746fb2a..ead8fd807 100755
--- a/samples/android_sample.sh
+++ b/samples/android_sample.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+#
 # Copyright 2015 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
 # Note: This script requires the Android NDK and Android SDK to be installed.
 #       It also requires an Android device to be connected for installing and
 #       running the applicaton.
diff --git a/samples/csharp_sample.sh b/samples/csharp_sample.sh
index 5c86f7b78..ea472ed9c 100755
--- a/samples/csharp_sample.sh
+++ b/samples/csharp_sample.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+#
 # Copyright 2015 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
 # Note: This script runs on Mac and Linux. It requires `mono` to be installed
 # and `flatc` to be built (using `cmake` in the root directory).
 
diff --git a/samples/go_sample.sh b/samples/go_sample.sh
index 2a0605f20..13a96c129 100755
--- a/samples/go_sample.sh
+++ b/samples/go_sample.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+#
 # Copyright 2015 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
 # Note: This script runs on Mac and Linux. It requires `go` to be installed
 # and 'flatc' to be built (using `cmake` in the root directory).
 
diff --git a/samples/java_sample.sh b/samples/java_sample.sh
index 3e7ebcfe1..bd1315f4c 100755
--- a/samples/java_sample.sh
+++ b/samples/java_sample.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+#
 # Copyright 2015 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
 # Note: This script runs on Mac and Linux. It requires `java` to be installed
 # and `flatc` to be built (using `cmake` in the root directory).
 
diff --git a/samples/javascript_sample.sh b/samples/javascript_sample.sh
index 794ec4b7c..4bbc478d7 100755
--- a/samples/javascript_sample.sh
+++ b/samples/javascript_sample.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+#
 # Copyright 2015 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
 # Note: This script runs on Mac and Linux. It requires `Node.js` to be installed
 # and `flatc` to be built (using `cmake` in the root directory).
 
diff --git a/samples/php_sample.sh b/samples/php_sample.sh
index 8a55e2a05..c23edc380 100755
--- a/samples/php_sample.sh
+++ b/samples/php_sample.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+#
 # Copyright 2015 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
 # Note: This script runs on Mac and Linux. It requires `php` to be installed
 # and `flatc` to be built (using `cmake` in the root directory).
 
diff --git a/samples/python_sample.sh b/samples/python_sample.sh
index 9148c7d81..ca5de2b03 100755
--- a/samples/python_sample.sh
+++ b/samples/python_sample.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+#
 # Copyright 2015 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
 # Note: This script runs on Mac and Linux. It requires `python` to be installed
 # and `flatc` to be built (using `cmake` in the root directory).
 
diff --git a/tests/GoTest.sh b/tests/GoTest.sh
index f9cc41040..353930a61 100755
--- a/tests/GoTest.sh
+++ b/tests/GoTest.sh
@@ -1,4 +1,5 @@
 #!/bin/bash -eu
+#
 # Copyright 2014 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/JavaScriptTest.sh b/tests/JavaScriptTest.sh
index 799c55e20..75db00787 100755
--- a/tests/JavaScriptTest.sh
+++ b/tests/JavaScriptTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+#
 # Copyright 2016 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/JavaTest.sh b/tests/JavaTest.sh
index 7dd7ea98e..344bd1c0b 100755
--- a/tests/JavaTest.sh
+++ b/tests/JavaTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+#
 # Copyright 2014 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/PythonTest.sh b/tests/PythonTest.sh
index e59110b70..00fee7c7b 100755
--- a/tests/PythonTest.sh
+++ b/tests/PythonTest.sh
@@ -1,4 +1,5 @@
 #!/bin/bash -eu
+#
 # Copyright 2014 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/generate_code.sh b/tests/generate_code.sh
index 712da6c77..b74c2bec5 100644
--- a/tests/generate_code.sh
+++ b/tests/generate_code.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+#
 # Copyright 2015 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

From a82dbb6e0100adf5f2d17bb88240a514c392f1e3 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 23 May 2016 14:06:19 -0700
Subject: [PATCH 145/185] Fixed Google Groups link in documentation.

Change-Id: I64307ccd0a6f23a7c3860d602813e637415e7c91
---
 docs/source/FlatBuffers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/FlatBuffers.md b/docs/source/FlatBuffers.md
index 46d4c1201..d69f404fb 100644
--- a/docs/source/FlatBuffers.md
+++ b/docs/source/FlatBuffers.md
@@ -145,7 +145,7 @@ sections provide a more in-depth usage guide.
 
 -   [GitHub repository](http://github.com/google/flatbuffers)
 -   [Landing page](http://google.github.io/flatbuffers)
--   [FlatBuffers Google Group](http://group.google.com/group/flatbuffers)
+-   [FlatBuffers Google Group](https://groups.google.com/forum/#!forum/flatbuffers)
 -   [FlatBuffers Issues Tracker](http://github.com/google/flatbuffers/issues)
 -   Independent implementations & tools:
     - [FlatCC](https://github.com/dvidelabs/flatcc) Alternative FlatBuffers

From d06e571b31179c0dd7986456a558fafb9b92f265 Mon Sep 17 00:00:00 2001
From: Stewart Miles <smiles@google.com>
Date: Mon, 23 May 2016 16:27:35 -0700
Subject: [PATCH 146/185] Removed reference to deprecated NDK toolchain
 version.

Change-Id: I8d39a66ca5642427619c60f349fa78917aec2455
---
 android/jni/Application.mk         | 2 +-
 samples/android/jni/Application.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index 56952fc96..2fc9c7379 100755
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -18,5 +18,5 @@ APP_PROJECT_PATH := $(call my-dir)/..
 APP_STL := gnustl_static
 
 APP_ABI := armeabi-v7a
-NDK_TOOLCHAIN_VERSION := 4.8
+
 APP_CPPFLAGS += -std=c++11
diff --git a/samples/android/jni/Application.mk b/samples/android/jni/Application.mk
index 56952fc96..2fc9c7379 100755
--- a/samples/android/jni/Application.mk
+++ b/samples/android/jni/Application.mk
@@ -18,5 +18,5 @@ APP_PROJECT_PATH := $(call my-dir)/..
 APP_STL := gnustl_static
 
 APP_ABI := armeabi-v7a
-NDK_TOOLCHAIN_VERSION := 4.8
+
 APP_CPPFLAGS += -std=c++11

From fe9787e58db79ff108f2d41d8b2030ea2b9925da Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 23 May 2016 16:35:20 -0700
Subject: [PATCH 147/185] Add a fuzzer for flatbuffers, derived from the one
 used in Chromium:
 https://code.google.com/p/chromium/codesearch#chromium/src/testing/libfuzzer/fuzzers/flatbuffers_verifier_fuzzer.cc

(mirrored from cl 122676317)

Change-Id: I0074af435cf37f5e6368b040563c3733d9e02345
---
 .../fuzz-0-flatbuffers_verifier_fuzzer            | Bin 0 -> 411 bytes
 tests/fuzzer/flatbuffers_verifier_fuzzer.cc       |  14 ++++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/fuzz-0-flatbuffers_verifier_fuzzer
 create mode 100644 tests/fuzzer/flatbuffers_verifier_fuzzer.cc

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/fuzz-0-flatbuffers_verifier_fuzzer b/tests/fuzzer/flatbuffers_verifier_corpus/fuzz-0-flatbuffers_verifier_fuzzer
new file mode 100644
index 0000000000000000000000000000000000000000..ada82f163f5670ff70daa87141aec4c2d0d421b3
GIT binary patch
literal 411
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9ze{%;KL9ABoi1i7(y5#
z7z%*w7$B|y>I4Et2B2(%J&@%9L_iD!91cuClh|NfDE$RUKLO%1K->Vt5kTw!#EvH`
z?}BjQlEyv|Rso6~oLK$oYy*E@<3$Ml@oxI@J03rsAvDNsxO@Tf2gnyLU|-k(Rb~J&
z$R7w_RDgZ)8QB;5Kt&D^KO_6Z*Ix=6Sjc|*>C6mN&d9)Mwd?=?|13Z@2)h-frT{4h
fCLk68Vvras5SOGDmly(RNSGqrt-$~ZeW)q`2B|>A

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_fuzzer.cc b/tests/fuzzer/flatbuffers_verifier_fuzzer.cc
new file mode 100644
index 000000000..d2fa73ad7
--- /dev/null
+++ b/tests/fuzzer/flatbuffers_verifier_fuzzer.cc
@@ -0,0 +1,14 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#include <stddef.h>
+#include <stdint.h>
+#include <string>
+
+#include "third_party/flatbuffers/tests/monster_test_generated.h"
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  flatbuffers::Verifier verifier(data, size);
+  MyGame::Example::VerifyMonsterBuffer(verifier);
+  return 0;
+}

From 64b91da9cf139f639135aa199354833b7f302af9 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 23 May 2016 16:37:57 -0700
Subject: [PATCH 148/185] Uncomment the corpus attribute since b/28762769 is
 fixed, add more items to the corpus (taken from the ClusterFuzz-generated
 corpus).

(mirrored from cl 122690857)

Change-Id: I98c7672169a9a27fe18bedae8501e6fb85a0681d
---
 .../01a40c02ea9c030b9fcf8aaf51fe1b6681e00490      | Bin 0 -> 383 bytes
 .../075a40dd6e6eec9cc96f0399c182f62361cdc553      | Bin 0 -> 154 bytes
 .../0c319e8089228db0958f35c54614d4e2d917f9d5      | Bin 0 -> 383 bytes
 .../0d654589709444777a4a854ec16b7160b0b8f06f      | Bin 0 -> 154 bytes
 .../10ace4829162a0d37730ad898ee6ef2b76849ce4      | Bin 0 -> 383 bytes
 .../12986603181adee83afedc8206f86ead9fd20653      | Bin 0 -> 383 bytes
 .../14c816a2f528da8004315f8e71aec9e7e9f4df89      | Bin 0 -> 383 bytes
 .../14d90e4ac5f58f07be524633e96fb8f6521116e2      | Bin 0 -> 771 bytes
 .../2290776813d50bf54386dc6670aea41c8eb4f73f      | Bin 0 -> 383 bytes
 .../2357f92773faefb0049312fcf7421f2c4ef08dc5      | Bin 0 -> 383 bytes
 .../235a53ee083b428f4eb80eb5af6a8b41a4036d55      | Bin 0 -> 384 bytes
 .../243d7b9356afab5800b0fd424a0f90cefeb8f411      | Bin 0 -> 79 bytes
 .../2e2249e476941c7390d924d8f6c88b5d59d0e300      | Bin 0 -> 384 bytes
 .../3068bc815c5e573acf89236689705409b253e3c1      | Bin 0 -> 384 bytes
 .../3470f740d4b2e405c2922ebf68838a03fd690a64      | Bin 0 -> 153 bytes
 .../489b729a42a6ff5bcc30d341f29fd1660700c0b8      | Bin 0 -> 384 bytes
 .../50866a2404c2cfbbcaae258011c012d819a842a5      | Bin 0 -> 656 bytes
 .../50c219f74b02582ea4eaa683f0605b5cd16d6ed6      | Bin 0 -> 154 bytes
 .../525f958d1709f5e926cba564e23180b60d80fb9a      | Bin 0 -> 384 bytes
 .../543e528d3150cd0d2a45973cf98e992d67f7c406      | Bin 0 -> 384 bytes
 .../5a2f21b370496184851baffbbbb450fe49aed324      | Bin 0 -> 383 bytes
 .../5bbf4a7b9da7aee4db6b21ea62128df74aa23b59      | Bin 0 -> 384 bytes
 .../61005237d5ba26c372b347249143b793c324186a      | Bin 0 -> 383 bytes
 .../6207082d567e33f6569e5ffac1e882b6988f5e86      | Bin 0 -> 383 bytes
 .../699e2869e8bb9dad4ed0ca23245976e08d6abf96      | Bin 0 -> 384 bytes
 .../6a9bcfb376f95d3d235f6e3479ae37b906be2a17      | Bin 0 -> 384 bytes
 .../6b1e41ca991828476b077ebda3f7e9936b549c32      | Bin 0 -> 383 bytes
 .../6e146549ff6aefcd1314a8b04cd7ee0955796002      | Bin 0 -> 383 bytes
 .../7c1217cf933de200b58fd2bf494044ebb6d90cde      | Bin 0 -> 384 bytes
 .../7e0fac79b1dfbbdcaeee925535b66c2834d13814      | Bin 0 -> 384 bytes
 .../8718d7c1e9a536adb95fb0c749db4554311895e0      | Bin 0 -> 383 bytes
 .../8ae96e1702303027346b59d0a6acbd1ef0b1955f      | Bin 0 -> 384 bytes
 .../8ed7b897a2c4f2f262a5319910a5bd1db4b6dcae      | Bin 0 -> 384 bytes
 .../903747bd5d4239da836d24087e7e279715cc0980      | Bin 0 -> 384 bytes
 .../93a0adc29bf3cb1c7ed1b5a12778c1eba06972d7      | Bin 0 -> 128 bytes
 .../9f6095cae432e38efe7464bfac3cacd6df3bbc48      | Bin 0 -> 578 bytes
 .../ae3e1a31be33cc502b6586253274e6b620c78829      | Bin 0 -> 383 bytes
 .../b75487b8176eda7fb18e4f408208caa82d7c121a      | Bin 0 -> 174 bytes
 .../bf3d7a99df32ac45e9081eb3519524930c85de89      | Bin 0 -> 383 bytes
 .../bf60f275ed989532747e7bbcc93ab2bbd834becc      | Bin 0 -> 122 bytes
 .../c5170081fc1f8a36ab30541f087cf530ab0845b6      | Bin 0 -> 384 bytes
 .../c51a7d5885bdaa3bae2b125fe13b12e2fba4f9b6      | Bin 0 -> 384 bytes
 .../cd6ac24fd00acc3e9887fdf2ae300481e745f53a      | Bin 0 -> 384 bytes
 .../cd8e4aef993fcdebd9583069cd0a5468d254c5c7      |   1 +
 .../decff8b2d7524b5fad71129ecf0f4edd9082af2a      | Bin 0 -> 384 bytes
 .../df0b39717d20371162754b37747a0c989623cb48      | Bin 0 -> 384 bytes
 .../e423e0b67927e2c303dbb7ead3fd68706b92d657      | Bin 0 -> 153 bytes
 .../e72266e5ad67af5c27bcd69961460770e82bd24c      | Bin 0 -> 383 bytes
 .../ee80034f2e35e3f07a708b211be4f1967c83b6e9      | Bin 0 -> 383 bytes
 .../f5fd02697cac00a81809909a971f80f28aa4c020      | Bin 0 -> 383 bytes
 .../fbe211a4df09673e54945bb8f5afc4c5cfa67778      | Bin 0 -> 383 bytes
 .../fc5d4b9117ba9e87388174aee4f4970bdfe8d066      |   1 +
 .../fd11c36a6b2cbceeac9664690b5d35f0f9bb6f01      | Bin 0 -> 383 bytes
 .../ff085b6090cadabfabb6f5e785681353fb89eb87      | Bin 0 -> 384 bytes
 54 files changed, 2 insertions(+)
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/01a40c02ea9c030b9fcf8aaf51fe1b6681e00490
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/075a40dd6e6eec9cc96f0399c182f62361cdc553
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/0c319e8089228db0958f35c54614d4e2d917f9d5
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/0d654589709444777a4a854ec16b7160b0b8f06f
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/10ace4829162a0d37730ad898ee6ef2b76849ce4
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/12986603181adee83afedc8206f86ead9fd20653
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/14c816a2f528da8004315f8e71aec9e7e9f4df89
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/14d90e4ac5f58f07be524633e96fb8f6521116e2
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/2290776813d50bf54386dc6670aea41c8eb4f73f
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/2357f92773faefb0049312fcf7421f2c4ef08dc5
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/235a53ee083b428f4eb80eb5af6a8b41a4036d55
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/243d7b9356afab5800b0fd424a0f90cefeb8f411
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/2e2249e476941c7390d924d8f6c88b5d59d0e300
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/3068bc815c5e573acf89236689705409b253e3c1
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/3470f740d4b2e405c2922ebf68838a03fd690a64
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/489b729a42a6ff5bcc30d341f29fd1660700c0b8
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/50866a2404c2cfbbcaae258011c012d819a842a5
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/50c219f74b02582ea4eaa683f0605b5cd16d6ed6
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/525f958d1709f5e926cba564e23180b60d80fb9a
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/543e528d3150cd0d2a45973cf98e992d67f7c406
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/5a2f21b370496184851baffbbbb450fe49aed324
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/5bbf4a7b9da7aee4db6b21ea62128df74aa23b59
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/61005237d5ba26c372b347249143b793c324186a
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/6207082d567e33f6569e5ffac1e882b6988f5e86
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/699e2869e8bb9dad4ed0ca23245976e08d6abf96
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/6a9bcfb376f95d3d235f6e3479ae37b906be2a17
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/6b1e41ca991828476b077ebda3f7e9936b549c32
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/6e146549ff6aefcd1314a8b04cd7ee0955796002
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/7c1217cf933de200b58fd2bf494044ebb6d90cde
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/7e0fac79b1dfbbdcaeee925535b66c2834d13814
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/8718d7c1e9a536adb95fb0c749db4554311895e0
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/8ae96e1702303027346b59d0a6acbd1ef0b1955f
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/8ed7b897a2c4f2f262a5319910a5bd1db4b6dcae
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/903747bd5d4239da836d24087e7e279715cc0980
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/93a0adc29bf3cb1c7ed1b5a12778c1eba06972d7
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/9f6095cae432e38efe7464bfac3cacd6df3bbc48
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/ae3e1a31be33cc502b6586253274e6b620c78829
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/b75487b8176eda7fb18e4f408208caa82d7c121a
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/bf3d7a99df32ac45e9081eb3519524930c85de89
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/bf60f275ed989532747e7bbcc93ab2bbd834becc
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/c5170081fc1f8a36ab30541f087cf530ab0845b6
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/c51a7d5885bdaa3bae2b125fe13b12e2fba4f9b6
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/cd6ac24fd00acc3e9887fdf2ae300481e745f53a
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/cd8e4aef993fcdebd9583069cd0a5468d254c5c7
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/decff8b2d7524b5fad71129ecf0f4edd9082af2a
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/df0b39717d20371162754b37747a0c989623cb48
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/e423e0b67927e2c303dbb7ead3fd68706b92d657
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/e72266e5ad67af5c27bcd69961460770e82bd24c
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/ee80034f2e35e3f07a708b211be4f1967c83b6e9
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/f5fd02697cac00a81809909a971f80f28aa4c020
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/fbe211a4df09673e54945bb8f5afc4c5cfa67778
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/fc5d4b9117ba9e87388174aee4f4970bdfe8d066
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/fd11c36a6b2cbceeac9664690b5d35f0f9bb6f01
 create mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/ff085b6090cadabfabb6f5e785681353fb89eb87

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/01a40c02ea9c030b9fcf8aaf51fe1b6681e00490 b/tests/fuzzer/flatbuffers_verifier_corpus/01a40c02ea9c030b9fcf8aaf51fe1b6681e00490
new file mode 100644
index 0000000000000000000000000000000000000000..e36b1ce5c29d0393b164383915462bc0a15075ac
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Z~d<zCv1{($k1{WaD1Bf+&*oPqmNG4<iFhnpE
zFjO$a0C^ytK)}er5Wvu24`ew25fH-whXWJPBsLfqN`C>;Pk{Ig5H|pE1Q0s_vE#|g
zyC7V+q_Gc#RTvr>7$#PKI@`dX*LV>^f4rN1{Eo*@XBf>4)W-;fyZ-<G&jMtFuv<}T
z3Xo!80%8#$28po(@toA+5<@7v1j+`f;R33XW6%JytiYiFWPtU6Xb=GDhX4difk6=_
l2&O^d0Fnh^7pVOpI~f?6m|1`>;RG@(ee?5*OHzw~OaSp4Ik^A;

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/075a40dd6e6eec9cc96f0399c182f62361cdc553 b/tests/fuzzer/flatbuffers_verifier_corpus/075a40dd6e6eec9cc96f0399c182f62361cdc553
new file mode 100644
index 0000000000000000000000000000000000000000..063942bfe400275e933b2ce096f248bbcf41eebb
GIT binary patch
literal 154
zcmeZZU|{g|_X`G6Kw!ntz`()4u!F$_$gu!oRt6ge2L=})%L9l(z=t7#A%P)7ogsuF
vf}wz+f*}ShYy~121As(>J&<q!A_tHb46_;77>t18V8b=A8xE9aV8{Rf@81tj

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/0c319e8089228db0958f35c54614d4e2d917f9d5 b/tests/fuzzer/flatbuffers_verifier_corpus/0c319e8089228db0958f35c54614d4e2d917f9d5
new file mode 100644
index 0000000000000000000000000000000000000000..a505619059d3c4d522c0f976bda36bab5b9e4ae7
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xr~@lxwgDvK)X2h+%-kfeC058;r}K4rYA;l23s63=lT}aRd-M0I}oA
z%DW(3xTLWUgjIlIjT5Usoo(RHYrF`dKi*A0e#hgdGmK^is$m4eUH||8X92Q7*sUlv
z1xPV40kH@WgTz>YxFof>#1M@QQey>FCC8uvW^vR3DIfspfdEY)TL8v^(g;}wpqw;N
j6ci31Q4ogN53-Yik%^fF=n_sKv(h&|uec<&2*?BgA>le=

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/0d654589709444777a4a854ec16b7160b0b8f06f b/tests/fuzzer/flatbuffers_verifier_corpus/0d654589709444777a4a854ec16b7160b0b8f06f
new file mode 100644
index 0000000000000000000000000000000000000000..437134b35b22650767965a2d7ec0d55177e09265
GIT binary patch
literal 154
zcmeZZU|{g|_X`G6Kw!ntz`y}wm;kW_5VJDaFgP%{09hVD3<5q30SpNY8R`rn3=s?k
o3>6G9U|}l|$ru168tj3D0}wfYv|yUe#$W^#$7eWDnt>q$0E@p4ZU6uP

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/10ace4829162a0d37730ad898ee6ef2b76849ce4 b/tests/fuzzer/flatbuffers_verifier_corpus/10ace4829162a0d37730ad898ee6ef2b76849ce4
new file mode 100644
index 0000000000000000000000000000000000000000..7c9321c577166660235baa100beaa3097ad403be
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAwYIS
z0Ye1?Lky5*1(IT90LnGk16dA01jI1F;lKnmi4Deu(qDk|6CgeV#0@|k0mKeK?0B;B
zE(jMcY3u`G6`<I`iPfLZHt^>)UWCve@1`HW<MGoOMl%D|FaqJO|NsB90NEhyR+O3o
zq!^fhSOkbcVyr-1l3HA11f)fwY(pRoQo{vQCC8uvWLbej0muOB0ns1;(vJ!-ML^*I
f5(QzH{UAFT7@3$^fVOY~nU%izdBr8EML;G1(s(&~

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/12986603181adee83afedc8206f86ead9fd20653 b/tests/fuzzer/flatbuffers_verifier_corpus/12986603181adee83afedc8206f86ead9fd20653
new file mode 100644
index 0000000000000000000000000000000000000000..18b5c405333dc4e3ff075a0b1053be45f32795d0
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Y1v=}UaELH{^1_uTgAj<>DVqowAVupYOh75)f
zh6siNh6*4z28gXd;*3Bkh6Z~e%K?ah7zQ{Tn1Cj+!MITR3y^*S#AkrG0f-}j*a3(g
zPgdRq;ld@2eITp?6gxPv`qSA4{=CME5c=cY^y7CtemcWwW}q5IAl&u;|9=)B8-(48
zQd58w0}~L705M366^Khxi%SgA*dR4rKvi-K8bFp6I23>kupSUCfW!uw0|5vYgs%V&
h2aqTT!|Vsy$-v0O%mQ=?Cy-g`o1a%)l3E000svxiIs*Uz

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/14c816a2f528da8004315f8e71aec9e7e9f4df89 b/tests/fuzzer/flatbuffers_verifier_corpus/14c816a2f528da8004315f8e71aec9e7e9f4df89
new file mode 100644
index 0000000000000000000000000000000000000000..321ff5675d1e4fc7e778edbe7aee76c8a2904043
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Y1<QOb~ELH{^1_uTgAj<=aeHa255*RWVLKq?#
z3K%LFVu0cxogfgvz`)pG4`et15fH-whXWJPBsLfqN`C>;Pk{Ig5H|pE1Q0s_vE#|g
zyC7V+q_Gc#Re)lR6RSU+ZQ##?(I4-oAHU=A(-}-NJA3>Ds$m4eUH||8X92Q7*sUlv
z1xPV40kH@WgTz>YxFof>#2ATf2xNoQZ~;}xF=zl;R^U*uW>5#~0f}G(kU;Z=N(q2z
eP&lC553-Yik%<{3&I!c6mA?6T#U-gl3=9BApgPU~

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/14d90e4ac5f58f07be524633e96fb8f6521116e2 b/tests/fuzzer/flatbuffers_verifier_corpus/14d90e4ac5f58f07be524633e96fb8f6521116e2
new file mode 100644
index 0000000000000000000000000000000000000000..807a5b29079e5c6addcf62855be149edb7681cb3
GIT binary patch
literal 771
zcmZ`%Jxc>Y5Pf%=aM);(P7npbkH!xKqX=#=$Q6kRXpzDqg+Z|pV^SDwE`_a-pCI@v
z`~woue_%Ql1sgvatMkq5T{MKu@^)rtc6T0c*9VX<?CjFf))By?Phv&aX(X_LEC=X;
zBO-?)%8d3<!YR(N&)gSJ(j2fBEHE;@tYM5go$`h8sEub_-ka=}WN!}#Qb@v84r$h=
zwD&v=WM_s9q)(Y6=FnnB*wdUMr(lzl>FwX``o>z<z8O6c_e4O@N_~7HO@xa;G%@tT
z$ePvUkB?|FfRE7<C(FmKtQNyu2%l@>op>c^CBrGxZgd)%YP)mOys8q@%r#pVpAW(4
zN$fv5hj)+u&sOY*xX0nR4Z~3Gz9hEKDhDt0E|DT6pCIbbwfeHebBrss`jXv(5hsNS
z%(AkoDo|us59w>`^<yl`bpo5!0F&yZfk+`<AOs{MO|8(!|2`iU;d&0%<O9S)XQQ2T
U(dX+EdWI!^_(4xM_&W!=Um8wd(*OVf

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/2290776813d50bf54386dc6670aea41c8eb4f73f b/tests/fuzzer/flatbuffers_verifier_corpus/2290776813d50bf54386dc6670aea41c8eb4f73f
new file mode 100644
index 0000000000000000000000000000000000000000..f3c73e4b4fbb2f019304e085403615bb3008c661
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6K%m3Wz`y~d*%(Z~d<zCv1{($k1{WaD11!S8;KLBWkkF995W*0_
zP{2^Z5Cays0+EaiK)D8eAj<)WfEWfi9GHM6vB9`d`U{YL0>o#4xB-YGfY<?u9Zy!?
z1>wRajeQ`j!qCXTFtPg6*#`c+#)}a8<K6V*cRYSN!)RupK1PPm47>jS|IY$sgRoms
zY6_5IU;<(hAO?xC0`Z*G;u0e$y9CHK1hPSDxPYqU7&L$^9dIZB8DKpi8U#T4AppTr
pU{Hh!f@x4VfMh|~1!_OYP6kFMW)`3=oIqx!Z+>2JNoo<02>{z}I@bUI

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/2357f92773faefb0049312fcf7421f2c4ef08dc5 b/tests/fuzzer/flatbuffers_verifier_corpus/2357f92773faefb0049312fcf7421f2c4ef08dc5
new file mode 100644
index 0000000000000000000000000000000000000000..762bb8c5aab88c57d5fb6cdd4582c7fd719acbe3
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Z~d<zCv1{($k1{WaD11!S8;KLBWkid|^5W*0_
zP{2^Z5Cays0+EaiK)D8cAj<)WfEWfi9GHM6vDLx&5c&&{dIH2}fVcsOBY@Zeh#gN>
z-UZ>pC5?R`tO68koLK$oYy*E@<3$Ml@oxI@J03rsVKg&P4I>a9`2YVu3y=-MZbhjn
zK#GA0h(&-HB*qHFb5e^-jG*iiAlneg2C3l!s*+>S0D46L911`oupR~mEf5pR1~ZZP
jiU<K93lt9M_JizXU}R!u0ouX|WLEm-=M|Tv76F+6RN^`@

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/235a53ee083b428f4eb80eb5af6a8b41a4036d55 b/tests/fuzzer/flatbuffers_verifier_corpus/235a53ee083b428f4eb80eb5af6a8b41a4036d55
new file mode 100644
index 0000000000000000000000000000000000000000..ed1d16a7ff22b8cc15bca99c33281c8cd73a8fef
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SqVXy&`E<o%7#310q5WtYYkP#9AWEU`0
zFvNgGtw1DW0FY>~2NDiI1jI1F;lRYe3N#fJd;xNw0Pz_hZUADCi4H*Qc(U>?2p2AC
z>;qvHpjhL?>Q84I`14@&$Ghpr?|A%lhSAJGHH<*G>;M1%EI>90yA`FT04WA0AQk~)
zkQgfvm!uY#7$LC@fozZ(E}$wo1`Qy~3K$9?5r`fz0}G*mMGO=U==Ou`WME`s28nY5
Qv2UeseqM1&Y7vkP03Dz?rT_o{

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/243d7b9356afab5800b0fd424a0f90cefeb8f411 b/tests/fuzzer/flatbuffers_verifier_corpus/243d7b9356afab5800b0fd424a0f90cefeb8f411
new file mode 100644
index 0000000000000000000000000000000000000000..6c6d7cc4e3b4070f11901efce9120d2e6838d13f
GIT binary patch
literal 79
zcmeZZU|{g|_X`G6Kw!ntz`y~d**t&*iZD==4Jc*;#1=rT$Y28`wHO>2Kq`Tvjto9P
G1_J;!>;~5W

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/2e2249e476941c7390d924d8f6c88b5d59d0e300 b/tests/fuzzer/flatbuffers_verifier_corpus/2e2249e476941c7390d924d8f6c88b5d59d0e300
new file mode 100644
index 0000000000000000000000000000000000000000..ffc21832c8814390e59fbaf6f5c45f1d94cf07f7
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT10MFt`9&9zYBNJ`4d22|yUa5W!Hu
zP{9xb7PSJAi~&HR!5&CB01*(w0EYt;&?Gh(7fOEt(ocZ+3=lT}aRd-M0I}oA%DW(3
zxTLWUgjIlIjT5Usoo(RHgV7)FrXRoK@zWVbGXvEy0^zRz|NpZ9*&yszl$!DkNHYPk
z2vm#}NSCA*mly$QR!s=o5Xc6p;R33XW6%JytQaJKBnW`aAq9ZK0oi_#UXYy(j7-cR
SaZVuit@O>$D=tYb0<r;TOFCo#

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/3068bc815c5e573acf89236689705409b253e3c1 b/tests/fuzzer/flatbuffers_verifier_corpus/3068bc815c5e573acf89236689705409b253e3c1
new file mode 100644
index 0000000000000000000000000000000000000000..8ff188a4904e911b80e525aa7292368ef65adb0c
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@Dz9Aq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${1xFab?sgK?qs7a;uvh|d6V0}w|5u>%l0p8Rpw
z@nq%Q!X=G;AglruYn)j9>1+dk9*q8YH~sh>kDtykni;5u(VBsgVb}lv|5<<>5Oym{
zO#xC&Kr8|kVg=GAsl`CT2<Rd(yTlMkgVb;VRmm}E09jVxPyjN(#(-!nzyU0_2UP|X
d4rtbc?O|YKVg`wG0<mwUZ+>2JNoo<04FIR>I}QK<

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/3470f740d4b2e405c2922ebf68838a03fd690a64 b/tests/fuzzer/flatbuffers_verifier_corpus/3470f740d4b2e405c2922ebf68838a03fd690a64
new file mode 100644
index 0000000000000000000000000000000000000000..a0f773fda45ae984b0116fcd9133a9158aba3a78
GIT binary patch
literal 153
zcmeZZU|{g|_X`G6Kw!ntz`y}wm;kW_5VJDaFgP%{09hVD3<5q30SpNY84Mu|5ex+k
q6$~+8Q7aJ17yu+1?16*>5IKN!U>eQFU<4G$Wwry*Y#?x8$N&I$%no+|

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/489b729a42a6ff5bcc30d341f29fd1660700c0b8 b/tests/fuzzer/flatbuffers_verifier_corpus/489b729a42a6ff5bcc30d341f29fd1660700c0b8
new file mode 100644
index 0000000000000000000000000000000000000000..62afb03c11744761a8c0e6afdd079fdc070f63a6
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt{)=Fn9oYAmGCgz>vU@!4Sd_
z!BD_Z0ThV=Vk?joV*rq7um=(jKm^1vz~R6IG>Hwyh0<Su^b;UH1H=tL909}*K<s$3
z@-7G$E@|uoVHKcQ<HYJuXB+tQVD!hk>BsMQ{B(xV%s@4aK)CDw|NksNHVC^FrKUUs
z(m=;Eh=9d38CV?{7)nx$OF;f(1!54}5J-d6Z~;}xF=zl;R^U(oGQj45XcQoT!b9PJ
f!U5TSkR-?+21X`kkT@q0`&Rnq=M|Tv76I7+ZA?0l

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/50866a2404c2cfbbcaae258011c012d819a842a5 b/tests/fuzzer/flatbuffers_verifier_corpus/50866a2404c2cfbbcaae258011c012d819a842a5
new file mode 100644
index 0000000000000000000000000000000000000000..70f6819bca01e9d5ba202fdad4f68cf86cf51593
GIT binary patch
literal 656
zcmZuvyGjF55IwuP5^S_cEeaO8ouK$Y@CJiyVN5`aEi6(P6btc@B4V>CY=wM+VBt6T
z10v`jm`<#06dSAcoV$DTKxcDiCTHjF9PUg6pi<r0WuUDgDF9>47Ks&N2J7@83?jx7
zunp8u=d*_xr)Z%=UMFc@jV{@sGyD<G3dToZzv~#qZ{m%3CK7@ctILocP!LZ#JpuI?
zGNIMOgo1|k?2G(gkFl@l{_0T|>A597h<kz-8@kfdWmh=6Yu^a7<l3F9ua{)v#Kq6<
z;p1!cv+3dpYdk&=X_}5Qzb3ZM8wc-<K2apZ2Sl@R(OgnKpXCc#3C6u5rZC4h%k~y{
z3BEm~PdiL9b0)TL(>B#$)JTv3k!l(dmFjVS@B<gUYHM`S<-BfSL3(weU65=bWxFOS
f=6-NP>Nv_5B<m!yH>ei>XiC}6XrB_~OB4SBejiip

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/50c219f74b02582ea4eaa683f0605b5cd16d6ed6 b/tests/fuzzer/flatbuffers_verifier_corpus/50c219f74b02582ea4eaa683f0605b5cd16d6ed6
new file mode 100644
index 0000000000000000000000000000000000000000..d68d6bb88dd68467ca1c5b20fab8f46c47246bb6
GIT binary patch
literal 154
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
i1q>AoF<?<E5Xl$-BpU32gaZ&cfOL>!Hc%S_Lk0kSSPoAB

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/525f958d1709f5e926cba564e23180b60d80fb9a b/tests/fuzzer/flatbuffers_verifier_corpus/525f958d1709f5e926cba564e23180b60d80fb9a
new file mode 100644
index 0000000000000000000000000000000000000000..b4a324f4a184e723c03a87cf8bbcdb339001cd18
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22|yUa5W!Hu
zP{9xb7PSJAi~&HR!5&CB01*(w0EYt;&?Gh(7fOEt(ocZ+3=lT}aRd-M0I}oA%DW(3
zxTLWUgjIlIjT5Usoo(RHgV7)FrXRoK@zWVbGXvEy0^zRz|NpZ9*&yszl$!DkNHYPk
z2vm#}NSCA*mly$QR!s=o5Xc6p;R33XW6%JytiYiFWPr^9(L@3(P&gpl57Gy+lYx<m
U86?gL#J-ij`FX`9sYO6G06;}LZU6uP

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/543e528d3150cd0d2a45973cf98e992d67f7c406 b/tests/fuzzer/flatbuffers_verifier_corpus/543e528d3150cd0d2a45973cf98e992d67f7c406
new file mode 100644
index 0000000000000000000000000000000000000000..8c145cefc1a2f77a5a039c39c79fe7f041c933bc
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Y1)-qTCS*#2;3=Rw~K$ZuP1_2+20EPsH42BSf
z2!;ZN3WgZ4s1=wDU|?Wuum>_7fCz|TfWv_aXc8NY3#GpR=_f#Z28bJgI0A?rfY|Y5
z<y{aiT+-MF!YV+q#);LR&NlGp!RU{7(~sZr_~{IznH7Lm1L3a!|NpZ9)q}8GQECd1
zVqgMd5g-PMu>x^PYH<kzgE5?K2owXU;R33XW6%JytiYiFWPtU6XjCA9#Pwz12lE8L
fBq$uv?FZS(z{tc566XZsJYV0+{Nj?-A|M+88814&

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/5a2f21b370496184851baffbbbb450fe49aed324 b/tests/fuzzer/flatbuffers_verifier_corpus/5a2f21b370496184851baffbbbb450fe49aed324
new file mode 100644
index 0000000000000000000000000000000000000000..364177753d58aff2599d3a3204c2e903822b4337
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9#9b<h5&{Hh75)fh6siN
zh6;ulpg2e;1OzZP*aKM(Km^1vz~R6IG>Hwyh0<Su^b;UH1H=tL909}*K<s$3@-7G$
zE@|uoVHKcQ<HYJuXB+tQVD!hkCyw9o`04!dZaSD|2C88M!d?IW|7QWRLD;P*H3dj9
zFafa$5QD^6fw&~KxWovFZ3tw8)Nlb+$uVdESyJFo05ZUOKr{$|^rHey5l}dQL_rv4
ZKgdo7MkZ#E7$*={`sU{qm!uW}nE>i<Ibi?*

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/5bbf4a7b9da7aee4db6b21ea62128df74aa23b59 b/tests/fuzzer/flatbuffers_verifier_corpus/5bbf4a7b9da7aee4db6b21ea62128df74aa23b59
new file mode 100644
index 0000000000000000000000000000000000000000..181f2c9d17738ea1b5319fdcc7b79a67a86ce000
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22|yUa5W!Hu
zP{9xb7PSJAi~&HR!5&CB01*(w0EYt;&?Gh(7fOEt(ocZ+3=lT}aRd-M0I}oA%DW(3
zxTLWUgjIlIjT5Usoo(RHgV7)FrXRoK@zWVbGXvEy0^zRz|NpZ9*&yszl$!DkNHYPk
z2vm#}NSCA*mly$QR!s=o5Xc6p;R33XW6%JytiYiFWPr^9(Fg$cDT0f}0?8uV50VDi
Y$-v0O3=-!AV&6*N{Ji3l)FL1o07ln3ZU6uP

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/61005237d5ba26c372b347249143b793c324186a b/tests/fuzzer/flatbuffers_verifier_corpus/61005237d5ba26c372b347249143b793c324186a
new file mode 100644
index 0000000000000000000000000000000000000000..d24ae01c485191ac8d37da0216b095f59be96495
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!nd#=ybQ0A!f}u>}ybGT1OUFt`9&9ze{%-~%E85*RWVLKq?#
z3K%LF7*50hg{(m0j6f-d274gO0f>MY1~?p;fF`lQxKR2FkbVNhXMnf?h$Dd50f-$>
zR^A2S!X=G;AglruJ2<iW)7b|8yvB<V`s3a7<99rMI>TsYpc+OX-1Yzee-<Dcgx!i#
zQ-Bl$6A+64F-VLRh)Yt7ON^lG8X(&c$Oft50;-Z@&;YU|fT6&^pb5kvJuraG274Ao
m7Nkl691b9LAPln~WG4e76Eh3Y7EU0u(l<Y^xFod*$OHh*fjVLU

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/6207082d567e33f6569e5ffac1e882b6988f5e86 b/tests/fuzzer/flatbuffers_verifier_corpus/6207082d567e33f6569e5ffac1e882b6988f5e86
new file mode 100644
index 0000000000000000000000000000000000000000..99595ae3e41133621bb69f84eb3088d569c8a2c3
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9ze{%;KL9ABoi1iK%9sI
zhL8#dh8Q5z3dCn*0LnJl16dA01jI1F;lKnmi4Deu(qDk|6CgeV#0@|k0mKeK?0B;B
zE(jYgY3wTmVilm+!HLzM&NlGpHC}|!AMd6gzvJ=K8AdY$)i46#uK)l4vjEv3>{gVT
z0;Cw2fLH{GL1L^xT#{N`VuZvt1hPSDxPYqU7&L$^D{v?<0NEftFo4X~U=RQbBa47k
jDS*QPBnrYX`$2XxFfuW-0Bzv}GAn)a^NLGSi-1f3wm><m

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/699e2869e8bb9dad4ed0ca23245976e08d6abf96 b/tests/fuzzer/flatbuffers_verifier_corpus/699e2869e8bb9dad4ed0ca23245976e08d6abf96
new file mode 100644
index 0000000000000000000000000000000000000000..438003909b15734c162aff46df7935f8b1159893
GIT binary patch
literal 384
zcmeZZU|`Vl_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1N}GPnR)9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${2&G679ugK?qs7a;uvh|d6V0}w|rFlB&rGB}>B
zybHpGOB(w?SOqB7II;TE*#`bR82#~X`tds+Kb>JTGthb<-1Yzee-@x}5Oym{O#xC2
zOh7CG5n??8WS68Gl`s^8{03qdml#6TZ~;}xF=zmJR^U(oGQj45XktJEP!T8`(Cr7=
Y!@$VI3=-!AV&6*N{Ji3l)FL1o09x!i-T(jq

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/6a9bcfb376f95d3d235f6e3479ae37b906be2a17 b/tests/fuzzer/flatbuffers_verifier_corpus/6a9bcfb376f95d3d235f6e3479ae37b906be2a17
new file mode 100644
index 0000000000000000000000000000000000000000..9c42a4db117a10f20cb91945dbd7cedbbb709463
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${1xFab?sgL2iO^cNug1c=W7aRU%X0I>rQJD#k(
z3&Mp<8v8(41t``yvHH{52L3!4{qb)4@jD(ronbUHPz@sx?)v}#KMRlz!fr*WDL{&W
z35Z1?LaaxC?2^>t5+fkZ3S}DtX^<K&pei{A4Is-3911`N*c=cI2VjpfG{E_243IR)
eZV-mq53+}Wk%<{3#tFo}mA?6T#U-glKsEqqGdj`$

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/6b1e41ca991828476b077ebda3f7e9936b549c32 b/tests/fuzzer/flatbuffers_verifier_corpus/6b1e41ca991828476b077ebda3f7e9936b549c32
new file mode 100644
index 0000000000000000000000000000000000000000..0105f4e2d8add3b505594f1a5f31fe6ff93cf55c
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6K%m3Wz`y~d*%(Z~d<zCv1{($k1{WaD11!S8;KLBWkid|^5W*0_
zP{2^Z5Cays0+EaiK)D8eAj<)WfEWfi9GHM6vB9`d`U{YL0>o#){Due+<p9KvCoAuQ
zaN&~1J`h%6Xk=iRSpDg21AkuQMF{=zZu;>%9zUI7G&4{iBg1EgUH||8X92Q7*sUlv
z1xPV40kH@WgTz>Ycus0@i4l}t0%RKk*&sDsKvi-K8bFo~I23>kupST%0wDbmfM6*w
oD8dB6G$<TEvLNgNwI5_B10xeN3(yu$AhXgpKd-nXwFt-r05--tR{#J2

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/6e146549ff6aefcd1314a8b04cd7ee0955796002 b/tests/fuzzer/flatbuffers_verifier_corpus/6e146549ff6aefcd1314a8b04cd7ee0955796002
new file mode 100644
index 0000000000000000000000000000000000000000..4594fb7d19a38a2359be430f267cab9f71afb741
GIT binary patch
literal 383
zcmeZZU|{g`_YDS8Kw!ntz`(&!!@$O10_0f$F)M=&g9C#LkmUiyAmGCgz>vU@!4Sd_
z!BD_Z!4Lx$wE~fh0YIX`9!NL<5fB4GHi+PGU;>)N24W(CFF^JaAU*@c4L}?L#1260
zc=E?x$CH(JmlQ53Y;5f7Qvr%KPOScPwt+tnMt{7Ue*BKdPiGj-3{=Bt&A`a8>;M1%
zEI<wjyA`FT04XLQ76I{rfE9>KQj39v5sY182owXU;bIVBkYmsQvaEoi00B^KKn_R+
kVE_sTkRA|rGXh%=wuga{i5Vou3B<mYzWI5@sYO6002VMh8~^|S

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/7c1217cf933de200b58fd2bf494044ebb6d90cde b/tests/fuzzer/flatbuffers_verifier_corpus/7c1217cf933de200b58fd2bf494044ebb6d90cde
new file mode 100644
index 0000000000000000000000000000000000000000..97e3bf2a00ad34225b12511b7ff06aabc15a045f
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6K%l|Uz`y~d*%(ZKqy-SOGT1OUFt`9&Am9PSJ`4d22@DwwAq)`=
z1q>AoF<==hFd4wWz}R39WI6y55W@h60~63BHW(L5e*w}@fcOj$Hvn-25IX>|<H^dq
zAY8blu@8h*fMSgkt3RD>;Ln56AMd6gzvJ=K8AdY$)i46#uK)l4vjEv3>{gVT0;Cw2
zfLH{GL1L^xT#{N`VvNK#1hPSDxPYqUfMLMEU<D2ZAOoZYECQmj17DCZBLjl~SQ-=#
fAWa|)vmaz910xeNNQ@JReJg$Q^NLGSi-2qZq@+2b

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/7e0fac79b1dfbbdcaeee925535b66c2834d13814 b/tests/fuzzer/flatbuffers_verifier_corpus/7e0fac79b1dfbbdcaeee925535b66c2834d13814
new file mode 100644
index 0000000000000000000000000000000000000000..9ce31af10ace5ce76404150a68c021457662facf
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SqVXy&`E<o%7#310q5WtYYkP#9AWEU`0
zFvNgGtw1DW0FY>~2NDiI1jI1F;lRYe3N#fJd;xNw0P!6lZUADCi4H*Qc(U>?2p2AC
z>;qvHpjhL?>Q84I`14@&$Ghpr?|A%lhSAJGHH<*G>;M1%EI>90yA`FT04WA0AQk~)
zkQgfvm!uY#7$LC@fozZ(E}$wo1`Qy~3LFYR23QY>#s(Cy2!g@^$$kcq13-2%FfuWN
T#5sZ3x6(I1uec<&2*?HiEHF8=

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/8718d7c1e9a536adb95fb0c749db4554311895e0 b/tests/fuzzer/flatbuffers_verifier_corpus/8718d7c1e9a536adb95fb0c749db4554311895e0
new file mode 100644
index 0000000000000000000000000000000000000000..ea284ed7e257decd953485ec6a42f4f9527f0fdb
GIT binary patch
literal 383
zcmeZZU|{g|_frN^Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xr~@lxwgDvK)X2h+%-kfeC058;lF3zX0hcKzs&>8-O?hh#i2~@nq#)
z5H4KO*ayNYK(WS&)t}Bb@cT7h1k-sR@1`HW<MGoOMl%D|FaqJO|NsB90NEhyR+O3o
zq!^fhSOkbcVyr-1l3HA1h{gt~;R33XW6%Jy6u_YXWPtU6Xb=GE2L%oi0GWsiK;Zxq
e1!0)|AUhctnV4CCF5v_+D}D3xic3<9fJ^`_r#Qy|

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/8ae96e1702303027346b59d0a6acbd1ef0b1955f b/tests/fuzzer/flatbuffers_verifier_corpus/8ae96e1702303027346b59d0a6acbd1ef0b1955f
new file mode 100644
index 0000000000000000000000000000000000000000..de58d75c7e01fd77a204a4afb5d9ac56ca90d351
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKq=hvD11p0Kg9C#Lkmmu!AmGCgz>vU@!4Sd_
z!BD_Z!4Lx$wE~fh0YIX`{y76s3xfj?!vKc^6VN0!7#B)^0n$%^_zVy?0C5BmI{>lc
z$;!JRT)3pM4}?{KVvQ54Kb>vh&x6q)@1`HW<MGq^<6SKXgBhrZ5eRqv|Nox_$Od7z
zqSO>1#lQr_B0vlhV+G=p)Z!8(rXi3GQo;pPB*&luWLbej0muMr0nx+)D@KSOWa~jz
YGB7eRgTy$2*tgO*Kd-nXwFu~20QJr~hyVZp

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/8ed7b897a2c4f2f262a5319910a5bd1db4b6dcae b/tests/fuzzer/flatbuffers_verifier_corpus/8ed7b897a2c4f2f262a5319910a5bd1db4b6dcae
new file mode 100644
index 0000000000000000000000000000000000000000..63453c1fc6e1cf2ae71e7f1ca50b2ff39114e59a
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`(&!!@$O10_0f$F)M=&g9C#LkmUiyAmGCgz>vU@!4Sd_
z!BD_Z!4Lx$wE~fh0YIX`9!NL<5fH-whXWJPBsLfqN`C>;Pk{Ig5H|pE1Q0s_vE#`f
zcO6ew-d$3-q_DBEuTKRi);O{H)7b|8JQ)4)Zu;>%9zUI7G&4{QqcsB~!><4T|FZx&
zAnaC@ngXPlfLH{?2Le_gE=es05=Jm~i6Kx7q=t(@gh7r$1IV%hh5`gYwLy9KC<m}4
jC>%g~K-kR)Y(3Z>21X`kkQgTr`&Rnq=M|Tv76I7+=KDHh

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/903747bd5d4239da836d24087e7e279715cc0980 b/tests/fuzzer/flatbuffers_verifier_corpus/903747bd5d4239da836d24087e7e279715cc0980
new file mode 100644
index 0000000000000000000000000000000000000000..d69ca9575972f008c84502d5702b4cf00fb393f4
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SO0<nV)1A_~L2ap8<J`4d22@DwwAq)`=
z1q>AoF<?<E5Xr>A5Wv`A4`ew25fH-whXWJPBsLfqN`C>;Pk{Ig5H|p^77#lCvE#|g
zyC7V+q_Gc#Re)lR6RSU+ZQ##?(I4-oAHU=A(-}rH1Jy7B;jaJx|FZzuAnaC@ngXO4
zfX-qN0a^hP1No;UwYbCxiERjEgVb;VRmm}E09jU`P)Gzaz~+ExVgV=|(Cr7=$-v0O
U3=-!AV&6*N{Ji3l)FL1o0N@lk;s5{u

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/93a0adc29bf3cb1c7ed1b5a12778c1eba06972d7 b/tests/fuzzer/flatbuffers_verifier_corpus/93a0adc29bf3cb1c7ed1b5a12778c1eba06972d7
new file mode 100644
index 0000000000000000000000000000000000000000..47ffbb41bb23fefdda156e609a1d062fb1d90595
GIT binary patch
literal 128
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
n1q>AoF<?<E5Xl$-BpU32gad;ngM$ND4>r?{fJ#87GcW)EB{&QP

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/9f6095cae432e38efe7464bfac3cacd6df3bbc48 b/tests/fuzzer/flatbuffers_verifier_corpus/9f6095cae432e38efe7464bfac3cacd6df3bbc48
new file mode 100644
index 0000000000000000000000000000000000000000..39405a609898a431d2b85c9d13d8690bf5960089
GIT binary patch
literal 578
zcma)2u}%U(6r4MO5E?D4tti9_5(<MPE`gXUKuMsuf`UR~M*t}>Hb-Gg;y?Hm{D2|R
zKY-5IOKhml8IBF1^4{LOnVr1d&5Z}3ad+Dyu}TP#CZ|wjza)|<!;mlFv8(E6qRZ8W
zj{zp=Y~7N&(_{;-*$h9zR@%6{DP^}i{w04AA4EXFg>Oie#nVa{zD;LBmfrOBdHoq2
z_bvad9^RMUrfT_!GY;2048sKV3vn~*-G7r^;*^k|B*wkRab7wX=>oN8GMqZYIaP6+
zf?S=^&9+XgIB=CuRLVhT1idd;Zz{e2bFS?sNvOw*xob2WRlJye;Hm;FU=TlN?1Oe(
Kh8<<Czx)G^WMbF=

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/ae3e1a31be33cc502b6586253274e6b620c78829 b/tests/fuzzer/flatbuffers_verifier_corpus/ae3e1a31be33cc502b6586253274e6b620c78829
new file mode 100644
index 0000000000000000000000000000000000000000..2a3e98c4d092b1abad1167d5cf23c34639be59f6
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Y1<QOb~ELH{^1_uTgAj<=YZGhN^A%G!)A%h`=
zA%dZRp@Ja>C<f9A0s#yRj1Bfch64}*F${1xFab?sgK?qs7a;uvh|d6V0}w|5u>%l0
zo~*nJ!i7s3`<67S^c4cd8YfnNI@`dX2ctjUO+S9e<EJy2W_I@Y2~@)fguDL#|IY$s
zgRomsY6_5IU;<(hAO?xC0&z)dafvY!+YrbGso?^ul4H;SvaG<NV9lTo)&mm31|Wgv
j3zZT8)1Yubw;yCD10xeNNSqUheJg$Q^NLGSix?OHH+?$7

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/b75487b8176eda7fb18e4f408208caa82d7c121a b/tests/fuzzer/flatbuffers_verifier_corpus/b75487b8176eda7fb18e4f408208caa82d7c121a
new file mode 100644
index 0000000000000000000000000000000000000000..3ce0a08bf612fe1e696e9ed6558c77f31dd2e67f
GIT binary patch
literal 174
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Z~d<zCv1{($!AY=g23=A1S?86YikN{+bFhnpE
zFjO$a0L4B7bpin+15mC(AINg>0Pz_d9KaNq@b#C1TEpSM1T>coE(KDHaDyD08z8a}
GmjD3k4-g&z

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/bf3d7a99df32ac45e9081eb3519524930c85de89 b/tests/fuzzer/flatbuffers_verifier_corpus/bf3d7a99df32ac45e9081eb3519524930c85de89
new file mode 100644
index 0000000000000000000000000000000000000000..8657dcb0214a3645742750dc0910c4646cefa631
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9ze{%puph65WtYYkP#9A
z<P|VfFvNhxtw1DW0FY>~2NDiI1jI1F;lKnmi4Deu(qDk|6CgeV#0@|UGSLBu9Zy!?
z1>wRajeQ`j0u*bUSpDg21AiWj{&+Y2_#Ka*&M=x8sD=>;cm4nWp9RPUVYi~x6f+>r
z1jHgxF;*a5l3HA12&9qOAT?Y-RdNg(K$aCa6o3q{IUpJa7-0+?G$<U9?FT6X*~7rd
U#0(PW1Y+Mx-@M|Yl2jlQ0IX>_6aWAK

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/bf60f275ed989532747e7bbcc93ab2bbd834becc b/tests/fuzzer/flatbuffers_verifier_corpus/bf60f275ed989532747e7bbcc93ab2bbd834becc
new file mode 100644
index 0000000000000000000000000000000000000000..e99b11a480cc2abb57fa2dbcd7df3ccd25ff1a84
GIT binary patch
literal 122
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Z~d<zCvh64;PK*+#g1H>6X?86YikN{+bFhnpE
vFjO$a0L4B7bpin+15mC(AINg>Py`8h05Q;X2M3@CkO>0T{!&2OG=dobRWS~S

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/c5170081fc1f8a36ab30541f087cf530ab0845b6 b/tests/fuzzer/flatbuffers_verifier_corpus/c5170081fc1f8a36ab30541f087cf530ab0845b6
new file mode 100644
index 0000000000000000000000000000000000000000..0b0dcaa82eaaa4e546307652bac98b05124f87c3
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${1xFab?sgK?qs7a;uvh|d6V0}w|5u>%l0o~*nJ
z!i7s3`#@L)DAqW!`qSA4{yZ4{@oxI@J03rs?|y{P%s@4aK)CDw|NksNHVC^FrKSKW
z1|}dD0b-CCD-f5Y7MB>Ju|aCMfU4veG=MBCa3}y7U_BsO4MZRVbz}~L4GITz`$2Xx
XFfuWN#5sZ3x6(I1uec<&2*?HivF15>

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/c51a7d5885bdaa3bae2b125fe13b12e2fba4f9b6 b/tests/fuzzer/flatbuffers_verifier_corpus/c51a7d5885bdaa3bae2b125fe13b12e2fba4f9b6
new file mode 100644
index 0000000000000000000000000000000000000000..4d8cc5591e93bdbf7fbc563df9b9ae313a77e643
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt{)=Fn9oYAmGCgz>vU@!4Sd_
z!BD_Z0ThV=Vk?joV*rq7um=(jKm^1vz~R6IG>Hwyh0<Su^b;UH1H=tL909}*K<s$3
z@-7G$E@|uoVHKcQ<HYJuXB+tQVD!hk>BsMQ{B(xV%s@4aK)CDw|NksNHVC^FrKUUs
z(m=;Eh=9d38CV?{7)nx$OF;f(1!54}5J-d6Z~;}xF=zl;R^U(oGQj45Xcz#Qiw}Up
e0oi_#T97>qj7-cRaZVuit@O>$D=tYb0<r;V+&Y8+

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/cd6ac24fd00acc3e9887fdf2ae300481e745f53a b/tests/fuzzer/flatbuffers_verifier_corpus/cd6ac24fd00acc3e9887fdf2ae300481e745f53a
new file mode 100644
index 0000000000000000000000000000000000000000..e7a84cf0c0ea9c51fae990d3396cd606cb245b0e
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${1xFab?sgK?qs7a;uvh|d6V0}w|5u>%l0o~*nJ
z!i7s3`#@L)DAqW!`qSA4{yZ4{@oxI@J03rs?|y{P%s@4aK)CDw|NksNHVC^FrKSKW
z1|}dD0b-CCD-f5Y7MB<xu?>N2kQy$aDmexXAj=9I3P1)}4~S-9P=in~QXR%Xr9t6<
bZa>IQ21X`kkT@q0`&Rnq=M|Tv76I7+u@X6W

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/cd8e4aef993fcdebd9583069cd0a5468d254c5c7 b/tests/fuzzer/flatbuffers_verifier_corpus/cd8e4aef993fcdebd9583069cd0a5468d254c5c7
new file mode 100644
index 000000000..8e458cce5
--- /dev/null
+++ b/tests/fuzzer/flatbuffers_verifier_corpus/cd8e4aef993fcdebd9583069cd0a5468d254c5c7
@@ -0,0 +1 @@
+š(!!@*YÌø!
'í*!!µ;Fû:'iÊ<:';‚b!ó)*);::!*È''(9à'')(¼ÿ(ô‘('!)!!ê*
\ No newline at end of file
diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/decff8b2d7524b5fad71129ecf0f4edd9082af2a b/tests/fuzzer/flatbuffers_verifier_corpus/decff8b2d7524b5fad71129ecf0f4edd9082af2a
new file mode 100644
index 0000000000000000000000000000000000000000..b2d43130e566d5c15e4cf6896042f398b5df2517
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYC~X7FJMU`Sxd2#El4
z3m7UGVnE_Roj|}C03;ghfrJAP0Wl14I4}WCVuNv^^cNug1c=W7aRU&8OmqNZ$CH(J
zLAY>9V;=~s0L2<7R)0F%z@OJRQ4>smyqkXfj>k`D7|je+!w7`C{{R2a0%U`*TTyBX
zkYZp0Vi6z)iLnB4NosM45fa-F$Oft50;-Z@&;YWmz@Y$Sfc1cAOaKZeOaKZ8bo)Ve
YGB7eRgTy(3*tgO*Kd-nXwFt-t00d|`V*mgE

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/df0b39717d20371162754b37747a0c989623cb48 b/tests/fuzzer/flatbuffers_verifier_corpus/df0b39717d20371162754b37747a0c989623cb48
new file mode 100644
index 0000000000000000000000000000000000000000..abd11f664558e405bce4a22c3fd9b545fd7c445d
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${1xFab?sgK?qs7a;uvh|d6V0}w|5u>%l0p8Rpw
z@nq%Q!X=G;AglruYn)j9>1+dk9*q8YH~sh>kDtykni;5u(VBsgVb}lv|5<<>5Oym{
zO#xC&Kr8|kVg=GAsl`CT2<Rd(yTlMkgVb;VRmm}E09jVxPyjN(#(+eK1)y+1vmR^@
X10xeNNSqUheJg$Q^NLGSi-2qZKiWDE

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/e423e0b67927e2c303dbb7ead3fd68706b92d657 b/tests/fuzzer/flatbuffers_verifier_corpus/e423e0b67927e2c303dbb7ead3fd68706b92d657
new file mode 100644
index 0000000000000000000000000000000000000000..fb23361223f162c5111412cb7c64ce87051aaf05
GIT binary patch
literal 153
zcmeZZU|{g|_X`G6Kw!ntz`)@FWS9W41rW0`*f2OSxByuoQ4sK92w+HH$WUhpVTfQT
pV5ne-0SjA!NX7sl(O?fG9Dv9Hqy^1vpa`20#AvLBgUkkl3;?9N4z>UQ

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/e72266e5ad67af5c27bcd69961460770e82bd24c b/tests/fuzzer/flatbuffers_verifier_corpus/e72266e5ad67af5c27bcd69961460770e82bd24c
new file mode 100644
index 0000000000000000000000000000000000000000..752f2835e72491919f0d1c43f0a0b41855062fb5
GIT binary patch
literal 383
zcmeZZU|{go@Cyb~Kw!ntz`y~d*%(Y1<QOb~ELH{^1_uTgAj<=aeHa255*RWVLKq?#
z3K%LFVu0cxogfgvz`)pG4`et15fH-whXWJPBsLfqN`C>;Pk{Ig5H|pE1Q0s_vE#|g
zyC7V+q_Gc#Re)lR6RSU+ZQ##?(I4-oAHU=A(-}-NJA3>Ds$m4eUH||8X92QPfY_}l
z6+|&G0kH@WgTz^ZxFof>#2ATf2xNoQZ~;}xF=zl;R=`l;V6X<VKzcwT*Z?HZe4$bT
oU>Xz-AUz<=kW%E93Zy`GGB7eRgTy$2*tgO*Kd-nXwTOWM06)b#=l}o!

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/ee80034f2e35e3f07a708b211be4f1967c83b6e9 b/tests/fuzzer/flatbuffers_verifier_corpus/ee80034f2e35e3f07a708b211be4f1967c83b6e9
new file mode 100644
index 0000000000000000000000000000000000000000..2d56c75decbe5477f6c9f2e509bd5c2a294b86fa
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!nd#=ybQ0A!f}u>}ybGT1OUFt`9&9ze{%-~%E85*RWVLKq?#
z3K%LF7*50hg{(m0j6f-d274gO0f>MY1~?p;fF`lQxKR2FkbVNhXMnf?h$Dd50f-$>
zR^A2S!X=G;AglruJ2<iW)7b|8yvB<V`s3a7<99rMI>TsYpc+OX-1Yzee-<Dcgx!i#
zQ-Bl$Qv(Bo2#^Meu>x^PYH^7XlwAX48v@x(K+FYHCC8uvWJv%+fq_92h(UT_0GSQ;
oEQ%~hl>#^%K<YpkW<SVI21X`k7N9MhKxU<HeqM1&Y7vkL02+`w;s5{u

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/f5fd02697cac00a81809909a971f80f28aa4c020 b/tests/fuzzer/flatbuffers_verifier_corpus/f5fd02697cac00a81809909a971f80f28aa4c020
new file mode 100644
index 0000000000000000000000000000000000000000..8b2afdc700fde428defa8fd782c2c26a707d861f
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq){f
zUO@~)1xVBiL@+V{<r?gPEC(P0Vi@3XU;>)N2IE5MFF^VU5T60!1|SBR=K#cxCoAuQ
zaN&~1J`h#`iZxEG{&cp1Kd<p3g#LIp{rDY^pUyCv8K{O42zUMe|DOfO24T0N)D$4a
zzy!o1KnxON1>%y_;u0eywjq!WQo{vQCC8uvWLbej0muOB0ns1;(vJ#IMWlg}pl|?*
ef-uZ}kev*SOw24mTR4HtO5gmv;*!)NAQJ$ZO*usX

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/fbe211a4df09673e54945bb8f5afc4c5cfa67778 b/tests/fuzzer/flatbuffers_verifier_corpus/fbe211a4df09673e54945bb8f5afc4c5cfa67778
new file mode 100644
index 0000000000000000000000000000000000000000..ddbd1cea2dc2c3bd64f9186db04f3295580b7afe
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy+;56DyE(U~mEQJb)Mkd>8^45*RWVLKq?#
z3K%LFV!)zSAd)cvNHo|32?rnoVi@3XU}9henu-d(0J%?q_zVy?0C5BmI{>lc$;!JR
zT)3pM4}?{KVvQ54Kb>vh&x6q)@1`HW<MH#j^T#`P(>;DVGXvEy0^zRz|NpZ9*&ysz
zl$!DkNHYPk2vm#}NSCA*mly$Q7~25I2C3l!s*+>S0J5yWp#Wrn%>mI23|bHhgItFq
h0tyFY`$3W*dl(p*m_g#4K<r!To1a%)l3K*T001SfI_LlZ

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/fc5d4b9117ba9e87388174aee4f4970bdfe8d066 b/tests/fuzzer/flatbuffers_verifier_corpus/fc5d4b9117ba9e87388174aee4f4970bdfe8d066
new file mode 100644
index 000000000..06f1a3b80
--- /dev/null
+++ b/tests/fuzzer/flatbuffers_verifier_corpus/fc5d4b9117ba9e87388174aee4f4970bdfe8d066
@@ -0,0 +1 @@
+HH
\ No newline at end of file
diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/fd11c36a6b2cbceeac9664690b5d35f0f9bb6f01 b/tests/fuzzer/flatbuffers_verifier_corpus/fd11c36a6b2cbceeac9664690b5d35f0f9bb6f01
new file mode 100644
index 0000000000000000000000000000000000000000..79845e5b786c5dcd19a6bb4a57d13e489fb5328b
GIT binary patch
literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Z~d<zCv1{($k1{WaD11!S8;KLBWkN{+7ghVhD
zFjO$afW@sqBqIY*uE8G2asVPAh5-%-CZI`dFfNq-0;Hb+@fjd)0OANBb^v0>la+Tt
zxNu2h9|)@e#TqA8e>&U1pVxR1LVvuQe*BKdPiGj-3{=AiguDL#|IY$sgRomsY6_5I
zU;<(hAO?xC0`Z*G;u0e$y9CHK1hPSDxPYqU7&L$^D{v?P8DKpi8U#T4VF08G!dHX|
kfoV`UfW$!<W<SVI21X`k7N9MhKxU<HeqM1&Y7vkL0KNG+n*aa+

literal 0
HcmV?d00001

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/ff085b6090cadabfabb6f5e785681353fb89eb87 b/tests/fuzzer/flatbuffers_verifier_corpus/ff085b6090cadabfabb6f5e785681353fb89eb87
new file mode 100644
index 0000000000000000000000000000000000000000..f110f6b0eb1bb12aeea1e913fcb65398cef259bb
GIT binary patch
literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOD%dbMFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${1xFfp(KO+^J?fZQiQd<KXcfH(q(9e~*JWaV8D
zE?m;s2f`{qvBrtjpUyV$=fUWYchisG@%ZTsqnUwf7=dutf9wDMS%4f6b}LFv0a6T1
zKr8~pATd@TE=ese0eKL{HUzRkYPf)^<QO!7EGuv@02yFCAeu-33I}xSLDm4B#=y+N
T#J~w;`d0ep=M|Tv76I7+=U_RC

literal 0
HcmV?d00001


From 6704b19db65727d9afbc74e92733516693df9b18 Mon Sep 17 00:00:00 2001
From: Ben Gertzfield <beng@fb.com>
Date: Thu, 28 Apr 2016 12:27:38 -0700
Subject: [PATCH 149/185] Handle \u-escaped surrogate pairs correctly in IDL
 parser

---
 src/idl_parser.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++--
 tests/test.cpp     | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index a606781b5..2bf99eac0 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -236,12 +236,19 @@ CheckedError Parser::Next() {
         if(!isdigit(static_cast<const unsigned char>(*cursor_))) return NoError();
         return Error("floating point constant can\'t start with \".\"");
       case '\"':
-      case '\'':
+      case '\'': {
+        int unicode_high_surrogate = -1;
+
         while (*cursor_ != c) {
           if (*cursor_ < ' ' && *cursor_ >= 0)
             return Error("illegal character in string constant");
           if (*cursor_ == '\\') {
             cursor_++;
+            if (unicode_high_surrogate != -1 &&
+                *cursor_ != 'u') {
+              return Error(
+                "illegal Unicode sequence (unpaired high surrogate)");
+            }
             switch (*cursor_) {
               case 'n':  attribute_ += '\n'; cursor_++; break;
               case 't':  attribute_ += '\t'; cursor_++; break;
@@ -263,18 +270,51 @@ CheckedError Parser::Next() {
                 cursor_++;
                 int64_t val;
                 ECHECK(ParseHexNum(4, &val));
-                ToUTF8(static_cast<int>(val), &attribute_);
+                if (val >= 0xD800 && val <= 0xDBFF) {
+                  if (unicode_high_surrogate != -1) {
+                    return Error(
+                      "illegal Unicode sequence (multiple high surrogates)");
+                  } else {
+                    unicode_high_surrogate = val;
+                  }
+                } else if (val >= 0xDC00 && val <= 0xDFFF) {
+                  if (unicode_high_surrogate == -1) {
+                    return Error(
+                      "illegal Unicode sequence (unpaired low surrogate)");
+                  } else {
+                    int code_point = 0x10000 +
+                      ((unicode_high_surrogate & 0x03FF) << 10) +
+                      (val & 0x03FF);
+                    ToUTF8(code_point, &attribute_);
+                    unicode_high_surrogate = -1;
+                  }
+                } else {
+                  if (unicode_high_surrogate != -1) {
+                    return Error(
+                      "illegal Unicode sequence (unpaired high surrogate)");
+                  }
+                  ToUTF8(static_cast<int>(val), &attribute_);
+                }
                 break;
               }
               default: return Error("unknown escape code in string constant");
             }
           } else { // printable chars + UTF-8 bytes
+            if (unicode_high_surrogate != -1) {
+              return Error(
+                "illegal Unicode sequence (unpaired high surrogate)");
+            }
             attribute_ += *cursor_++;
           }
         }
+        if (unicode_high_surrogate != -1) {
+          return Error(
+            "illegal Unicode sequence (unpaired high surrogate)");
+        }
         cursor_++;
         token_ = kTokenStringConstant;
         return NoError();
+      }
       case '/':
         if (*cursor_ == '/') {
           const char *start = ++cursor_;
diff --git a/tests/test.cpp b/tests/test.cpp
index e636f1f3c..df9cf08b9 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -859,6 +859,44 @@ void UnicodeTest() {
                      "\\u5225\\u30B5\\u30A4\\u30C8\\x01\\x80\"}", true);
 }
 
+void UnicodeSurrogatesTest() {
+  flatbuffers::Parser parser;
+
+  TEST_EQ(
+    parser.Parse(
+      "table T { F:string (id: 0); }"
+      "root_type T;"
+      "{ F:\"\\uD83D\\uDCA9\"}"), true);
+  auto root = flatbuffers::GetRoot<flatbuffers::Table>(
+    parser.builder_.GetBufferPointer());
+  auto string = root->GetPointer<flatbuffers::String *>(
+    flatbuffers::FieldIndexToOffset(0));
+  TEST_EQ(strcmp(string->c_str(), "\xF0\x9F\x92\xA9"), 0);
+}
+
+void UnicodeInvalidSurrogatesTest() {
+  TestError(
+    "table T { F:string; }"
+    "root_type T;"
+    "{ F:\"\\uD800\"}", "unpaired high surrogate");
+  TestError(
+    "table T { F:string; }"
+    "root_type T;"
+    "{ F:\"\\uD800abcd\"}", "unpaired high surrogate");
+  TestError(
+    "table T { F:string; }"
+    "root_type T;"
+    "{ F:\"\\uD800\\n\"}", "unpaired high surrogate");
+  TestError(
+    "table T { F:string; }"
+    "root_type T;"
+    "{ F:\"\\uD800\\uD800\"}", "multiple high surrogates");
+  TestError(
+    "table T { F:string; }"
+    "root_type T;"
+    "{ F:\"\\uDC00\"}", "unpaired low surrogate");
+}
+
 void UnknownFieldsTest() {
   flatbuffers::IDLOptions opts;
   opts.skip_unexpected_fields_in_json = true;
@@ -907,6 +945,8 @@ int main(int /*argc*/, const char * /*argv*/[]) {
   EnumStringsTest();
   IntegerOutOfRangeTest();
   UnicodeTest();
+  UnicodeSurrogatesTest();
+  UnicodeInvalidSurrogatesTest();
   UnknownFieldsTest();
 
   if (!testing_fails) {

From b1e8be27a9544b525a94612f9edbe00e306c07c4 Mon Sep 17 00:00:00 2001
From: James Swift <james@pspdfkit.com>
Date: Tue, 24 May 2016 17:16:03 +0200
Subject: [PATCH 150/185] MSVC doesn't allow alignment on function params. This
 prevents the copy and thus avoids this issue
 https://msdn.microsoft.com/en-us/library/373ak2y1.aspx

---
 include/flatbuffers/flatbuffers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 0fa31250f..ef4a693cc 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -333,7 +333,7 @@ public:
 
   // Change elements if you have a non-const pointer to this object.
   // Scalars only. See reflection.h, and the documentation.
-  void Mutate(uoffset_t i, T val) {
+  void Mutate(uoffset_t i, const T& val) {
     assert(i < size());
     WriteScalar(data() + i, val);
   }

From 4a8801da34b0edd03277b26b6fd280658c585ca6 Mon Sep 17 00:00:00 2001
From: Lakedaemon <olivier.binda@wanadoo.fr>
Date: Wed, 25 May 2016 15:15:56 +0200
Subject: [PATCH 151/185] shared method that exits early if everything is
 generated

---
 include/flatbuffers/code_generators.h | 12 +++++++++++
 src/idl_gen_cpp.cpp                   | 16 +-------------
 src/idl_gen_js.cpp                    | 30 +++++++++++++--------------
 3 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/include/flatbuffers/code_generators.h b/include/flatbuffers/code_generators.h
index 6b27ea780..5770932cc 100644
--- a/include/flatbuffers/code_generators.h
+++ b/include/flatbuffers/code_generators.h
@@ -29,6 +29,18 @@ class BaseGenerator {
  protected:
   virtual ~BaseGenerator(){};
 
+  bool IsEverythingGenerated() {
+    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
+         ++it) {
+      if (!(*it)->generated) return false;
+    }
+    for (auto it = parser_.structs_.vec.begin();
+         it != parser_.structs_.vec.end(); ++it) {
+      if (!(*it)->generated) return false;
+    }
+    return true;
+  }
+
   const Parser &parser_;
   const std::string &path_;
   const std::string &file_name_;
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 0e5d823f3..33024df1c 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -724,21 +724,7 @@ class CppGenerator : public BaseGenerator {
   // structs,
   // and tables) and output them to a single file.
   bool generate() {
-    // Check if we have any code to generate at all, to avoid an empty header.
-    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
-         ++it) {
-      if (!(*it)->generated) goto generate_code;
-    }
-    for (auto it = parser_.structs_.vec.begin(); it != parser_.structs_.vec.end();
-         ++it) {
-      if (!(*it)->generated) goto generate_code;
-    }
-    // No code to generate, exit:
-    return true;
-
-  generate_code:
-
-    using namespace cpp;
+    if (IsEverythingGenerated()) return true;
 
     std::string code;
     code =
diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp
index de81f2764..0265394ed 100644
--- a/src/idl_gen_js.cpp
+++ b/src/idl_gen_js.cpp
@@ -678,31 +678,29 @@ class JsGenerator : public BaseGenerator {
   // Iterate through all definitions we haven't generate code for (enums,
   // structs, and tables) and output them to a single file.
   bool generate() {
+    if (IsEverythingGenerated()) return true;
+
     std::string enum_code, struct_code, exports_code, code;
     generateEnums(&enum_code, &exports_code);
     generateStructs(&struct_code, &exports_code);
 
-    // Only output file-level code if there were any declarations.
-    if (enum_code.length() || struct_code.length()) {
-      code +=
-          "// automatically generated by the FlatBuffers compiler, do not "
-          "modify\n\n";
+    code +=
+        "// automatically generated by the FlatBuffers compiler, do not "
+        "modify\n\n";
 
-      // Generate code for all the namespace declarations.
-      GenNamespaces(parser_, &code, &exports_code);
+    // Generate code for all the namespace declarations.
+    GenNamespaces(parser_, &code, &exports_code);
 
-      // Output the main declaration code from above.
-      code += enum_code;
-      code += struct_code;
+    // Output the main declaration code from above.
+    code += enum_code;
+    code += struct_code;
 
-      if (!exports_code.empty() && !parser_.opts.skip_js_exports) {
-        code += "// Exports for Node.js and RequireJS\n";
-        code += exports_code;
-      }
+    if (!exports_code.empty() && !parser_.opts.skip_js_exports) {
+      code += "// Exports for Node.js and RequireJS\n";
+      code += exports_code;
     }
 
-    return !code.length() ||
-           SaveFile(GeneratedFileName(path_, file_name_).c_str(), code, false);
+    return SaveFile(GeneratedFileName(path_, file_name_).c_str(), code, false);
   }
 
  private:

From a98bff3ea1b11ecde55fa2cc48bf6912ceb546c4 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Fri, 22 Apr 2016 18:29:22 -0700
Subject: [PATCH 152/185] Add simple libfuzzer based test.

This tests the verifier and the parser.

Tested: on Linux.
Bug: 27230459
Change-Id: I3417faba9385dc941199c57a08d8a50c2faec1aa
---
 tests/fuzzer/build_fuzzer.sh                  |  20 ++++++++++++++++++
 tests/fuzzer/build_run_parser_test.sh         |  20 ++++++++++++++++++
 tests/fuzzer/build_run_verifier_test.sh       |  20 ++++++++++++++++++
 tests/fuzzer/flatbuffers_parser_fuzzer.cc     |  16 ++++++++++++++
 .../01a40c02ea9c030b9fcf8aaf51fe1b6681e00490  | Bin 383 -> 0 bytes
 .../075a40dd6e6eec9cc96f0399c182f62361cdc553  | Bin 154 -> 0 bytes
 .../0c319e8089228db0958f35c54614d4e2d917f9d5  | Bin 383 -> 0 bytes
 .../0d654589709444777a4a854ec16b7160b0b8f06f  | Bin 154 -> 0 bytes
 .../10ace4829162a0d37730ad898ee6ef2b76849ce4  | Bin 383 -> 0 bytes
 .../12986603181adee83afedc8206f86ead9fd20653  | Bin 383 -> 0 bytes
 .../14c816a2f528da8004315f8e71aec9e7e9f4df89  | Bin 383 -> 0 bytes
 .../14d90e4ac5f58f07be524633e96fb8f6521116e2  | Bin 771 -> 0 bytes
 .../2290776813d50bf54386dc6670aea41c8eb4f73f  | Bin 383 -> 0 bytes
 .../2357f92773faefb0049312fcf7421f2c4ef08dc5  | Bin 383 -> 0 bytes
 .../235a53ee083b428f4eb80eb5af6a8b41a4036d55  | Bin 384 -> 0 bytes
 .../243d7b9356afab5800b0fd424a0f90cefeb8f411  | Bin 79 -> 0 bytes
 .../2e2249e476941c7390d924d8f6c88b5d59d0e300  | Bin 384 -> 0 bytes
 .../3068bc815c5e573acf89236689705409b253e3c1  | Bin 384 -> 0 bytes
 .../3470f740d4b2e405c2922ebf68838a03fd690a64  | Bin 153 -> 0 bytes
 .../489b729a42a6ff5bcc30d341f29fd1660700c0b8  | Bin 384 -> 0 bytes
 .../50866a2404c2cfbbcaae258011c012d819a842a5  | Bin 656 -> 0 bytes
 .../50c219f74b02582ea4eaa683f0605b5cd16d6ed6  | Bin 154 -> 0 bytes
 .../525f958d1709f5e926cba564e23180b60d80fb9a  | Bin 384 -> 0 bytes
 .../543e528d3150cd0d2a45973cf98e992d67f7c406  | Bin 384 -> 0 bytes
 .../5a2f21b370496184851baffbbbb450fe49aed324  | Bin 383 -> 0 bytes
 .../5bbf4a7b9da7aee4db6b21ea62128df74aa23b59  | Bin 384 -> 0 bytes
 .../61005237d5ba26c372b347249143b793c324186a  | Bin 383 -> 0 bytes
 .../6207082d567e33f6569e5ffac1e882b6988f5e86  | Bin 383 -> 0 bytes
 .../699e2869e8bb9dad4ed0ca23245976e08d6abf96  | Bin 384 -> 0 bytes
 .../6a9bcfb376f95d3d235f6e3479ae37b906be2a17  | Bin 384 -> 0 bytes
 .../6b1e41ca991828476b077ebda3f7e9936b549c32  | Bin 383 -> 0 bytes
 .../6e146549ff6aefcd1314a8b04cd7ee0955796002  | Bin 383 -> 0 bytes
 .../7c1217cf933de200b58fd2bf494044ebb6d90cde  | Bin 384 -> 0 bytes
 .../7e0fac79b1dfbbdcaeee925535b66c2834d13814  | Bin 384 -> 0 bytes
 .../8718d7c1e9a536adb95fb0c749db4554311895e0  | Bin 383 -> 0 bytes
 .../8ae96e1702303027346b59d0a6acbd1ef0b1955f  | Bin 384 -> 0 bytes
 .../8ed7b897a2c4f2f262a5319910a5bd1db4b6dcae  | Bin 384 -> 0 bytes
 .../903747bd5d4239da836d24087e7e279715cc0980  | Bin 384 -> 0 bytes
 .../93a0adc29bf3cb1c7ed1b5a12778c1eba06972d7  | Bin 128 -> 0 bytes
 .../9f6095cae432e38efe7464bfac3cacd6df3bbc48  | Bin 578 -> 0 bytes
 .../ae3e1a31be33cc502b6586253274e6b620c78829  | Bin 383 -> 0 bytes
 .../b75487b8176eda7fb18e4f408208caa82d7c121a  | Bin 174 -> 0 bytes
 .../bf3d7a99df32ac45e9081eb3519524930c85de89  | Bin 383 -> 0 bytes
 .../bf60f275ed989532747e7bbcc93ab2bbd834becc  | Bin 122 -> 0 bytes
 .../c5170081fc1f8a36ab30541f087cf530ab0845b6  | Bin 384 -> 0 bytes
 .../c51a7d5885bdaa3bae2b125fe13b12e2fba4f9b6  | Bin 384 -> 0 bytes
 .../cd6ac24fd00acc3e9887fdf2ae300481e745f53a  | Bin 384 -> 0 bytes
 .../cd8e4aef993fcdebd9583069cd0a5468d254c5c7  |   1 -
 .../decff8b2d7524b5fad71129ecf0f4edd9082af2a  | Bin 384 -> 0 bytes
 .../df0b39717d20371162754b37747a0c989623cb48  | Bin 384 -> 0 bytes
 .../e423e0b67927e2c303dbb7ead3fd68706b92d657  | Bin 153 -> 0 bytes
 .../e72266e5ad67af5c27bcd69961460770e82bd24c  | Bin 383 -> 0 bytes
 .../ee80034f2e35e3f07a708b211be4f1967c83b6e9  | Bin 383 -> 0 bytes
 .../f5fd02697cac00a81809909a971f80f28aa4c020  | Bin 383 -> 0 bytes
 .../fbe211a4df09673e54945bb8f5afc4c5cfa67778  | Bin 383 -> 0 bytes
 .../fc5d4b9117ba9e87388174aee4f4970bdfe8d066  |   1 -
 .../fd11c36a6b2cbceeac9664690b5d35f0f9bb6f01  | Bin 383 -> 0 bytes
 .../ff085b6090cadabfabb6f5e785681353fb89eb87  | Bin 384 -> 0 bytes
 .../fuzz-0-flatbuffers_verifier_fuzzer        | Bin 411 -> 0 bytes
 tests/fuzzer/flatbuffers_verifier_fuzzer.cc   |   2 +-
 60 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 tests/fuzzer/build_fuzzer.sh
 create mode 100644 tests/fuzzer/build_run_parser_test.sh
 create mode 100644 tests/fuzzer/build_run_verifier_test.sh
 create mode 100644 tests/fuzzer/flatbuffers_parser_fuzzer.cc
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/01a40c02ea9c030b9fcf8aaf51fe1b6681e00490
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/075a40dd6e6eec9cc96f0399c182f62361cdc553
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/0c319e8089228db0958f35c54614d4e2d917f9d5
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/0d654589709444777a4a854ec16b7160b0b8f06f
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/10ace4829162a0d37730ad898ee6ef2b76849ce4
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/12986603181adee83afedc8206f86ead9fd20653
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/14c816a2f528da8004315f8e71aec9e7e9f4df89
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/14d90e4ac5f58f07be524633e96fb8f6521116e2
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/2290776813d50bf54386dc6670aea41c8eb4f73f
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/2357f92773faefb0049312fcf7421f2c4ef08dc5
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/235a53ee083b428f4eb80eb5af6a8b41a4036d55
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/243d7b9356afab5800b0fd424a0f90cefeb8f411
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/2e2249e476941c7390d924d8f6c88b5d59d0e300
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/3068bc815c5e573acf89236689705409b253e3c1
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/3470f740d4b2e405c2922ebf68838a03fd690a64
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/489b729a42a6ff5bcc30d341f29fd1660700c0b8
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/50866a2404c2cfbbcaae258011c012d819a842a5
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/50c219f74b02582ea4eaa683f0605b5cd16d6ed6
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/525f958d1709f5e926cba564e23180b60d80fb9a
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/543e528d3150cd0d2a45973cf98e992d67f7c406
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/5a2f21b370496184851baffbbbb450fe49aed324
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/5bbf4a7b9da7aee4db6b21ea62128df74aa23b59
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/61005237d5ba26c372b347249143b793c324186a
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/6207082d567e33f6569e5ffac1e882b6988f5e86
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/699e2869e8bb9dad4ed0ca23245976e08d6abf96
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/6a9bcfb376f95d3d235f6e3479ae37b906be2a17
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/6b1e41ca991828476b077ebda3f7e9936b549c32
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/6e146549ff6aefcd1314a8b04cd7ee0955796002
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/7c1217cf933de200b58fd2bf494044ebb6d90cde
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/7e0fac79b1dfbbdcaeee925535b66c2834d13814
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/8718d7c1e9a536adb95fb0c749db4554311895e0
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/8ae96e1702303027346b59d0a6acbd1ef0b1955f
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/8ed7b897a2c4f2f262a5319910a5bd1db4b6dcae
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/903747bd5d4239da836d24087e7e279715cc0980
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/93a0adc29bf3cb1c7ed1b5a12778c1eba06972d7
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/9f6095cae432e38efe7464bfac3cacd6df3bbc48
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/ae3e1a31be33cc502b6586253274e6b620c78829
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/b75487b8176eda7fb18e4f408208caa82d7c121a
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/bf3d7a99df32ac45e9081eb3519524930c85de89
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/bf60f275ed989532747e7bbcc93ab2bbd834becc
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/c5170081fc1f8a36ab30541f087cf530ab0845b6
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/c51a7d5885bdaa3bae2b125fe13b12e2fba4f9b6
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/cd6ac24fd00acc3e9887fdf2ae300481e745f53a
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/cd8e4aef993fcdebd9583069cd0a5468d254c5c7
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/decff8b2d7524b5fad71129ecf0f4edd9082af2a
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/df0b39717d20371162754b37747a0c989623cb48
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/e423e0b67927e2c303dbb7ead3fd68706b92d657
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/e72266e5ad67af5c27bcd69961460770e82bd24c
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/ee80034f2e35e3f07a708b211be4f1967c83b6e9
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/f5fd02697cac00a81809909a971f80f28aa4c020
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/fbe211a4df09673e54945bb8f5afc4c5cfa67778
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/fc5d4b9117ba9e87388174aee4f4970bdfe8d066
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/fd11c36a6b2cbceeac9664690b5d35f0f9bb6f01
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/ff085b6090cadabfabb6f5e785681353fb89eb87
 delete mode 100644 tests/fuzzer/flatbuffers_verifier_corpus/fuzz-0-flatbuffers_verifier_fuzzer

diff --git a/tests/fuzzer/build_fuzzer.sh b/tests/fuzzer/build_fuzzer.sh
new file mode 100644
index 000000000..48eb3b7c9
--- /dev/null
+++ b/tests/fuzzer/build_fuzzer.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+git clone https://chromium.googlesource.com/chromium/llvm-project/llvm/lib/Fuzzer
+clang++ -c -g -O2 -std=c++11 Fuzzer/*.cpp -IFuzzer
+ar ruv libFuzzer.a Fuzzer*.o
+rm -rf Fuzzer *.o
diff --git a/tests/fuzzer/build_run_parser_test.sh b/tests/fuzzer/build_run_parser_test.sh
new file mode 100644
index 000000000..3a053e762
--- /dev/null
+++ b/tests/fuzzer/build_run_parser_test.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+clang++ -fsanitize-coverage=edge -fsanitize=address -std=c++11 -stdlib=libstdc++ -I.. -I../../include flatbuffers_parser_fuzzer.cc ../../src/idl_parser.cpp ../../src/util.cpp libFuzzer.a -o fuzz_parser
+mkdir -p parser_corpus
+cp ../*.json ../*.fbs parser_corpus
+./fuzz_parser parser_corpus
diff --git a/tests/fuzzer/build_run_verifier_test.sh b/tests/fuzzer/build_run_verifier_test.sh
new file mode 100644
index 000000000..67616496a
--- /dev/null
+++ b/tests/fuzzer/build_run_verifier_test.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+clang++ -fsanitize-coverage=edge -fsanitize=address -std=c++11 -stdlib=libstdc++ -I.. -I../../include flatbuffers_verifier_fuzzer.cc libFuzzer.a -o fuzz_verifier
+mkdir -p verifier_corpus
+cp ../*.mon verifier_corpus
+./fuzz_verifier verifier_corpus
diff --git a/tests/fuzzer/flatbuffers_parser_fuzzer.cc b/tests/fuzzer/flatbuffers_parser_fuzzer.cc
new file mode 100644
index 000000000..632b3b18d
--- /dev/null
+++ b/tests/fuzzer/flatbuffers_parser_fuzzer.cc
@@ -0,0 +1,16 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#include <stddef.h>
+#include <stdint.h>
+#include <string>
+
+#include "flatbuffers/idl.h"
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  flatbuffers::Parser parser;
+  // Guarantee 0-termination.
+  std::string s(reinterpret_cast<const char *>(data), size);
+  parser.Parse(s.c_str());
+  return 0;
+}
diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/01a40c02ea9c030b9fcf8aaf51fe1b6681e00490 b/tests/fuzzer/flatbuffers_verifier_corpus/01a40c02ea9c030b9fcf8aaf51fe1b6681e00490
deleted file mode 100644
index e36b1ce5c29d0393b164383915462bc0a15075ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Z~d<zCv1{($k1{WaD1Bf+&*oPqmNG4<iFhnpE
zFjO$a0C^ytK)}er5Wvu24`ew25fH-whXWJPBsLfqN`C>;Pk{Ig5H|pE1Q0s_vE#|g
zyC7V+q_Gc#RTvr>7$#PKI@`dX*LV>^f4rN1{Eo*@XBf>4)W-;fyZ-<G&jMtFuv<}T
z3Xo!80%8#$28po(@toA+5<@7v1j+`f;R33XW6%JytiYiFWPtU6Xb=GDhX4difk6=_
l2&O^d0Fnh^7pVOpI~f?6m|1`>;RG@(ee?5*OHzw~OaSp4Ik^A;

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/075a40dd6e6eec9cc96f0399c182f62361cdc553 b/tests/fuzzer/flatbuffers_verifier_corpus/075a40dd6e6eec9cc96f0399c182f62361cdc553
deleted file mode 100644
index 063942bfe400275e933b2ce096f248bbcf41eebb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeZZU|{g|_X`G6Kw!ntz`()4u!F$_$gu!oRt6ge2L=})%L9l(z=t7#A%P)7ogsuF
vf}wz+f*}ShYy~121As(>J&<q!A_tHb46_;77>t18V8b=A8xE9aV8{Rf@81tj

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/0c319e8089228db0958f35c54614d4e2d917f9d5 b/tests/fuzzer/flatbuffers_verifier_corpus/0c319e8089228db0958f35c54614d4e2d917f9d5
deleted file mode 100644
index a505619059d3c4d522c0f976bda36bab5b9e4ae7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xr~@lxwgDvK)X2h+%-kfeC058;r}K4rYA;l23s63=lT}aRd-M0I}oA
z%DW(3xTLWUgjIlIjT5Usoo(RHYrF`dKi*A0e#hgdGmK^is$m4eUH||8X92Q7*sUlv
z1xPV40kH@WgTz>YxFof>#1M@QQey>FCC8uvW^vR3DIfspfdEY)TL8v^(g;}wpqw;N
j6ci31Q4ogN53-Yik%^fF=n_sKv(h&|uec<&2*?BgA>le=

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/0d654589709444777a4a854ec16b7160b0b8f06f b/tests/fuzzer/flatbuffers_verifier_corpus/0d654589709444777a4a854ec16b7160b0b8f06f
deleted file mode 100644
index 437134b35b22650767965a2d7ec0d55177e09265..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeZZU|{g|_X`G6Kw!ntz`y}wm;kW_5VJDaFgP%{09hVD3<5q30SpNY8R`rn3=s?k
o3>6G9U|}l|$ru168tj3D0}wfYv|yUe#$W^#$7eWDnt>q$0E@p4ZU6uP

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/10ace4829162a0d37730ad898ee6ef2b76849ce4 b/tests/fuzzer/flatbuffers_verifier_corpus/10ace4829162a0d37730ad898ee6ef2b76849ce4
deleted file mode 100644
index 7c9321c577166660235baa100beaa3097ad403be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAwYIS
z0Ye1?Lky5*1(IT90LnGk16dA01jI1F;lKnmi4Deu(qDk|6CgeV#0@|k0mKeK?0B;B
zE(jMcY3u`G6`<I`iPfLZHt^>)UWCve@1`HW<MGoOMl%D|FaqJO|NsB90NEhyR+O3o
zq!^fhSOkbcVyr-1l3HA11f)fwY(pRoQo{vQCC8uvWLbej0muOB0ns1;(vJ!-ML^*I
f5(QzH{UAFT7@3$^fVOY~nU%izdBr8EML;G1(s(&~

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/12986603181adee83afedc8206f86ead9fd20653 b/tests/fuzzer/flatbuffers_verifier_corpus/12986603181adee83afedc8206f86ead9fd20653
deleted file mode 100644
index 18b5c405333dc4e3ff075a0b1053be45f32795d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Y1v=}UaELH{^1_uTgAj<>DVqowAVupYOh75)f
zh6siNh6*4z28gXd;*3Bkh6Z~e%K?ah7zQ{Tn1Cj+!MITR3y^*S#AkrG0f-}j*a3(g
zPgdRq;ld@2eITp?6gxPv`qSA4{=CME5c=cY^y7CtemcWwW}q5IAl&u;|9=)B8-(48
zQd58w0}~L705M366^Khxi%SgA*dR4rKvi-K8bFp6I23>kupSUCfW!uw0|5vYgs%V&
h2aqTT!|Vsy$-v0O%mQ=?Cy-g`o1a%)l3E000svxiIs*Uz

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/14c816a2f528da8004315f8e71aec9e7e9f4df89 b/tests/fuzzer/flatbuffers_verifier_corpus/14c816a2f528da8004315f8e71aec9e7e9f4df89
deleted file mode 100644
index 321ff5675d1e4fc7e778edbe7aee76c8a2904043..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Y1<QOb~ELH{^1_uTgAj<=aeHa255*RWVLKq?#
z3K%LFVu0cxogfgvz`)pG4`et15fH-whXWJPBsLfqN`C>;Pk{Ig5H|pE1Q0s_vE#|g
zyC7V+q_Gc#Re)lR6RSU+ZQ##?(I4-oAHU=A(-}-NJA3>Ds$m4eUH||8X92Q7*sUlv
z1xPV40kH@WgTz>YxFof>#2ATf2xNoQZ~;}xF=zl;R^U*uW>5#~0f}G(kU;Z=N(q2z
eP&lC553-Yik%<{3&I!c6mA?6T#U-gl3=9BApgPU~

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/14d90e4ac5f58f07be524633e96fb8f6521116e2 b/tests/fuzzer/flatbuffers_verifier_corpus/14d90e4ac5f58f07be524633e96fb8f6521116e2
deleted file mode 100644
index 807a5b29079e5c6addcf62855be149edb7681cb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 771
zcmZ`%Jxc>Y5Pf%=aM);(P7npbkH!xKqX=#=$Q6kRXpzDqg+Z|pV^SDwE`_a-pCI@v
z`~woue_%Ql1sgvatMkq5T{MKu@^)rtc6T0c*9VX<?CjFf))By?Phv&aX(X_LEC=X;
zBO-?)%8d3<!YR(N&)gSJ(j2fBEHE;@tYM5go$`h8sEub_-ka=}WN!}#Qb@v84r$h=
zwD&v=WM_s9q)(Y6=FnnB*wdUMr(lzl>FwX``o>z<z8O6c_e4O@N_~7HO@xa;G%@tT
z$ePvUkB?|FfRE7<C(FmKtQNyu2%l@>op>c^CBrGxZgd)%YP)mOys8q@%r#pVpAW(4
zN$fv5hj)+u&sOY*xX0nR4Z~3Gz9hEKDhDt0E|DT6pCIbbwfeHebBrss`jXv(5hsNS
z%(AkoDo|us59w>`^<yl`bpo5!0F&yZfk+`<AOs{MO|8(!|2`iU;d&0%<O9S)XQQ2T
U(dX+EdWI!^_(4xM_&W!=Um8wd(*OVf

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/2290776813d50bf54386dc6670aea41c8eb4f73f b/tests/fuzzer/flatbuffers_verifier_corpus/2290776813d50bf54386dc6670aea41c8eb4f73f
deleted file mode 100644
index f3c73e4b4fbb2f019304e085403615bb3008c661..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6K%m3Wz`y~d*%(Z~d<zCv1{($k1{WaD11!S8;KLBWkkF995W*0_
zP{2^Z5Cays0+EaiK)D8eAj<)WfEWfi9GHM6vB9`d`U{YL0>o#4xB-YGfY<?u9Zy!?
z1>wRajeQ`j!qCXTFtPg6*#`c+#)}a8<K6V*cRYSN!)RupK1PPm47>jS|IY$sgRoms
zY6_5IU;<(hAO?xC0`Z*G;u0e$y9CHK1hPSDxPYqU7&L$^9dIZB8DKpi8U#T4AppTr
pU{Hh!f@x4VfMh|~1!_OYP6kFMW)`3=oIqx!Z+>2JNoo<02>{z}I@bUI

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/2357f92773faefb0049312fcf7421f2c4ef08dc5 b/tests/fuzzer/flatbuffers_verifier_corpus/2357f92773faefb0049312fcf7421f2c4ef08dc5
deleted file mode 100644
index 762bb8c5aab88c57d5fb6cdd4582c7fd719acbe3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Z~d<zCv1{($k1{WaD11!S8;KLBWkid|^5W*0_
zP{2^Z5Cays0+EaiK)D8cAj<)WfEWfi9GHM6vDLx&5c&&{dIH2}fVcsOBY@Zeh#gN>
z-UZ>pC5?R`tO68koLK$oYy*E@<3$Ml@oxI@J03rsVKg&P4I>a9`2YVu3y=-MZbhjn
zK#GA0h(&-HB*qHFb5e^-jG*iiAlneg2C3l!s*+>S0D46L911`oupR~mEf5pR1~ZZP
jiU<K93lt9M_JizXU}R!u0ouX|WLEm-=M|Tv76F+6RN^`@

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/235a53ee083b428f4eb80eb5af6a8b41a4036d55 b/tests/fuzzer/flatbuffers_verifier_corpus/235a53ee083b428f4eb80eb5af6a8b41a4036d55
deleted file mode 100644
index ed1d16a7ff22b8cc15bca99c33281c8cd73a8fef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SqVXy&`E<o%7#310q5WtYYkP#9AWEU`0
zFvNgGtw1DW0FY>~2NDiI1jI1F;lRYe3N#fJd;xNw0Pz_hZUADCi4H*Qc(U>?2p2AC
z>;qvHpjhL?>Q84I`14@&$Ghpr?|A%lhSAJGHH<*G>;M1%EI>90yA`FT04WA0AQk~)
zkQgfvm!uY#7$LC@fozZ(E}$wo1`Qy~3K$9?5r`fz0}G*mMGO=U==Ou`WME`s28nY5
Qv2UeseqM1&Y7vkP03Dz?rT_o{

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/243d7b9356afab5800b0fd424a0f90cefeb8f411 b/tests/fuzzer/flatbuffers_verifier_corpus/243d7b9356afab5800b0fd424a0f90cefeb8f411
deleted file mode 100644
index 6c6d7cc4e3b4070f11901efce9120d2e6838d13f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 79
zcmeZZU|{g|_X`G6Kw!ntz`y~d**t&*iZD==4Jc*;#1=rT$Y28`wHO>2Kq`Tvjto9P
G1_J;!>;~5W

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/2e2249e476941c7390d924d8f6c88b5d59d0e300 b/tests/fuzzer/flatbuffers_verifier_corpus/2e2249e476941c7390d924d8f6c88b5d59d0e300
deleted file mode 100644
index ffc21832c8814390e59fbaf6f5c45f1d94cf07f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT10MFt`9&9zYBNJ`4d22|yUa5W!Hu
zP{9xb7PSJAi~&HR!5&CB01*(w0EYt;&?Gh(7fOEt(ocZ+3=lT}aRd-M0I}oA%DW(3
zxTLWUgjIlIjT5Usoo(RHgV7)FrXRoK@zWVbGXvEy0^zRz|NpZ9*&yszl$!DkNHYPk
z2vm#}NSCA*mly$QR!s=o5Xc6p;R33XW6%JytQaJKBnW`aAq9ZK0oi_#UXYy(j7-cR
SaZVuit@O>$D=tYb0<r;TOFCo#

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/3068bc815c5e573acf89236689705409b253e3c1 b/tests/fuzzer/flatbuffers_verifier_corpus/3068bc815c5e573acf89236689705409b253e3c1
deleted file mode 100644
index 8ff188a4904e911b80e525aa7292368ef65adb0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@Dz9Aq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${1xFab?sgK?qs7a;uvh|d6V0}w|5u>%l0p8Rpw
z@nq%Q!X=G;AglruYn)j9>1+dk9*q8YH~sh>kDtykni;5u(VBsgVb}lv|5<<>5Oym{
zO#xC&Kr8|kVg=GAsl`CT2<Rd(yTlMkgVb;VRmm}E09jVxPyjN(#(-!nzyU0_2UP|X
d4rtbc?O|YKVg`wG0<mwUZ+>2JNoo<04FIR>I}QK<

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/3470f740d4b2e405c2922ebf68838a03fd690a64 b/tests/fuzzer/flatbuffers_verifier_corpus/3470f740d4b2e405c2922ebf68838a03fd690a64
deleted file mode 100644
index a0f773fda45ae984b0116fcd9133a9158aba3a78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153
zcmeZZU|{g|_X`G6Kw!ntz`y}wm;kW_5VJDaFgP%{09hVD3<5q30SpNY84Mu|5ex+k
q6$~+8Q7aJ17yu+1?16*>5IKN!U>eQFU<4G$Wwry*Y#?x8$N&I$%no+|

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/489b729a42a6ff5bcc30d341f29fd1660700c0b8 b/tests/fuzzer/flatbuffers_verifier_corpus/489b729a42a6ff5bcc30d341f29fd1660700c0b8
deleted file mode 100644
index 62afb03c11744761a8c0e6afdd079fdc070f63a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt{)=Fn9oYAmGCgz>vU@!4Sd_
z!BD_Z0ThV=Vk?joV*rq7um=(jKm^1vz~R6IG>Hwyh0<Su^b;UH1H=tL909}*K<s$3
z@-7G$E@|uoVHKcQ<HYJuXB+tQVD!hk>BsMQ{B(xV%s@4aK)CDw|NksNHVC^FrKUUs
z(m=;Eh=9d38CV?{7)nx$OF;f(1!54}5J-d6Z~;}xF=zl;R^U(oGQj45XcQoT!b9PJ
f!U5TSkR-?+21X`kkT@q0`&Rnq=M|Tv76I7+ZA?0l

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/50866a2404c2cfbbcaae258011c012d819a842a5 b/tests/fuzzer/flatbuffers_verifier_corpus/50866a2404c2cfbbcaae258011c012d819a842a5
deleted file mode 100644
index 70f6819bca01e9d5ba202fdad4f68cf86cf51593..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 656
zcmZuvyGjF55IwuP5^S_cEeaO8ouK$Y@CJiyVN5`aEi6(P6btc@B4V>CY=wM+VBt6T
z10v`jm`<#06dSAcoV$DTKxcDiCTHjF9PUg6pi<r0WuUDgDF9>47Ks&N2J7@83?jx7
zunp8u=d*_xr)Z%=UMFc@jV{@sGyD<G3dToZzv~#qZ{m%3CK7@ctILocP!LZ#JpuI?
zGNIMOgo1|k?2G(gkFl@l{_0T|>A597h<kz-8@kfdWmh=6Yu^a7<l3F9ua{)v#Kq6<
z;p1!cv+3dpYdk&=X_}5Qzb3ZM8wc-<K2apZ2Sl@R(OgnKpXCc#3C6u5rZC4h%k~y{
z3BEm~PdiL9b0)TL(>B#$)JTv3k!l(dmFjVS@B<gUYHM`S<-BfSL3(weU65=bWxFOS
f=6-NP>Nv_5B<m!yH>ei>XiC}6XrB_~OB4SBejiip

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/50c219f74b02582ea4eaa683f0605b5cd16d6ed6 b/tests/fuzzer/flatbuffers_verifier_corpus/50c219f74b02582ea4eaa683f0605b5cd16d6ed6
deleted file mode 100644
index d68d6bb88dd68467ca1c5b20fab8f46c47246bb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
i1q>AoF<?<E5Xl$-BpU32gaZ&cfOL>!Hc%S_Lk0kSSPoAB

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/525f958d1709f5e926cba564e23180b60d80fb9a b/tests/fuzzer/flatbuffers_verifier_corpus/525f958d1709f5e926cba564e23180b60d80fb9a
deleted file mode 100644
index b4a324f4a184e723c03a87cf8bbcdb339001cd18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22|yUa5W!Hu
zP{9xb7PSJAi~&HR!5&CB01*(w0EYt;&?Gh(7fOEt(ocZ+3=lT}aRd-M0I}oA%DW(3
zxTLWUgjIlIjT5Usoo(RHgV7)FrXRoK@zWVbGXvEy0^zRz|NpZ9*&yszl$!DkNHYPk
z2vm#}NSCA*mly$QR!s=o5Xc6p;R33XW6%JytiYiFWPr^9(L@3(P&gpl57Gy+lYx<m
U86?gL#J-ij`FX`9sYO6G06;}LZU6uP

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/543e528d3150cd0d2a45973cf98e992d67f7c406 b/tests/fuzzer/flatbuffers_verifier_corpus/543e528d3150cd0d2a45973cf98e992d67f7c406
deleted file mode 100644
index 8c145cefc1a2f77a5a039c39c79fe7f041c933bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Y1)-qTCS*#2;3=Rw~K$ZuP1_2+20EPsH42BSf
z2!;ZN3WgZ4s1=wDU|?Wuum>_7fCz|TfWv_aXc8NY3#GpR=_f#Z28bJgI0A?rfY|Y5
z<y{aiT+-MF!YV+q#);LR&NlGp!RU{7(~sZr_~{IznH7Lm1L3a!|NpZ9)q}8GQECd1
zVqgMd5g-PMu>x^PYH<kzgE5?K2owXU;R33XW6%JytiYiFWPtU6XjCA9#Pwz12lE8L
fBq$uv?FZS(z{tc566XZsJYV0+{Nj?-A|M+88814&

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/5a2f21b370496184851baffbbbb450fe49aed324 b/tests/fuzzer/flatbuffers_verifier_corpus/5a2f21b370496184851baffbbbb450fe49aed324
deleted file mode 100644
index 364177753d58aff2599d3a3204c2e903822b4337..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9#9b<h5&{Hh75)fh6siN
zh6;ulpg2e;1OzZP*aKM(Km^1vz~R6IG>Hwyh0<Su^b;UH1H=tL909}*K<s$3@-7G$
zE@|uoVHKcQ<HYJuXB+tQVD!hkCyw9o`04!dZaSD|2C88M!d?IW|7QWRLD;P*H3dj9
zFafa$5QD^6fw&~KxWovFZ3tw8)Nlb+$uVdESyJFo05ZUOKr{$|^rHey5l}dQL_rv4
ZKgdo7MkZ#E7$*={`sU{qm!uW}nE>i<Ibi?*

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/5bbf4a7b9da7aee4db6b21ea62128df74aa23b59 b/tests/fuzzer/flatbuffers_verifier_corpus/5bbf4a7b9da7aee4db6b21ea62128df74aa23b59
deleted file mode 100644
index 181f2c9d17738ea1b5319fdcc7b79a67a86ce000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22|yUa5W!Hu
zP{9xb7PSJAi~&HR!5&CB01*(w0EYt;&?Gh(7fOEt(ocZ+3=lT}aRd-M0I}oA%DW(3
zxTLWUgjIlIjT5Usoo(RHgV7)FrXRoK@zWVbGXvEy0^zRz|NpZ9*&yszl$!DkNHYPk
z2vm#}NSCA*mly$QR!s=o5Xc6p;R33XW6%JytiYiFWPr^9(Fg$cDT0f}0?8uV50VDi
Y$-v0O3=-!AV&6*N{Ji3l)FL1o07ln3ZU6uP

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/61005237d5ba26c372b347249143b793c324186a b/tests/fuzzer/flatbuffers_verifier_corpus/61005237d5ba26c372b347249143b793c324186a
deleted file mode 100644
index d24ae01c485191ac8d37da0216b095f59be96495..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!nd#=ybQ0A!f}u>}ybGT1OUFt`9&9ze{%-~%E85*RWVLKq?#
z3K%LF7*50hg{(m0j6f-d274gO0f>MY1~?p;fF`lQxKR2FkbVNhXMnf?h$Dd50f-$>
zR^A2S!X=G;AglruJ2<iW)7b|8yvB<V`s3a7<99rMI>TsYpc+OX-1Yzee-<Dcgx!i#
zQ-Bl$6A+64F-VLRh)Yt7ON^lG8X(&c$Oft50;-Z@&;YU|fT6&^pb5kvJuraG274Ao
m7Nkl691b9LAPln~WG4e76Eh3Y7EU0u(l<Y^xFod*$OHh*fjVLU

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/6207082d567e33f6569e5ffac1e882b6988f5e86 b/tests/fuzzer/flatbuffers_verifier_corpus/6207082d567e33f6569e5ffac1e882b6988f5e86
deleted file mode 100644
index 99595ae3e41133621bb69f84eb3088d569c8a2c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9ze{%;KL9ABoi1iK%9sI
zhL8#dh8Q5z3dCn*0LnJl16dA01jI1F;lKnmi4Deu(qDk|6CgeV#0@|k0mKeK?0B;B
zE(jYgY3wTmVilm+!HLzM&NlGpHC}|!AMd6gzvJ=K8AdY$)i46#uK)l4vjEv3>{gVT
z0;Cw2fLH{GL1L^xT#{N`VuZvt1hPSDxPYqU7&L$^D{v?<0NEftFo4X~U=RQbBa47k
jDS*QPBnrYX`$2XxFfuW-0Bzv}GAn)a^NLGSi-1f3wm><m

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/699e2869e8bb9dad4ed0ca23245976e08d6abf96 b/tests/fuzzer/flatbuffers_verifier_corpus/699e2869e8bb9dad4ed0ca23245976e08d6abf96
deleted file mode 100644
index 438003909b15734c162aff46df7935f8b1159893..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|`Vl_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1N}GPnR)9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${2&G679ugK?qs7a;uvh|d6V0}w|rFlB&rGB}>B
zybHpGOB(w?SOqB7II;TE*#`bR82#~X`tds+Kb>JTGthb<-1Yzee-@x}5Oym{O#xC2
zOh7CG5n??8WS68Gl`s^8{03qdml#6TZ~;}xF=zmJR^U(oGQj45XktJEP!T8`(Cr7=
Y!@$VI3=-!AV&6*N{Ji3l)FL1o09x!i-T(jq

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/6a9bcfb376f95d3d235f6e3479ae37b906be2a17 b/tests/fuzzer/flatbuffers_verifier_corpus/6a9bcfb376f95d3d235f6e3479ae37b906be2a17
deleted file mode 100644
index 9c42a4db117a10f20cb91945dbd7cedbbb709463..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${1xFab?sgL2iO^cNug1c=W7aRU%X0I>rQJD#k(
z3&Mp<8v8(41t``yvHH{52L3!4{qb)4@jD(ronbUHPz@sx?)v}#KMRlz!fr*WDL{&W
z35Z1?LaaxC?2^>t5+fkZ3S}DtX^<K&pei{A4Is-3911`N*c=cI2VjpfG{E_243IR)
eZV-mq53+}Wk%<{3#tFo}mA?6T#U-glKsEqqGdj`$

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/6b1e41ca991828476b077ebda3f7e9936b549c32 b/tests/fuzzer/flatbuffers_verifier_corpus/6b1e41ca991828476b077ebda3f7e9936b549c32
deleted file mode 100644
index 0105f4e2d8add3b505594f1a5f31fe6ff93cf55c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6K%m3Wz`y~d*%(Z~d<zCv1{($k1{WaD11!S8;KLBWkid|^5W*0_
zP{2^Z5Cays0+EaiK)D8eAj<)WfEWfi9GHM6vB9`d`U{YL0>o#){Due+<p9KvCoAuQ
zaN&~1J`h%6Xk=iRSpDg21AkuQMF{=zZu;>%9zUI7G&4{iBg1EgUH||8X92Q7*sUlv
z1xPV40kH@WgTz>Ycus0@i4l}t0%RKk*&sDsKvi-K8bFo~I23>kupST%0wDbmfM6*w
oD8dB6G$<TEvLNgNwI5_B10xeN3(yu$AhXgpKd-nXwFt-r05--tR{#J2

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/6e146549ff6aefcd1314a8b04cd7ee0955796002 b/tests/fuzzer/flatbuffers_verifier_corpus/6e146549ff6aefcd1314a8b04cd7ee0955796002
deleted file mode 100644
index 4594fb7d19a38a2359be430f267cab9f71afb741..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g`_YDS8Kw!ntz`(&!!@$O10_0f$F)M=&g9C#LkmUiyAmGCgz>vU@!4Sd_
z!BD_Z!4Lx$wE~fh0YIX`9!NL<5fB4GHi+PGU;>)N24W(CFF^JaAU*@c4L}?L#1260
zc=E?x$CH(JmlQ53Y;5f7Qvr%KPOScPwt+tnMt{7Ue*BKdPiGj-3{=Bt&A`a8>;M1%
zEI<wjyA`FT04XLQ76I{rfE9>KQj39v5sY182owXU;bIVBkYmsQvaEoi00B^KKn_R+
kVE_sTkRA|rGXh%=wuga{i5Vou3B<mYzWI5@sYO6002VMh8~^|S

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/7c1217cf933de200b58fd2bf494044ebb6d90cde b/tests/fuzzer/flatbuffers_verifier_corpus/7c1217cf933de200b58fd2bf494044ebb6d90cde
deleted file mode 100644
index 97e3bf2a00ad34225b12511b7ff06aabc15a045f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6K%l|Uz`y~d*%(ZKqy-SOGT1OUFt`9&Am9PSJ`4d22@DwwAq)`=
z1q>AoF<==hFd4wWz}R39WI6y55W@h60~63BHW(L5e*w}@fcOj$Hvn-25IX>|<H^dq
zAY8blu@8h*fMSgkt3RD>;Ln56AMd6gzvJ=K8AdY$)i46#uK)l4vjEv3>{gVT0;Cw2
zfLH{GL1L^xT#{N`VvNK#1hPSDxPYqUfMLMEU<D2ZAOoZYECQmj17DCZBLjl~SQ-=#
fAWa|)vmaz910xeNNQ@JReJg$Q^NLGSi-2qZq@+2b

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/7e0fac79b1dfbbdcaeee925535b66c2834d13814 b/tests/fuzzer/flatbuffers_verifier_corpus/7e0fac79b1dfbbdcaeee925535b66c2834d13814
deleted file mode 100644
index 9ce31af10ace5ce76404150a68c021457662facf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SqVXy&`E<o%7#310q5WtYYkP#9AWEU`0
zFvNgGtw1DW0FY>~2NDiI1jI1F;lRYe3N#fJd;xNw0P!6lZUADCi4H*Qc(U>?2p2AC
z>;qvHpjhL?>Q84I`14@&$Ghpr?|A%lhSAJGHH<*G>;M1%EI>90yA`FT04WA0AQk~)
zkQgfvm!uY#7$LC@fozZ(E}$wo1`Qy~3LFYR23QY>#s(Cy2!g@^$$kcq13-2%FfuWN
T#5sZ3x6(I1uec<&2*?HiEHF8=

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/8718d7c1e9a536adb95fb0c749db4554311895e0 b/tests/fuzzer/flatbuffers_verifier_corpus/8718d7c1e9a536adb95fb0c749db4554311895e0
deleted file mode 100644
index ea284ed7e257decd953485ec6a42f4f9527f0fdb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_frN^Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xr~@lxwgDvK)X2h+%-kfeC058;lF3zX0hcKzs&>8-O?hh#i2~@nq#)
z5H4KO*ayNYK(WS&)t}Bb@cT7h1k-sR@1`HW<MGoOMl%D|FaqJO|NsB90NEhyR+O3o
zq!^fhSOkbcVyr-1l3HA1h{gt~;R33XW6%Jy6u_YXWPtU6Xb=GE2L%oi0GWsiK;Zxq
e1!0)|AUhctnV4CCF5v_+D}D3xic3<9fJ^`_r#Qy|

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/8ae96e1702303027346b59d0a6acbd1ef0b1955f b/tests/fuzzer/flatbuffers_verifier_corpus/8ae96e1702303027346b59d0a6acbd1ef0b1955f
deleted file mode 100644
index de58d75c7e01fd77a204a4afb5d9ac56ca90d351..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKq=hvD11p0Kg9C#Lkmmu!AmGCgz>vU@!4Sd_
z!BD_Z!4Lx$wE~fh0YIX`{y76s3xfj?!vKc^6VN0!7#B)^0n$%^_zVy?0C5BmI{>lc
z$;!JRT)3pM4}?{KVvQ54Kb>vh&x6q)@1`HW<MGq^<6SKXgBhrZ5eRqv|Nox_$Od7z
zqSO>1#lQr_B0vlhV+G=p)Z!8(rXi3GQo;pPB*&luWLbej0muMr0nx+)D@KSOWa~jz
YGB7eRgTy$2*tgO*Kd-nXwFu~20QJr~hyVZp

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/8ed7b897a2c4f2f262a5319910a5bd1db4b6dcae b/tests/fuzzer/flatbuffers_verifier_corpus/8ed7b897a2c4f2f262a5319910a5bd1db4b6dcae
deleted file mode 100644
index 63453c1fc6e1cf2ae71e7f1ca50b2ff39114e59a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`(&!!@$O10_0f$F)M=&g9C#LkmUiyAmGCgz>vU@!4Sd_
z!BD_Z!4Lx$wE~fh0YIX`9!NL<5fH-whXWJPBsLfqN`C>;Pk{Ig5H|pE1Q0s_vE#`f
zcO6ew-d$3-q_DBEuTKRi);O{H)7b|8JQ)4)Zu;>%9zUI7G&4{QqcsB~!><4T|FZx&
zAnaC@ngXPlfLH{?2Le_gE=es05=Jm~i6Kx7q=t(@gh7r$1IV%hh5`gYwLy9KC<m}4
jC>%g~K-kR)Y(3Z>21X`kkQgTr`&Rnq=M|Tv76I7+=KDHh

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/903747bd5d4239da836d24087e7e279715cc0980 b/tests/fuzzer/flatbuffers_verifier_corpus/903747bd5d4239da836d24087e7e279715cc0980
deleted file mode 100644
index d69ca9575972f008c84502d5702b4cf00fb393f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SO0<nV)1A_~L2ap8<J`4d22@DwwAq)`=
z1q>AoF<?<E5Xr>A5Wv`A4`ew25fH-whXWJPBsLfqN`C>;Pk{Ig5H|p^77#lCvE#|g
zyC7V+q_Gc#Re)lR6RSU+ZQ##?(I4-oAHU=A(-}rH1Jy7B;jaJx|FZzuAnaC@ngXO4
zfX-qN0a^hP1No;UwYbCxiERjEgVb;VRmm}E09jU`P)Gzaz~+ExVgV=|(Cr7=$-v0O
U3=-!AV&6*N{Ji3l)FL1o0N@lk;s5{u

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/93a0adc29bf3cb1c7ed1b5a12778c1eba06972d7 b/tests/fuzzer/flatbuffers_verifier_corpus/93a0adc29bf3cb1c7ed1b5a12778c1eba06972d7
deleted file mode 100644
index 47ffbb41bb23fefdda156e609a1d062fb1d90595..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 128
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
n1q>AoF<?<E5Xl$-BpU32gad;ngM$ND4>r?{fJ#87GcW)EB{&QP

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/9f6095cae432e38efe7464bfac3cacd6df3bbc48 b/tests/fuzzer/flatbuffers_verifier_corpus/9f6095cae432e38efe7464bfac3cacd6df3bbc48
deleted file mode 100644
index 39405a609898a431d2b85c9d13d8690bf5960089..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 578
zcma)2u}%U(6r4MO5E?D4tti9_5(<MPE`gXUKuMsuf`UR~M*t}>Hb-Gg;y?Hm{D2|R
zKY-5IOKhml8IBF1^4{LOnVr1d&5Z}3ad+Dyu}TP#CZ|wjza)|<!;mlFv8(E6qRZ8W
zj{zp=Y~7N&(_{;-*$h9zR@%6{DP^}i{w04AA4EXFg>Oie#nVa{zD;LBmfrOBdHoq2
z_bvad9^RMUrfT_!GY;2048sKV3vn~*-G7r^;*^k|B*wkRab7wX=>oN8GMqZYIaP6+
zf?S=^&9+XgIB=CuRLVhT1idd;Zz{e2bFS?sNvOw*xob2WRlJye;Hm;FU=TlN?1Oe(
Kh8<<Czx)G^WMbF=

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/ae3e1a31be33cc502b6586253274e6b620c78829 b/tests/fuzzer/flatbuffers_verifier_corpus/ae3e1a31be33cc502b6586253274e6b620c78829
deleted file mode 100644
index 2a3e98c4d092b1abad1167d5cf23c34639be59f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Y1<QOb~ELH{^1_uTgAj<=YZGhN^A%G!)A%h`=
zA%dZRp@Ja>C<f9A0s#yRj1Bfch64}*F${1xFab?sgK?qs7a;uvh|d6V0}w|5u>%l0
zo~*nJ!i7s3`<67S^c4cd8YfnNI@`dX2ctjUO+S9e<EJy2W_I@Y2~@)fguDL#|IY$s
zgRomsY6_5IU;<(hAO?xC0&z)dafvY!+YrbGso?^ul4H;SvaG<NV9lTo)&mm31|Wgv
j3zZT8)1Yubw;yCD10xeNNSqUheJg$Q^NLGSix?OHH+?$7

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/b75487b8176eda7fb18e4f408208caa82d7c121a b/tests/fuzzer/flatbuffers_verifier_corpus/b75487b8176eda7fb18e4f408208caa82d7c121a
deleted file mode 100644
index 3ce0a08bf612fe1e696e9ed6558c77f31dd2e67f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 174
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Z~d<zCv1{($!AY=g23=A1S?86YikN{+bFhnpE
zFjO$a0L4B7bpin+15mC(AINg>0Pz_d9KaNq@b#C1TEpSM1T>coE(KDHaDyD08z8a}
GmjD3k4-g&z

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/bf3d7a99df32ac45e9081eb3519524930c85de89 b/tests/fuzzer/flatbuffers_verifier_corpus/bf3d7a99df32ac45e9081eb3519524930c85de89
deleted file mode 100644
index 8657dcb0214a3645742750dc0910c4646cefa631..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9ze{%puph65WtYYkP#9A
z<P|VfFvNhxtw1DW0FY>~2NDiI1jI1F;lKnmi4Deu(qDk|6CgeV#0@|UGSLBu9Zy!?
z1>wRajeQ`j0u*bUSpDg21AiWj{&+Y2_#Ka*&M=x8sD=>;cm4nWp9RPUVYi~x6f+>r
z1jHgxF;*a5l3HA12&9qOAT?Y-RdNg(K$aCa6o3q{IUpJa7-0+?G$<U9?FT6X*~7rd
U#0(PW1Y+Mx-@M|Yl2jlQ0IX>_6aWAK

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/bf60f275ed989532747e7bbcc93ab2bbd834becc b/tests/fuzzer/flatbuffers_verifier_corpus/bf60f275ed989532747e7bbcc93ab2bbd834becc
deleted file mode 100644
index e99b11a480cc2abb57fa2dbcd7df3ccd25ff1a84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 122
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Z~d<zCvh64;PK*+#g1H>6X?86YikN{+bFhnpE
vFjO$a0L4B7bpin+15mC(AINg>Py`8h05Q;X2M3@CkO>0T{!&2OG=dobRWS~S

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/c5170081fc1f8a36ab30541f087cf530ab0845b6 b/tests/fuzzer/flatbuffers_verifier_corpus/c5170081fc1f8a36ab30541f087cf530ab0845b6
deleted file mode 100644
index 0b0dcaa82eaaa4e546307652bac98b05124f87c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${1xFab?sgK?qs7a;uvh|d6V0}w|5u>%l0o~*nJ
z!i7s3`#@L)DAqW!`qSA4{yZ4{@oxI@J03rs?|y{P%s@4aK)CDw|NksNHVC^FrKSKW
z1|}dD0b-CCD-f5Y7MB>Ju|aCMfU4veG=MBCa3}y7U_BsO4MZRVbz}~L4GITz`$2Xx
XFfuWN#5sZ3x6(I1uec<&2*?HivF15>

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/c51a7d5885bdaa3bae2b125fe13b12e2fba4f9b6 b/tests/fuzzer/flatbuffers_verifier_corpus/c51a7d5885bdaa3bae2b125fe13b12e2fba4f9b6
deleted file mode 100644
index 4d8cc5591e93bdbf7fbc563df9b9ae313a77e643..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt{)=Fn9oYAmGCgz>vU@!4Sd_
z!BD_Z0ThV=Vk?joV*rq7um=(jKm^1vz~R6IG>Hwyh0<Su^b;UH1H=tL909}*K<s$3
z@-7G$E@|uoVHKcQ<HYJuXB+tQVD!hk>BsMQ{B(xV%s@4aK)CDw|NksNHVC^FrKUUs
z(m=;Eh=9d38CV?{7)nx$OF;f(1!54}5J-d6Z~;}xF=zl;R^U(oGQj45Xcz#Qiw}Up
e0oi_#T97>qj7-cRaZVuit@O>$D=tYb0<r;V+&Y8+

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/cd6ac24fd00acc3e9887fdf2ae300481e745f53a b/tests/fuzzer/flatbuffers_verifier_corpus/cd6ac24fd00acc3e9887fdf2ae300481e745f53a
deleted file mode 100644
index e7a84cf0c0ea9c51fae990d3396cd606cb245b0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${1xFab?sgK?qs7a;uvh|d6V0}w|5u>%l0o~*nJ
z!i7s3`#@L)DAqW!`qSA4{yZ4{@oxI@J03rs?|y{P%s@4aK)CDw|NksNHVC^FrKSKW
z1|}dD0b-CCD-f5Y7MB<xu?>N2kQy$aDmexXAj=9I3P1)}4~S-9P=in~QXR%Xr9t6<
bZa>IQ21X`kkT@q0`&Rnq=M|Tv76I7+u@X6W

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/cd8e4aef993fcdebd9583069cd0a5468d254c5c7 b/tests/fuzzer/flatbuffers_verifier_corpus/cd8e4aef993fcdebd9583069cd0a5468d254c5c7
deleted file mode 100644
index 8e458cce5..000000000
--- a/tests/fuzzer/flatbuffers_verifier_corpus/cd8e4aef993fcdebd9583069cd0a5468d254c5c7
+++ /dev/null
@@ -1 +0,0 @@
-š(!!@*YÌø!
'í*!!µ;Fû:'iÊ<:';‚b!ó)*);::!*È''(9à'')(¼ÿ(ô‘('!)!!ê*
\ No newline at end of file
diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/decff8b2d7524b5fad71129ecf0f4edd9082af2a b/tests/fuzzer/flatbuffers_verifier_corpus/decff8b2d7524b5fad71129ecf0f4edd9082af2a
deleted file mode 100644
index b2d43130e566d5c15e4cf6896042f398b5df2517..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYC~X7FJMU`Sxd2#El4
z3m7UGVnE_Roj|}C03;ghfrJAP0Wl14I4}WCVuNv^^cNug1c=W7aRU&8OmqNZ$CH(J
zLAY>9V;=~s0L2<7R)0F%z@OJRQ4>smyqkXfj>k`D7|je+!w7`C{{R2a0%U`*TTyBX
zkYZp0Vi6z)iLnB4NosM45fa-F$Oft50;-Z@&;YWmz@Y$Sfc1cAOaKZeOaKZ8bo)Ve
YGB7eRgTy(3*tgO*Kd-nXwFt-t00d|`V*mgE

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/df0b39717d20371162754b37747a0c989623cb48 b/tests/fuzzer/flatbuffers_verifier_corpus/df0b39717d20371162754b37747a0c989623cb48
deleted file mode 100644
index abd11f664558e405bce4a22c3fd9b545fd7c445d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${1xFab?sgK?qs7a;uvh|d6V0}w|5u>%l0p8Rpw
z@nq%Q!X=G;AglruYn)j9>1+dk9*q8YH~sh>kDtykni;5u(VBsgVb}lv|5<<>5Oym{
zO#xC&Kr8|kVg=GAsl`CT2<Rd(yTlMkgVb;VRmm}E09jVxPyjN(#(+eK1)y+1vmR^@
X10xeNNSqUheJg$Q^NLGSi-2qZKiWDE

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/e423e0b67927e2c303dbb7ead3fd68706b92d657 b/tests/fuzzer/flatbuffers_verifier_corpus/e423e0b67927e2c303dbb7ead3fd68706b92d657
deleted file mode 100644
index fb23361223f162c5111412cb7c64ce87051aaf05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153
zcmeZZU|{g|_X`G6Kw!ntz`)@FWS9W41rW0`*f2OSxByuoQ4sK92w+HH$WUhpVTfQT
pV5ne-0SjA!NX7sl(O?fG9Dv9Hqy^1vpa`20#AvLBgUkkl3;?9N4z>UQ

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/e72266e5ad67af5c27bcd69961460770e82bd24c b/tests/fuzzer/flatbuffers_verifier_corpus/e72266e5ad67af5c27bcd69961460770e82bd24c
deleted file mode 100644
index 752f2835e72491919f0d1c43f0a0b41855062fb5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{go@Cyb~Kw!ntz`y~d*%(Y1<QOb~ELH{^1_uTgAj<=aeHa255*RWVLKq?#
z3K%LFVu0cxogfgvz`)pG4`et15fH-whXWJPBsLfqN`C>;Pk{Ig5H|pE1Q0s_vE#|g
zyC7V+q_Gc#Re)lR6RSU+ZQ##?(I4-oAHU=A(-}-NJA3>Ds$m4eUH||8X92QPfY_}l
z6+|&G0kH@WgTz^ZxFof>#2ATf2xNoQZ~;}xF=zl;R=`l;V6X<VKzcwT*Z?HZe4$bT
oU>Xz-AUz<=kW%E93Zy`GGB7eRgTy$2*tgO*Kd-nXwTOWM06)b#=l}o!

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/ee80034f2e35e3f07a708b211be4f1967c83b6e9 b/tests/fuzzer/flatbuffers_verifier_corpus/ee80034f2e35e3f07a708b211be4f1967c83b6e9
deleted file mode 100644
index 2d56c75decbe5477f6c9f2e509bd5c2a294b86fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!nd#=ybQ0A!f}u>}ybGT1OUFt`9&9ze{%-~%E85*RWVLKq?#
z3K%LF7*50hg{(m0j6f-d274gO0f>MY1~?p;fF`lQxKR2FkbVNhXMnf?h$Dd50f-$>
zR^A2S!X=G;AglruJ2<iW)7b|8yvB<V`s3a7<99rMI>TsYpc+OX-1Yzee-<Dcgx!i#
zQ-Bl$Qv(Bo2#^Meu>x^PYH^7XlwAX48v@x(K+FYHCC8uvWJv%+fq_92h(UT_0GSQ;
oEQ%~hl>#^%K<YpkW<SVI21X`k7N9MhKxU<HeqM1&Y7vkL02+`w;s5{u

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/f5fd02697cac00a81809909a971f80f28aa4c020 b/tests/fuzzer/flatbuffers_verifier_corpus/f5fd02697cac00a81809909a971f80f28aa4c020
deleted file mode 100644
index 8b2afdc700fde428defa8fd782c2c26a707d861f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9zYBNJ`4d22@DwwAq){f
zUO@~)1xVBiL@+V{<r?gPEC(P0Vi@3XU;>)N2IE5MFF^VU5T60!1|SBR=K#cxCoAuQ
zaN&~1J`h#`iZxEG{&cp1Kd<p3g#LIp{rDY^pUyCv8K{O42zUMe|DOfO24T0N)D$4a
zzy!o1KnxON1>%y_;u0eywjq!WQo{vQCC8uvWLbej0muOB0ns1;(vJ#IMWlg}pl|?*
ef-uZ}kev*SOw24mTR4HtO5gmv;*!)NAQJ$ZO*usX

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/fbe211a4df09673e54945bb8f5afc4c5cfa67778 b/tests/fuzzer/flatbuffers_verifier_corpus/fbe211a4df09673e54945bb8f5afc4c5cfa67778
deleted file mode 100644
index ddbd1cea2dc2c3bd64f9186db04f3295580b7afe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy+;56DyE(U~mEQJb)Mkd>8^45*RWVLKq?#
z3K%LFV!)zSAd)cvNHo|32?rnoVi@3XU}9henu-d(0J%?q_zVy?0C5BmI{>lc$;!JR
zT)3pM4}?{KVvQ54Kb>vh&x6q)@1`HW<MH#j^T#`P(>;DVGXvEy0^zRz|NpZ9*&ysz
zl$!DkNHYPk2vm#}NSCA*mly$Q7~25I2C3l!s*+>S0J5yWp#Wrn%>mI23|bHhgItFq
h0tyFY`$3W*dl(p*m_g#4K<r!To1a%)l3K*T001SfI_LlZ

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/fc5d4b9117ba9e87388174aee4f4970bdfe8d066 b/tests/fuzzer/flatbuffers_verifier_corpus/fc5d4b9117ba9e87388174aee4f4970bdfe8d066
deleted file mode 100644
index 06f1a3b80..000000000
--- a/tests/fuzzer/flatbuffers_verifier_corpus/fc5d4b9117ba9e87388174aee4f4970bdfe8d066
+++ /dev/null
@@ -1 +0,0 @@
-HH
\ No newline at end of file
diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/fd11c36a6b2cbceeac9664690b5d35f0f9bb6f01 b/tests/fuzzer/flatbuffers_verifier_corpus/fd11c36a6b2cbceeac9664690b5d35f0f9bb6f01
deleted file mode 100644
index 79845e5b786c5dcd19a6bb4a57d13e489fb5328b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(Z~d<zCv1{($k1{WaD11!S8;KLBWkN{+7ghVhD
zFjO$afW@sqBqIY*uE8G2asVPAh5-%-CZI`dFfNq-0;Hb+@fjd)0OANBb^v0>la+Tt
zxNu2h9|)@e#TqA8e>&U1pVxR1LVvuQe*BKdPiGj-3{=AiguDL#|IY$sgRomsY6_5I
zU;<(hAO?xC0`Z*G;u0e$y9CHK1hPSDxPYqU7&L$^D{v?P8DKpi8U#T4VF08G!dHX|
kfoV`UfW$!<W<SVI21X`k7N9MhKxU<HeqM1&Y7vkL0KNG+n*aa+

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/ff085b6090cadabfabb6f5e785681353fb89eb87 b/tests/fuzzer/flatbuffers_verifier_corpus/ff085b6090cadabfabb6f5e785681353fb89eb87
deleted file mode 100644
index f110f6b0eb1bb12aeea1e913fcb65398cef259bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOD%dbMFt`9&9zYBNJ`4d22@DwwAq)`=
z1q>AoF<?<E5Xl$-BpU32gaZ%(F${1xFfp(KO+^J?fZQiQd<KXcfH(q(9e~*JWaV8D
zE?m;s2f`{qvBrtjpUyV$=fUWYchisG@%ZTsqnUwf7=dutf9wDMS%4f6b}LFv0a6T1
zKr8~pATd@TE=ese0eKL{HUzRkYPf)^<QO!7EGuv@02yFCAeu-33I}xSLDm4B#=y+N
T#J~w;`d0ep=M|Tv76I7+=U_RC

diff --git a/tests/fuzzer/flatbuffers_verifier_corpus/fuzz-0-flatbuffers_verifier_fuzzer b/tests/fuzzer/flatbuffers_verifier_corpus/fuzz-0-flatbuffers_verifier_fuzzer
deleted file mode 100644
index ada82f163f5670ff70daa87141aec4c2d0d421b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 411
zcmeZZU|{g|_X`G6Kw!ntz`y~d*%(ZKqy-SOGT1OUFt`9&9ze{%;KL9ABoi1i7(y5#
z7z%*w7$B|y>I4Et2B2(%J&@%9L_iD!91cuClh|NfDE$RUKLO%1K->Vt5kTw!#EvH`
z?}BjQlEyv|Rso6~oLK$oYy*E@<3$Ml@oxI@J03rsAvDNsxO@Tf2gnyLU|-k(Rb~J&
z$R7w_RDgZ)8QB;5Kt&D^KO_6Z*Ix=6Sjc|*>C6mN&d9)Mwd?=?|13Z@2)h-frT{4h
fCLk68Vvras5SOGDmly(RNSGqrt-$~ZeW)q`2B|>A

diff --git a/tests/fuzzer/flatbuffers_verifier_fuzzer.cc b/tests/fuzzer/flatbuffers_verifier_fuzzer.cc
index d2fa73ad7..d7d453c82 100644
--- a/tests/fuzzer/flatbuffers_verifier_fuzzer.cc
+++ b/tests/fuzzer/flatbuffers_verifier_fuzzer.cc
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <string>
 
-#include "third_party/flatbuffers/tests/monster_test_generated.h"
+#include "monster_test_generated.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   flatbuffers::Verifier verifier(data, size);

From cd1493b0829b48407887844921ef0e040c0f485a Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Thu, 26 May 2016 15:26:58 +0200
Subject: [PATCH 153/185] sharing the Flatbuffers warning

---
 include/flatbuffers/code_generators.h         |  5 +
 samples/monster_generated.h                   | 19 +++-
 src/idl_gen_cpp.cpp                           |  4 +-
 src/idl_gen_general.cpp                       | 79 +++++++--------
 src/idl_gen_go.cpp                            | 82 ++++++++--------
 src/idl_gen_js.cpp                            |  4 +-
 src/idl_gen_php.cpp                           | 98 +++++++++----------
 src/idl_gen_python.cpp                        | 86 ++++++++--------
 tests/MyGame/Example/Any.cs                   |  2 +-
 tests/MyGame/Example/Any.go                   |  2 +-
 tests/MyGame/Example/Any.java                 |  2 +-
 tests/MyGame/Example/Any.php                  |  2 +-
 tests/MyGame/Example/Any.py                   |  2 +-
 tests/MyGame/Example/Color.cs                 |  2 +-
 tests/MyGame/Example/Color.go                 |  2 +-
 tests/MyGame/Example/Color.java               |  2 +-
 tests/MyGame/Example/Color.php                |  2 +-
 tests/MyGame/Example/Color.py                 |  2 +-
 tests/MyGame/Example/Monster.cs               |  2 +-
 tests/MyGame/Example/Monster.go               |  2 +-
 tests/MyGame/Example/Monster.java             |  2 +-
 tests/MyGame/Example/Monster.php              |  2 +-
 tests/MyGame/Example/Monster.py               |  2 +-
 tests/MyGame/Example/Stat.cs                  |  2 +-
 tests/MyGame/Example/Stat.go                  |  2 +-
 tests/MyGame/Example/Stat.java                |  2 +-
 tests/MyGame/Example/Stat.php                 |  2 +-
 tests/MyGame/Example/Stat.py                  |  2 +-
 tests/MyGame/Example/Test.cs                  |  2 +-
 tests/MyGame/Example/Test.go                  |  2 +-
 tests/MyGame/Example/Test.java                |  2 +-
 tests/MyGame/Example/Test.php                 |  2 +-
 tests/MyGame/Example/Test.py                  |  2 +-
 .../MyGame/Example/TestSimpleTableWithEnum.cs |  2 +-
 .../MyGame/Example/TestSimpleTableWithEnum.go |  2 +-
 .../Example/TestSimpleTableWithEnum.java      |  2 +-
 .../Example/TestSimpleTableWithEnum.php       |  2 +-
 .../MyGame/Example/TestSimpleTableWithEnum.py |  2 +-
 tests/MyGame/Example/Vec3.cs                  |  2 +-
 tests/MyGame/Example/Vec3.go                  |  2 +-
 tests/MyGame/Example/Vec3.java                |  2 +-
 tests/MyGame/Example/Vec3.php                 |  2 +-
 tests/MyGame/Example/Vec3.py                  |  2 +-
 .../NamespaceA/NamespaceB/EnumInNestedNS.cs   |  2 +-
 .../NamespaceA/NamespaceB/EnumInNestedNS.go   |  2 +-
 .../NamespaceA/NamespaceB/EnumInNestedNS.java |  2 +-
 .../NamespaceA/NamespaceB/EnumInNestedNS.php  |  2 +-
 .../NamespaceA/NamespaceB/EnumInNestedNS.py   |  2 +-
 .../NamespaceA/NamespaceB/StructInNestedNS.cs |  2 +-
 .../NamespaceA/NamespaceB/StructInNestedNS.go |  2 +-
 .../NamespaceB/StructInNestedNS.java          |  2 +-
 .../NamespaceB/StructInNestedNS.php           |  2 +-
 .../NamespaceA/NamespaceB/StructInNestedNS.py |  2 +-
 .../NamespaceA/NamespaceB/TableInNestedNS.cs  |  2 +-
 .../NamespaceA/NamespaceB/TableInNestedNS.go  |  2 +-
 .../NamespaceB/TableInNestedNS.java           |  2 +-
 .../NamespaceA/NamespaceB/TableInNestedNS.php |  2 +-
 .../NamespaceA/NamespaceB/TableInNestedNS.py  |  2 +-
 .../NamespaceA/SecondTableInA.cs              |  2 +-
 .../NamespaceA/SecondTableInA.go              |  2 +-
 .../NamespaceA/SecondTableInA.java            |  2 +-
 .../NamespaceA/SecondTableInA.php             |  2 +-
 .../NamespaceA/SecondTableInA.py              |  2 +-
 tests/namespace_test/NamespaceA/TableInC.cs   |  2 +-
 tests/namespace_test/NamespaceA/TableInC.go   |  2 +-
 tests/namespace_test/NamespaceA/TableInC.java |  2 +-
 tests/namespace_test/NamespaceA/TableInC.php  |  2 +-
 tests/namespace_test/NamespaceA/TableInC.py   |  2 +-
 .../NamespaceA/TableInFirstNS.cs              |  2 +-
 .../NamespaceA/TableInFirstNS.go              |  2 +-
 .../NamespaceA/TableInFirstNS.java            |  2 +-
 .../NamespaceA/TableInFirstNS.php             |  2 +-
 .../NamespaceA/TableInFirstNS.py              |  2 +-
 73 files changed, 255 insertions(+), 252 deletions(-)

diff --git a/include/flatbuffers/code_generators.h b/include/flatbuffers/code_generators.h
index 5770932cc..6c902a454 100644
--- a/include/flatbuffers/code_generators.h
+++ b/include/flatbuffers/code_generators.h
@@ -29,6 +29,11 @@ class BaseGenerator {
  protected:
   virtual ~BaseGenerator(){};
 
+  const char * FlatBuffersGeneratedWarning() {
+    return "automatically generated by the FlatBuffers compiler,"
+    " do not modify\n\n";
+  }  
+  
   bool IsEverythingGenerated() {
     for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
          ++it) {
diff --git a/samples/monster_generated.h b/samples/monster_generated.h
index cf45bbb91..1a16126a5 100644
--- a/samples/monster_generated.h
+++ b/samples/monster_generated.h
@@ -5,12 +5,13 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-
 namespace MyGame {
 namespace Sample {
 
 struct Vec3;
+
 struct Monster;
+
 struct Weapon;
 
 enum Color {
@@ -55,8 +56,11 @@ MANUALLY_ALIGNED_STRUCT(4) Vec3 FLATBUFFERS_FINAL_CLASS {
     : x_(flatbuffers::EndianScalar(_x)), y_(flatbuffers::EndianScalar(_y)), z_(flatbuffers::EndianScalar(_z)) { }
 
   float x() const { return flatbuffers::EndianScalar(x_); }
+  void mutate_x(float _x) { flatbuffers::WriteScalar(&x_, _x); }
   float y() const { return flatbuffers::EndianScalar(y_); }
+  void mutate_y(float _y) { flatbuffers::WriteScalar(&y_, _y); }
   float z() const { return flatbuffers::EndianScalar(z_); }
+  void mutate_z(float _z) { flatbuffers::WriteScalar(&z_, _z); }
 };
 STRUCT_END(Vec3, 12);
 
@@ -73,14 +77,23 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
     VT_EQUIPPED = 22
   };
   const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
+  Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
   int16_t mana() const { return GetField<int16_t>(VT_MANA, 150); }
+  bool mutate_mana(int16_t _mana) { return SetField(VT_MANA, _mana); }
   int16_t hp() const { return GetField<int16_t>(VT_HP, 100); }
+  bool mutate_hp(int16_t _hp) { return SetField(VT_HP, _hp); }
   const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
+  flatbuffers::String *mutable_name() { return GetPointer<flatbuffers::String *>(VT_NAME); }
   const flatbuffers::Vector<uint8_t> *inventory() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); }
+  flatbuffers::Vector<uint8_t> *mutable_inventory() { return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); }
   Color color() const { return static_cast<Color>(GetField<int8_t>(VT_COLOR, 2)); }
+  bool mutate_color(Color _color) { return SetField(VT_COLOR, static_cast<int8_t>(_color)); }
   const flatbuffers::Vector<flatbuffers::Offset<Weapon>> *weapons() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Weapon>> *>(VT_WEAPONS); }
+  flatbuffers::Vector<flatbuffers::Offset<Weapon>> *mutable_weapons() { return GetPointer<flatbuffers::Vector<flatbuffers::Offset<Weapon>> *>(VT_WEAPONS); }
   Equipment equipped_type() const { return static_cast<Equipment>(GetField<uint8_t>(VT_EQUIPPED_TYPE, 0)); }
+  bool mutate_equipped_type(Equipment _equipped_type) { return SetField(VT_EQUIPPED_TYPE, static_cast<uint8_t>(_equipped_type)); }
   const void *equipped() const { return GetPointer<const void *>(VT_EQUIPPED); }
+  void *mutable_equipped() { return GetPointer<void *>(VT_EQUIPPED); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<Vec3>(verifier, VT_POS) &&
@@ -150,7 +163,9 @@ struct Weapon FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
     VT_DAMAGE = 6
   };
   const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
+  flatbuffers::String *mutable_name() { return GetPointer<flatbuffers::String *>(VT_NAME); }
   int16_t damage() const { return GetField<int16_t>(VT_DAMAGE, 0); }
+  bool mutate_damage(int16_t _damage) { return SetField(VT_DAMAGE, _damage); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
@@ -192,6 +207,8 @@ inline bool VerifyEquipment(flatbuffers::Verifier &verifier, const void *union_o
 
 inline const MyGame::Sample::Monster *GetMonster(const void *buf) { return flatbuffers::GetRoot<MyGame::Sample::Monster>(buf); }
 
+inline Monster *GetMutableMonster(void *buf) { return flatbuffers::GetMutableRoot<Monster>(buf); }
+
 inline bool VerifyMonsterBuffer(flatbuffers::Verifier &verifier) { return verifier.VerifyBuffer<MyGame::Sample::Monster>(); }
 
 inline void FinishMonsterBuffer(flatbuffers::FlatBufferBuilder &fbb, flatbuffers::Offset<MyGame::Sample::Monster> root) { fbb.Finish(root); }
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 051cd99de..0bec8ca51 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -733,9 +733,7 @@ class CppGenerator : public BaseGenerator {
     if (IsEverythingGenerated()) return true;
 
     std::string code;
-    code =
-        "// automatically generated by the FlatBuffers compiler,"
-        " do not modify\n\n";
+    code = code + "// " + FlatBuffersGeneratedWarning();
 
     // Generate include guard.
     std::string include_guard_ident = file_name_;
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index 4a4e54dc4..71ea19ed1 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -1115,40 +1115,6 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
   code += "};\n\n";
 }
 
-// Save out the generated code for a single class while adding
-// declaration boilerplate.
-static bool SaveClass(const LanguageParameters &lang, const Parser &parser,
-                      const std::string &defname, const std::string &classcode,
-                      const std::string &path, bool needs_includes, bool onefile) {
-  if (!classcode.length()) return true;
-
-  std::string namespace_general;
-  std::string namespace_dir = path;  // Either empty or ends in separator.
-  auto &namespaces = parser.namespaces_.back()->components;
-  for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-    if (namespace_general.length()) {
-      namespace_general += ".";
-    }
-    namespace_general += *it;
-    if (!onefile) {
-      namespace_dir += *it + kPathSeparator;
-    }
-
-  }
-  EnsureDirExists(namespace_dir);
-
-  std::string code = "// automatically generated, do not modify\n\n";
-  if (!namespace_general.empty()) {
-    code += lang.namespace_ident + namespace_general + lang.namespace_begin;
-    code += "\n\n";
-  }
-  if (needs_includes) code += lang.includes;
-  code += classcode;
-  if (!namespace_general.empty()) code += lang.namespace_end;
-  auto filename = namespace_dir + defname + lang.file_extension;
-  return SaveFile(filename.c_str(), code, false);
-}
-
 namespace general {
 class GeneralGenerator : public BaseGenerator {
  public:
@@ -1167,9 +1133,7 @@ class GeneralGenerator : public BaseGenerator {
       if (parser_.opts.one_file) {
         one_file_code += enumcode;
       } else {
-        if (!SaveClass(lang, parser_, (**it).name, enumcode, path_, false,
-                       false))
-          return false;
+        if (!SaveType(lang, (**it).name, enumcode, false, false)) return false;
       }
     }
 
@@ -1180,18 +1144,49 @@ class GeneralGenerator : public BaseGenerator {
       if (parser_.opts.one_file) {
         one_file_code += declcode;
       } else {
-        if (!SaveClass(lang, parser_, (**it).name, declcode, path_, true,
-                       false))
-          return false;
+        if (!SaveType(lang, (**it).name, declcode, true, false)) return false;
       }
     }
 
     if (parser_.opts.one_file) {
-      return SaveClass(lang, parser_, file_name_, one_file_code, path_, true,
-                       true);
+      return SaveType(lang, file_name_, one_file_code, true, true);
     }
     return true;
   }
+
+  // Save out the generated code for a single class while adding
+  // declaration boilerplate.
+  bool SaveType(const LanguageParameters &lang, const std::string &defname,
+                const std::string &classcode, bool needs_includes,
+                bool onefile) {
+    if (!classcode.length()) return true;
+
+    std::string namespace_general;
+    std::string namespace_dir = path_;  // Either empty or ends in separator.
+    auto &namespaces = parser_.namespaces_.back()->components;
+    for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
+      if (namespace_general.length()) {
+        namespace_general += ".";
+      }
+      namespace_general += *it;
+      if (!onefile) {
+        namespace_dir += *it + kPathSeparator;
+      }
+    }
+    EnsureDirExists(namespace_dir);
+
+    std::string code;
+    code = code + "// " + FlatBuffersGeneratedWarning();
+    if (!namespace_general.empty()) {
+      code += lang.namespace_ident + namespace_general + lang.namespace_begin;
+      code += "\n\n";
+    }
+    if (needs_includes) code += lang.includes;
+    code += classcode;
+    if (!namespace_general.empty()) code += lang.namespace_end;
+    auto filename = namespace_dir + defname + lang.file_extension;
+    return SaveFile(filename.c_str(), code, false);
+  }
 };
 }  // namespace general
 
diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp
index bce8f95bc..be437c7b0 100644
--- a/src/idl_gen_go.cpp
+++ b/src/idl_gen_go.cpp
@@ -53,20 +53,6 @@ std::string OffsetPrefix(const FieldDef &field) {
          "))\n\tif o != 0 {\n";
 }
 
-// Begin by declaring namespace and imports.
-static void BeginFile(const std::string name_space_name,
-                      const bool needs_imports,
-                      std::string *code_ptr) {
-  std::string &code = *code_ptr;
-  code += "// automatically generated, do not modify\n\n";
-  code += "package " + name_space_name + "\n\n";
-  if (needs_imports) {
-    code += "import (\n";
-    code += "\tflatbuffers \"github.com/google/flatbuffers/go\"\n";
-    code += ")\n";
-  }
-}
-
 // Begin a class declaration.
 static void BeginClass(const StructDef &struct_def, std::string *code_ptr) {
   std::string &code = *code_ptr;
@@ -589,32 +575,6 @@ static std::string GenMethod(const FieldDef &field) {
     : (IsStruct(field.value.type) ? "Struct" : "UOffsetT");
 }
 
-
-// Save out the generated code for a Go Table type.
-static bool SaveType(const Parser &parser, const Definition &def,
-                     const std::string &classcode, const std::string &path,
-                     bool needs_imports) {
-  if (!classcode.length()) return true;
-
-  std::string namespace_name;
-  std::string namespace_dir = path;  // Either empty or ends in separator.
-  auto &namespaces = parser.namespaces_.back()->components;
-  for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-    if (namespace_name.length()) {
-      namespace_name += ".";
-    }
-    namespace_name = *it;
-    namespace_dir += *it + kPathSeparator;
-  }
-  EnsureDirExists(namespace_dir);
-
-  std::string code = "";
-  BeginFile(namespace_name, needs_imports, &code);
-  code += classcode;
-  std::string filename = namespace_dir + def.name + ".go";
-  return SaveFile(filename.c_str(), code, false);
-}
-
 static std::string GenTypeBasic(const Type &type) {
   static const char *ctypename[] = {
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
@@ -671,18 +631,56 @@ class GoGenerator : public BaseGenerator {
          ++it) {
       std::string enumcode;
       go::GenEnum(**it, &enumcode);
-      if (!go::SaveType(parser_, **it, enumcode, path_, false)) return false;
+      if (!SaveType(**it, enumcode, false)) return false;
     }
 
     for (auto it = parser_.structs_.vec.begin();
          it != parser_.structs_.vec.end(); ++it) {
       std::string declcode;
       go::GenStruct(**it, &declcode, parser_.root_struct_def_);
-      if (!go::SaveType(parser_, **it, declcode, path_, true)) return false;
+      if (!SaveType(**it, declcode, true)) return false;
     }
 
     return true;
   }
+
+ private:
+  // Begin by declaring namespace and imports.
+  void BeginFile(const std::string name_space_name, const bool needs_imports,
+                 std::string *code_ptr) {
+    std::string &code = *code_ptr;
+    code = code + "// " + FlatBuffersGeneratedWarning();
+    code += "package " + name_space_name + "\n\n";
+    if (needs_imports) {
+      code += "import (\n";
+      code += "\tflatbuffers \"github.com/google/flatbuffers/go\"\n";
+      code += ")\n";
+    }
+  }
+
+  // Save out the generated code for a Go Table type.
+  bool SaveType(const Definition &def, const std::string &classcode,
+                bool needs_imports) {
+    if (!classcode.length()) return true;
+
+    std::string namespace_name;
+    std::string namespace_dir = path_;  // Either empty or ends in separator.
+    auto &namespaces = parser_.namespaces_.back()->components;
+    for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
+      if (namespace_name.length()) {
+        namespace_name += ".";
+      }
+      namespace_name = *it;
+      namespace_dir += *it + kPathSeparator;
+    }
+    EnsureDirExists(namespace_dir);
+
+    std::string code = "";
+    BeginFile(namespace_name, needs_imports, &code);
+    code += classcode;
+    std::string filename = namespace_dir + def.name + ".go";
+    return SaveFile(filename.c_str(), code, false);
+  }
 };
 }  // namespace go
 
diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp
index 0265394ed..d724b80f4 100644
--- a/src/idl_gen_js.cpp
+++ b/src/idl_gen_js.cpp
@@ -684,9 +684,7 @@ class JsGenerator : public BaseGenerator {
     generateEnums(&enum_code, &exports_code);
     generateStructs(&struct_code, &exports_code);
 
-    code +=
-        "// automatically generated by the FlatBuffers compiler, do not "
-        "modify\n\n";
+    code = code + "// " + FlatBuffersGeneratedWarning();
 
     // Generate code for all the namespace declarations.
     GenNamespaces(parser_, &code, &exports_code);
diff --git a/src/idl_gen_php.cpp b/src/idl_gen_php.cpp
index b43ea6702..5fb412434 100644
--- a/src/idl_gen_php.cpp
+++ b/src/idl_gen_php.cpp
@@ -54,24 +54,6 @@ namespace php {
     // Hardcode spaces per indentation.
     const std::string Indent = "    ";
 
-    // Begin by declaring namespace and imports.
-    static void BeginFile(const std::string name_space_name,
-      const bool needs_imports,
-      std::string *code_ptr) {
-      std::string &code = *code_ptr;
-      code += "<?php\n";
-      code += "// automatically generated, do not modify\n\n";
-      code += "namespace " + name_space_name + ";\n\n";
-
-      if (needs_imports) {
-        code += "use \\Google\\FlatBuffers\\Struct;\n";
-        code += "use \\Google\\FlatBuffers\\Table;\n";
-        code += "use \\Google\\FlatBuffers\\ByteBuffer;\n";
-        code += "use \\Google\\FlatBuffers\\FlatBufferBuilder;\n";
-        code += "\n";
-      }
-    }
-
     // Begin a class declaration.
     static void BeginClass(const StructDef &struct_def, std::string *code_ptr) {
       std::string &code = *code_ptr;
@@ -867,35 +849,6 @@ namespace php {
         : (IsStruct(field.value.type) ? "Struct" : "Offset");
     }
 
-
-    // Save out the generated code for a Php Table type.
-    static bool SaveType(const Parser &parser, const Definition &def,
-      const std::string &classcode, const std::string &path,
-      bool needs_imports) {
-      if (!classcode.length()) return true;
-
-      std::string namespace_name;
-      std::string namespace_dir = path;
-
-      auto &namespaces = parser.namespaces_.back()->components;
-      for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-        if (namespace_name.length()) {
-          namespace_name += "\\";
-          namespace_dir += kPathSeparator;
-        }
-        namespace_name += *it;
-        namespace_dir += *it;
-        EnsureDirExists(namespace_dir.c_str());
-      }
-
-      std::string code = "";
-      BeginFile(namespace_name, needs_imports, &code);
-      code += classcode;
-
-      std::string filename = namespace_dir + kPathSeparator + def.name + ".php";
-      return SaveFile(filename.c_str(), code, false);
-    }
-
     static std::string GenTypeBasic(const Type &type) {
       static const char *ctypename[] = {
 #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
@@ -993,8 +946,7 @@ namespace php {
           auto &enum_def = **it;
           std::string enumcode;
           GenEnum(enum_def, &enumcode);
-          if (!SaveType(parser_, enum_def, enumcode, path_, false))
-            return false;
+          if (!SaveType(enum_def, enumcode, false)) return false;
         }
         return true;
       }
@@ -1005,11 +957,55 @@ namespace php {
           auto &struct_def = **it;
           std::string declcode;
           GenStruct(parser_, struct_def, &declcode);
-          if (!SaveType(parser_, struct_def, declcode, path_, true))
-            return false;
+          if (!SaveType(struct_def, declcode, true)) return false;
         }
         return true;
       }
+
+      // Begin by declaring namespace and imports.
+      void BeginFile(const std::string name_space_name,
+                     const bool needs_imports, std::string *code_ptr) {
+        std::string &code = *code_ptr;
+        code += "<?php\n";
+        code = code + "// " + FlatBuffersGeneratedWarning();
+        code += "namespace " + name_space_name + ";\n\n";
+
+        if (needs_imports) {
+          code += "use \\Google\\FlatBuffers\\Struct;\n";
+          code += "use \\Google\\FlatBuffers\\Table;\n";
+          code += "use \\Google\\FlatBuffers\\ByteBuffer;\n";
+          code += "use \\Google\\FlatBuffers\\FlatBufferBuilder;\n";
+          code += "\n";
+        }
+      }
+
+      // Save out the generated code for a Php Table type.
+      bool SaveType(const Definition &def, const std::string &classcode,
+                    bool needs_imports) {
+        if (!classcode.length()) return true;
+
+        std::string namespace_name;
+        std::string namespace_dir = path_;
+
+        auto &namespaces = parser_.namespaces_.back()->components;
+        for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
+          if (namespace_name.length()) {
+            namespace_name += "\\";
+            namespace_dir += kPathSeparator;
+          }
+          namespace_name += *it;
+          namespace_dir += *it;
+          EnsureDirExists(namespace_dir.c_str());
+        }
+
+        std::string code = "";
+        BeginFile(namespace_name, needs_imports, &code);
+        code += classcode;
+
+        std::string filename =
+            namespace_dir + kPathSeparator + def.name + ".php";
+        return SaveFile(filename.c_str(), code, false);
+      }
     };
     }  // namespace php
 
diff --git a/src/idl_gen_python.cpp b/src/idl_gen_python.cpp
index ee6d16874..291aada0e 100644
--- a/src/idl_gen_python.cpp
+++ b/src/idl_gen_python.cpp
@@ -49,18 +49,6 @@ std::string OffsetPrefix(const FieldDef &field) {
          "))\n" + Indent + Indent + "if o != 0:\n";
 }
 
-// Begin by declaring namespace and imports.
-static void BeginFile(const std::string name_space_name,
-                      const bool needs_imports,
-                      std::string *code_ptr) {
-  std::string &code = *code_ptr;
-  code += "# automatically generated, do not modify\n\n";
-  code += "# namespace: " + name_space_name + "\n\n";
-  if (needs_imports) {
-    code += "import flatbuffers\n\n";
-  }
-}
-
 // Begin a class declaration.
 static void BeginClass(const StructDef &struct_def, std::string *code_ptr) {
   std::string &code = *code_ptr;
@@ -558,37 +546,6 @@ static std::string GenMethod(const FieldDef &field) {
     : (IsStruct(field.value.type) ? "Struct" : "UOffsetTRelative");
 }
 
-
-// Save out the generated code for a Python Table type.
-static bool SaveType(const Parser &parser, const Definition &def,
-                     const std::string &classcode, const std::string &path,
-                     bool needs_imports) {
-  if (!classcode.length()) return true;
-
-  std::string namespace_name;
-  std::string namespace_dir = path;
-  auto &namespaces = parser.namespaces_.back()->components;
-  for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-    if (namespace_name.length()) {
-      namespace_name += ".";
-      namespace_dir += kPathSeparator;
-    }
-    namespace_name = *it;
-    namespace_dir += *it;
-    EnsureDirExists(namespace_dir.c_str());
-
-    std::string init_py_filename = namespace_dir + "/__init__.py";
-    SaveFile(init_py_filename.c_str(), "", false);
-  }
-
-
-  std::string code = "";
-  BeginFile(namespace_name, needs_imports, &code);
-  code += classcode;
-  std::string filename = namespace_dir + kPathSeparator + def.name + ".py";
-  return SaveFile(filename.c_str(), code, false);
-}
-
 static std::string GenTypeBasic(const Type &type) {
   static const char *ctypename[] = {
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
@@ -653,7 +610,7 @@ class PythonGenerator : public BaseGenerator {
       auto &enum_def = **it;
       std::string enumcode;
       GenEnum(enum_def, &enumcode);
-      if (!SaveType(parser_, enum_def, enumcode, path_, false)) return false;
+      if (!SaveType(enum_def, enumcode, false)) return false;
     }
     return true;
   }
@@ -664,10 +621,49 @@ class PythonGenerator : public BaseGenerator {
       auto &struct_def = **it;
       std::string declcode;
       GenStruct(struct_def, &declcode, parser_.root_struct_def_);
-      if (!SaveType(parser_, struct_def, declcode, path_, true)) return false;
+      if (!SaveType(struct_def, declcode, true)) return false;
     }
     return true;
   }
+
+  // Begin by declaring namespace and imports.
+  void BeginFile(const std::string name_space_name, const bool needs_imports,
+                 std::string *code_ptr) {
+    std::string &code = *code_ptr;
+    code = code + "# " + FlatBuffersGeneratedWarning();
+    code += "# namespace: " + name_space_name + "\n\n";
+    if (needs_imports) {
+      code += "import flatbuffers\n\n";
+    }
+  }
+
+  // Save out the generated code for a Python Table type.
+  bool SaveType(const Definition &def, const std::string &classcode,
+                bool needs_imports) {
+    if (!classcode.length()) return true;
+
+    std::string namespace_name;
+    std::string namespace_dir = path_;
+    auto &namespaces = parser_.namespaces_.back()->components;
+    for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
+      if (namespace_name.length()) {
+        namespace_name += ".";
+        namespace_dir += kPathSeparator;
+      }
+      namespace_name = *it;
+      namespace_dir += *it;
+      EnsureDirExists(namespace_dir.c_str());
+
+      std::string init_py_filename = namespace_dir + "/__init__.py";
+      SaveFile(init_py_filename.c_str(), "", false);
+    }
+
+    std::string code = "";
+    BeginFile(namespace_name, needs_imports, &code);
+    code += classcode;
+    std::string filename = namespace_dir + kPathSeparator + def.name + ".py";
+    return SaveFile(filename.c_str(), code, false);
+  }
 };
 
 }  // namespace python
diff --git a/tests/MyGame/Example/Any.cs b/tests/MyGame/Example/Any.cs
index a05a91851..1f018ad89 100644
--- a/tests/MyGame/Example/Any.cs
+++ b/tests/MyGame/Example/Any.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/Any.go b/tests/MyGame/Example/Any.go
index a23de4cbc..0322364c6 100644
--- a/tests/MyGame/Example/Any.go
+++ b/tests/MyGame/Example/Any.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/Any.java b/tests/MyGame/Example/Any.java
index cdc3ec567..27dc1bcb9 100644
--- a/tests/MyGame/Example/Any.java
+++ b/tests/MyGame/Example/Any.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/Any.php b/tests/MyGame/Example/Any.php
index d35bfd639..f04f4ad3f 100644
--- a/tests/MyGame/Example/Any.php
+++ b/tests/MyGame/Example/Any.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/Any.py b/tests/MyGame/Example/Any.py
index a247b528c..b642ede01 100644
--- a/tests/MyGame/Example/Any.py
+++ b/tests/MyGame/Example/Any.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/MyGame/Example/Color.cs b/tests/MyGame/Example/Color.cs
index 7843733e3..625d040a9 100644
--- a/tests/MyGame/Example/Color.cs
+++ b/tests/MyGame/Example/Color.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/Color.go b/tests/MyGame/Example/Color.go
index 289a7b063..09f6d5805 100644
--- a/tests/MyGame/Example/Color.go
+++ b/tests/MyGame/Example/Color.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/Color.java b/tests/MyGame/Example/Color.java
index 822d2bbfe..502ec9fbf 100644
--- a/tests/MyGame/Example/Color.java
+++ b/tests/MyGame/Example/Color.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/Color.php b/tests/MyGame/Example/Color.php
index 9de0e68f9..70c7bfd94 100644
--- a/tests/MyGame/Example/Color.php
+++ b/tests/MyGame/Example/Color.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/Color.py b/tests/MyGame/Example/Color.py
index 18b147dce..36e80a367 100644
--- a/tests/MyGame/Example/Color.py
+++ b/tests/MyGame/Example/Color.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/MyGame/Example/Monster.cs b/tests/MyGame/Example/Monster.cs
index abe95ec84..6101f464c 100644
--- a/tests/MyGame/Example/Monster.cs
+++ b/tests/MyGame/Example/Monster.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/Monster.go b/tests/MyGame/Example/Monster.go
index 5aa4a73e9..fbd849e81 100644
--- a/tests/MyGame/Example/Monster.go
+++ b/tests/MyGame/Example/Monster.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/Monster.java b/tests/MyGame/Example/Monster.java
index 69c975436..d85e4baac 100644
--- a/tests/MyGame/Example/Monster.java
+++ b/tests/MyGame/Example/Monster.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/Monster.php b/tests/MyGame/Example/Monster.php
index 879b76247..9f82d5a9c 100644
--- a/tests/MyGame/Example/Monster.php
+++ b/tests/MyGame/Example/Monster.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/Monster.py b/tests/MyGame/Example/Monster.py
index 42b79939b..4f1ca2dfa 100644
--- a/tests/MyGame/Example/Monster.py
+++ b/tests/MyGame/Example/Monster.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/MyGame/Example/Stat.cs b/tests/MyGame/Example/Stat.cs
index 2b3f5375f..30eaee5ea 100644
--- a/tests/MyGame/Example/Stat.cs
+++ b/tests/MyGame/Example/Stat.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/Stat.go b/tests/MyGame/Example/Stat.go
index 936d5ec9c..7c33716b4 100644
--- a/tests/MyGame/Example/Stat.go
+++ b/tests/MyGame/Example/Stat.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/Stat.java b/tests/MyGame/Example/Stat.java
index dd3716330..3cac509b7 100644
--- a/tests/MyGame/Example/Stat.java
+++ b/tests/MyGame/Example/Stat.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/Stat.php b/tests/MyGame/Example/Stat.php
index c959ac7bb..6ef70348d 100644
--- a/tests/MyGame/Example/Stat.php
+++ b/tests/MyGame/Example/Stat.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/Stat.py b/tests/MyGame/Example/Stat.py
index 23bef0db6..71577e868 100644
--- a/tests/MyGame/Example/Stat.py
+++ b/tests/MyGame/Example/Stat.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/MyGame/Example/Test.cs b/tests/MyGame/Example/Test.cs
index 5bd2e58dd..bd82295fc 100644
--- a/tests/MyGame/Example/Test.cs
+++ b/tests/MyGame/Example/Test.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/Test.go b/tests/MyGame/Example/Test.go
index dc4de8eec..e849488d9 100644
--- a/tests/MyGame/Example/Test.go
+++ b/tests/MyGame/Example/Test.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/Test.java b/tests/MyGame/Example/Test.java
index ffd7394f6..52474152f 100644
--- a/tests/MyGame/Example/Test.java
+++ b/tests/MyGame/Example/Test.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/Test.php b/tests/MyGame/Example/Test.php
index acc838a33..13cced001 100644
--- a/tests/MyGame/Example/Test.php
+++ b/tests/MyGame/Example/Test.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/Test.py b/tests/MyGame/Example/Test.py
index 4c4912a61..3b2fd45f7 100644
--- a/tests/MyGame/Example/Test.py
+++ b/tests/MyGame/Example/Test.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.cs b/tests/MyGame/Example/TestSimpleTableWithEnum.cs
index c1bf571f8..63cb9e19a 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.cs
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.go b/tests/MyGame/Example/TestSimpleTableWithEnum.go
index a26a53e46..fe9cf2dbb 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.go
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.java b/tests/MyGame/Example/TestSimpleTableWithEnum.java
index 3000cab47..85e18c2b3 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.java
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.php b/tests/MyGame/Example/TestSimpleTableWithEnum.php
index 6181461e5..d37481fc3 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.php
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.py b/tests/MyGame/Example/TestSimpleTableWithEnum.py
index 7085995be..5b9509791 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.py
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/MyGame/Example/Vec3.cs b/tests/MyGame/Example/Vec3.cs
index e5fa2f674..a6d21face 100644
--- a/tests/MyGame/Example/Vec3.cs
+++ b/tests/MyGame/Example/Vec3.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/Vec3.go b/tests/MyGame/Example/Vec3.go
index def0b4d1b..082945ed3 100644
--- a/tests/MyGame/Example/Vec3.go
+++ b/tests/MyGame/Example/Vec3.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/Vec3.java b/tests/MyGame/Example/Vec3.java
index 86edb6dc5..7ae1ce209 100644
--- a/tests/MyGame/Example/Vec3.java
+++ b/tests/MyGame/Example/Vec3.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/Vec3.php b/tests/MyGame/Example/Vec3.php
index 022254ce9..ab1a82757 100644
--- a/tests/MyGame/Example/Vec3.php
+++ b/tests/MyGame/Example/Vec3.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/Vec3.py b/tests/MyGame/Example/Vec3.py
index c4ddfe230..a354773eb 100644
--- a/tests/MyGame/Example/Vec3.py
+++ b/tests/MyGame/Example/Vec3.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs
index e57e1dc7c..5f979fe54 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA.NamespaceB
 {
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
index 4de2d0e3e..a1fe117c5 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java
index a919ace6c..ff5559544 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA.NamespaceB;
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php
index a39c0d731..d51cb41c4 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA\NamespaceB;
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py
index 5de5be804..cb8218f0d 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
index 7317f2410..16b0f4585 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA.NamespaceB
 {
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
index 66943e3cd..f3684623b 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java
index dfbe23e8d..93f805224 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA.NamespaceB;
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php
index 962ea2c6a..d3054841a 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA\NamespaceB;
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py
index ae3f94024..59cceaa65 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
index dec8da9ee..b983cd0e4 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA.NamespaceB
 {
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
index 09815c454..cf2b557c6 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java
index 344005d5f..2cfb1bacc 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA.NamespaceB;
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php
index 6bedae9d1..d16379d87 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA\NamespaceB;
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py
index 834103bfe..e8e1f2ba7 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.cs b/tests/namespace_test/NamespaceA/SecondTableInA.cs
index 11bf90fd7..96ae378fb 100644
--- a/tests/namespace_test/NamespaceA/SecondTableInA.cs
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA
 {
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.go b/tests/namespace_test/NamespaceA/SecondTableInA.go
index 78514388a..efc7713f8 100644
--- a/tests/namespace_test/NamespaceA/SecondTableInA.go
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA
 
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.java b/tests/namespace_test/NamespaceA/SecondTableInA.java
index b1fa7a7e0..acabc3931 100644
--- a/tests/namespace_test/NamespaceA/SecondTableInA.java
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA;
 
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.php b/tests/namespace_test/NamespaceA/SecondTableInA.php
index 78dc27f53..c9bc65c15 100644
--- a/tests/namespace_test/NamespaceA/SecondTableInA.php
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA;
 
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.py b/tests/namespace_test/NamespaceA/SecondTableInA.py
index f70153947..ab11701a2 100644
--- a/tests/namespace_test/NamespaceA/SecondTableInA.py
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceA
 
diff --git a/tests/namespace_test/NamespaceA/TableInC.cs b/tests/namespace_test/NamespaceA/TableInC.cs
index 19576df11..98f4e1383 100644
--- a/tests/namespace_test/NamespaceA/TableInC.cs
+++ b/tests/namespace_test/NamespaceA/TableInC.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA
 {
diff --git a/tests/namespace_test/NamespaceA/TableInC.go b/tests/namespace_test/NamespaceA/TableInC.go
index 535493f64..6f3d3f212 100644
--- a/tests/namespace_test/NamespaceA/TableInC.go
+++ b/tests/namespace_test/NamespaceA/TableInC.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA
 
diff --git a/tests/namespace_test/NamespaceA/TableInC.java b/tests/namespace_test/NamespaceA/TableInC.java
index 36e3cf192..38fb3ab30 100644
--- a/tests/namespace_test/NamespaceA/TableInC.java
+++ b/tests/namespace_test/NamespaceA/TableInC.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA;
 
diff --git a/tests/namespace_test/NamespaceA/TableInC.php b/tests/namespace_test/NamespaceA/TableInC.php
index e02226235..49705f820 100644
--- a/tests/namespace_test/NamespaceA/TableInC.php
+++ b/tests/namespace_test/NamespaceA/TableInC.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA;
 
diff --git a/tests/namespace_test/NamespaceA/TableInC.py b/tests/namespace_test/NamespaceA/TableInC.py
index bc101a7e3..4afea1af9 100644
--- a/tests/namespace_test/NamespaceA/TableInC.py
+++ b/tests/namespace_test/NamespaceA/TableInC.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceA
 
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.cs b/tests/namespace_test/NamespaceA/TableInFirstNS.cs
index a5f6ee27c..4b4be117e 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.cs
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA
 {
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.go b/tests/namespace_test/NamespaceA/TableInFirstNS.go
index 2f6f72676..5580d5d58 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.go
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA
 
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.java b/tests/namespace_test/NamespaceA/TableInFirstNS.java
index c92c0f38e..873979307 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.java
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA;
 
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.php b/tests/namespace_test/NamespaceA/TableInFirstNS.php
index 57a827bc5..9fb29c370 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.php
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA;
 
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.py b/tests/namespace_test/NamespaceA/TableInFirstNS.py
index eb09014ce..3a652f495 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.py
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceA
 

From 61b101d4429748e4723d384e5dbf69c451a32282 Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Sat, 28 May 2016 08:15:43 +0200
Subject: [PATCH 154/185] sharing namespace_dir and the namespace string
 methods

---
 include/flatbuffers/code_generators.h | 46 +++++++++++++---
 src/idl_gen_general.cpp               | 76 ++++++++-------------------
 src/idl_gen_go.cpp                    | 16 +-----
 src/idl_gen_php.cpp                   | 18 +------
 src/idl_gen_python.cpp                | 13 ++---
 5 files changed, 67 insertions(+), 102 deletions(-)

diff --git a/include/flatbuffers/code_generators.h b/include/flatbuffers/code_generators.h
index 6c902a454..a832334ec 100644
--- a/include/flatbuffers/code_generators.h
+++ b/include/flatbuffers/code_generators.h
@@ -21,19 +21,35 @@ namespace flatbuffers {
 
 class BaseGenerator {
  public:
-  BaseGenerator(const Parser &parser, const std::string &path,
-                const std::string &file_name)
-      : parser_(parser), path_(path), file_name_(file_name){};
   virtual bool generate() = 0;
 
+  static const std::string NamespaceDir(const Parser &parser,
+                                        const std::string &path) {
+    EnsureDirExists(path.c_str());
+    if (parser.opts.one_file) return path;
+    std::string namespace_dir = path;  // Either empty or ends in separator.
+    auto &namespaces = parser.namespaces_.back()->components;
+    for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
+      namespace_dir += *it + kPathSeparator;
+      EnsureDirExists(namespace_dir.c_str());
+    }
+    return namespace_dir;
+  }
+
  protected:
+  BaseGenerator(const Parser &parser, const std::string &path,
+                const std::string &file_name)
+      : parser_(parser),
+        path_(path),
+        file_name_(file_name),
+        namespace_dir_(BaseGenerator::NamespaceDir(parser, path)){};
   virtual ~BaseGenerator(){};
 
-  const char * FlatBuffersGeneratedWarning() {
+  const char *FlatBuffersGeneratedWarning() {
     return "automatically generated by the FlatBuffers compiler,"
-    " do not modify\n\n";
-  }  
-  
+           " do not modify\n\n";
+  }
+
   bool IsEverythingGenerated() {
     for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
          ++it) {
@@ -46,9 +62,25 @@ class BaseGenerator {
     return true;
   }
 
+  std::string FullNamespace(const char *separator) {
+    std::string namespace_name;
+    auto &namespaces = parser_.namespaces_.back()->components;
+    for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
+      if (namespace_name.length()) namespace_name += separator;
+      namespace_name += *it;
+    }
+    return namespace_name;
+  }
+
+  const std::string LastNamespacePart() {
+    auto &namespaces = parser_.namespaces_.back()->components;
+    if (namespaces.size()) return *(namespaces.end() - 1); else return std::string("");
+  }
+
   const Parser &parser_;
   const std::string &path_;
   const std::string &file_name_;
+  const std::string namespace_dir_;
 };
 
 }  // namespace flatbuffers
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index 71ea19ed1..a0b837a20 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -1133,7 +1133,7 @@ class GeneralGenerator : public BaseGenerator {
       if (parser_.opts.one_file) {
         one_file_code += enumcode;
       } else {
-        if (!SaveType(lang, (**it).name, enumcode, false, false)) return false;
+        if (!SaveType(lang, (**it).name, enumcode, false)) return false;
       }
     }
 
@@ -1144,12 +1144,12 @@ class GeneralGenerator : public BaseGenerator {
       if (parser_.opts.one_file) {
         one_file_code += declcode;
       } else {
-        if (!SaveType(lang, (**it).name, declcode, true, false)) return false;
+        if (!SaveType(lang, (**it).name, declcode, true)) return false;
       }
     }
 
     if (parser_.opts.one_file) {
-      return SaveType(lang, file_name_, one_file_code, true, true);
+      return SaveType(lang, file_name_, one_file_code, true);
     }
     return true;
   }
@@ -1157,34 +1157,20 @@ class GeneralGenerator : public BaseGenerator {
   // Save out the generated code for a single class while adding
   // declaration boilerplate.
   bool SaveType(const LanguageParameters &lang, const std::string &defname,
-                const std::string &classcode, bool needs_includes,
-                bool onefile) {
+                const std::string &classcode, bool needs_includes) {
     if (!classcode.length()) return true;
 
-    std::string namespace_general;
-    std::string namespace_dir = path_;  // Either empty or ends in separator.
-    auto &namespaces = parser_.namespaces_.back()->components;
-    for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-      if (namespace_general.length()) {
-        namespace_general += ".";
-      }
-      namespace_general += *it;
-      if (!onefile) {
-        namespace_dir += *it + kPathSeparator;
-      }
-    }
-    EnsureDirExists(namespace_dir);
-
     std::string code;
     code = code + "// " + FlatBuffersGeneratedWarning();
-    if (!namespace_general.empty()) {
-      code += lang.namespace_ident + namespace_general + lang.namespace_begin;
+    std::string namespace_name = FullNamespace(".");
+    if (!namespace_name.empty()) {
+      code += lang.namespace_ident + namespace_name + lang.namespace_begin;
       code += "\n\n";
     }
     if (needs_includes) code += lang.includes;
     code += classcode;
-    if (!namespace_general.empty()) code += lang.namespace_end;
-    auto filename = namespace_dir + defname + lang.file_extension;
+    if (!namespace_name.empty()) code += lang.namespace_end;
+    auto filename = namespace_dir_ + defname + lang.file_extension;
     return SaveFile(filename.c_str(), code, false);
   }
 };
@@ -1196,50 +1182,30 @@ bool GenerateGeneral(const Parser &parser, const std::string &path,
   return generator.generate();
 }
 
-static std::string ClassFileName(const LanguageParameters &lang,
-                                 const Parser &parser, const Definition &def,
-                                 const std::string &path) {
-  std::string namespace_general;
-  std::string namespace_dir = path;
-  auto &namespaces = parser.namespaces_.back()->components;
-  for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-    if (namespace_general.length()) {
-      namespace_general += ".";
-      namespace_dir += kPathSeparator;
-    }
-    namespace_general += *it;
-    namespace_dir += *it;
-  }
-
-  return namespace_dir + kPathSeparator + def.name + lang.file_extension;
-}
-
-std::string GeneralMakeRule(const Parser &parser,
-                            const std::string &path,
+std::string GeneralMakeRule(const Parser &parser, const std::string &path,
                             const std::string &file_name) {
   assert(parser.opts.lang <= IDLOptions::kMAX);
   auto lang = language_parameters[parser.opts.lang];
 
   std::string make_rule;
+  std::string directory =
+      BaseGenerator::NamespaceDir(parser, path) + kPathSeparator;
 
-  for (auto it = parser.enums_.vec.begin();
-       it != parser.enums_.vec.end(); ++it) {
-    if (make_rule != "")
-      make_rule += " ";
-    make_rule += ClassFileName(lang, parser, **it, path);
+  for (auto it = parser.enums_.vec.begin(); it != parser.enums_.vec.end();
+       ++it) {
+    if (make_rule != "") make_rule += " ";
+    make_rule += directory + (**it).name + lang.file_extension;
   }
 
-  for (auto it = parser.structs_.vec.begin();
-       it != parser.structs_.vec.end(); ++it) {
-    if (make_rule != "")
-      make_rule += " ";
-    make_rule += ClassFileName(lang, parser, **it, path);
+  for (auto it = parser.structs_.vec.begin(); it != parser.structs_.vec.end();
+       ++it) {
+    if (make_rule != "") make_rule += " ";
+    make_rule += directory + (**it).name + lang.file_extension;
   }
 
   make_rule += ": ";
   auto included_files = parser.GetIncludedFilesRecursive(file_name);
-  for (auto it = included_files.begin();
-       it != included_files.end(); ++it) {
+  for (auto it = included_files.begin(); it != included_files.end(); ++it) {
     make_rule += " " + *it;
   }
   return make_rule;
diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp
index be437c7b0..5841e121c 100644
--- a/src/idl_gen_go.cpp
+++ b/src/idl_gen_go.cpp
@@ -663,22 +663,10 @@ class GoGenerator : public BaseGenerator {
                 bool needs_imports) {
     if (!classcode.length()) return true;
 
-    std::string namespace_name;
-    std::string namespace_dir = path_;  // Either empty or ends in separator.
-    auto &namespaces = parser_.namespaces_.back()->components;
-    for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-      if (namespace_name.length()) {
-        namespace_name += ".";
-      }
-      namespace_name = *it;
-      namespace_dir += *it + kPathSeparator;
-    }
-    EnsureDirExists(namespace_dir);
-
     std::string code = "";
-    BeginFile(namespace_name, needs_imports, &code);
+    BeginFile(LastNamespacePart(), needs_imports, &code);
     code += classcode;
-    std::string filename = namespace_dir + def.name + ".go";
+    std::string filename = namespace_dir_ + def.name + ".go";
     return SaveFile(filename.c_str(), code, false);
   }
 };
diff --git a/src/idl_gen_php.cpp b/src/idl_gen_php.cpp
index 5fb412434..599d5571d 100644
--- a/src/idl_gen_php.cpp
+++ b/src/idl_gen_php.cpp
@@ -984,26 +984,12 @@ namespace php {
                     bool needs_imports) {
         if (!classcode.length()) return true;
 
-        std::string namespace_name;
-        std::string namespace_dir = path_;
-
-        auto &namespaces = parser_.namespaces_.back()->components;
-        for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-          if (namespace_name.length()) {
-            namespace_name += "\\";
-            namespace_dir += kPathSeparator;
-          }
-          namespace_name += *it;
-          namespace_dir += *it;
-          EnsureDirExists(namespace_dir.c_str());
-        }
-
         std::string code = "";
-        BeginFile(namespace_name, needs_imports, &code);
+        BeginFile(FullNamespace("\\"), needs_imports, &code);
         code += classcode;
 
         std::string filename =
-            namespace_dir + kPathSeparator + def.name + ".php";
+            namespace_dir_ + kPathSeparator + def.name + ".php";
         return SaveFile(filename.c_str(), code, false);
       }
     };
diff --git a/src/idl_gen_python.cpp b/src/idl_gen_python.cpp
index 291aada0e..7b8d168c1 100644
--- a/src/idl_gen_python.cpp
+++ b/src/idl_gen_python.cpp
@@ -642,26 +642,19 @@ class PythonGenerator : public BaseGenerator {
                 bool needs_imports) {
     if (!classcode.length()) return true;
 
-    std::string namespace_name;
     std::string namespace_dir = path_;
     auto &namespaces = parser_.namespaces_.back()->components;
     for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-      if (namespace_name.length()) {
-        namespace_name += ".";
-        namespace_dir += kPathSeparator;
-      }
-      namespace_name = *it;
+      if (it != namespaces.begin()) namespace_dir += kPathSeparator;
       namespace_dir += *it;
-      EnsureDirExists(namespace_dir.c_str());
-
       std::string init_py_filename = namespace_dir + "/__init__.py";
       SaveFile(init_py_filename.c_str(), "", false);
     }
 
     std::string code = "";
-    BeginFile(namespace_name, needs_imports, &code);
+    BeginFile(LastNamespacePart(), needs_imports, &code);
     code += classcode;
-    std::string filename = namespace_dir + kPathSeparator + def.name + ".py";
+    std::string filename = namespace_dir_ + kPathSeparator + def.name + ".py";
     return SaveFile(filename.c_str(), code, false);
   }
 };

From 7dfe8e726bb774727c37b3a83e1f7ee790f52ce8 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <taipanromania@gmail.com>
Date: Mon, 30 May 2016 14:04:37 +0300
Subject: [PATCH 155/185] Define bit mask operators for scoped enums bitfields

Close #3887
---
 include/flatbuffers/flatbuffers.h | 29 +++++++++++++++++++++++++++++
 src/idl_gen_cpp.cpp               |  5 ++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 0fa31250f..9a8e0bef7 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -1485,6 +1485,35 @@ volatile __attribute__((weak)) const char *flatbuffer_version_string =
 
 #endif  // !defined(_WIN32) && !defined(__CYGWIN__)
 
+#define DEFINE_BITMASK_OPERATORS(E)\
+    inline E operator | (E lhs, E rhs){\
+        using T = std::underlying_type<E>::type;\
+        return E(T(lhs) | T(rhs));\
+    }\
+    inline E operator & (E lhs, E rhs){\
+        using T = std::underlying_type<E>::type;\
+        return E(T(lhs) & T(rhs));\
+    }\
+    inline E operator ^ (E lhs, E rhs){\
+        using T = std::underlying_type<E>::type;\
+        return E(T(lhs) ^ T(rhs));\
+    }\
+    inline E operator ~ (E lhs){\
+        using T = std::underlying_type<E>::type;\
+        return E(~T(lhs));\
+    }\
+    inline E operator |= (E &lhs, E rhs){\
+        lhs = lhs | rhs;\
+        return lhs;\
+    }\
+    inline E operator &= (E &lhs, E rhs){\
+        lhs = lhs & rhs;\
+        return lhs;\
+    }\
+    inline E operator ^= (E &lhs, E rhs){\
+        lhs = lhs ^ rhs;\
+        return lhs;\
+    }
 /// @endcond
 }  // namespace flatbuffers
 
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 051cd99de..f0daca26a 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -182,7 +182,10 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
   code += GenEnumVal(enum_def, minv->name, parser.opts) + ",\n";
   code += "  " + GenEnumVal(enum_def, "MAX", parser.opts) + " = ";
   code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n";
-  code += "};\n\n";
+  code += "};\n";
+  if (parser.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags"))
+    code += "DEFINE_BITMASK_OPERATORS(" + enum_def.name + ")\n";
+  code += "\n";
 
   // Generate a generate string table for enum values.
   // Problem is, if values are very sparse that could generate really big

From 0b0cf58f24a007075d17bff42c3a2724eda8ddf2 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <taipanromania@gmail.com>
Date: Wed, 1 Jun 2016 10:04:55 +0300
Subject: [PATCH 156/185] We already know the underlying_type.

We just need to pass it to DEFINE_BITMASK_OPERATORS macro
---
 include/flatbuffers/flatbuffers.h | 6 +-----
 src/idl_gen_cpp.cpp               | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 5de3a6611..b6260b6d5 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -1485,21 +1485,17 @@ volatile __attribute__((weak)) const char *flatbuffer_version_string =
 
 #endif  // !defined(_WIN32) && !defined(__CYGWIN__)
 
-#define DEFINE_BITMASK_OPERATORS(E)\
+#define DEFINE_BITMASK_OPERATORS(E, T)\
     inline E operator | (E lhs, E rhs){\
-        using T = std::underlying_type<E>::type;\
         return E(T(lhs) | T(rhs));\
     }\
     inline E operator & (E lhs, E rhs){\
-        using T = std::underlying_type<E>::type;\
         return E(T(lhs) & T(rhs));\
     }\
     inline E operator ^ (E lhs, E rhs){\
-        using T = std::underlying_type<E>::type;\
         return E(T(lhs) ^ T(rhs));\
     }\
     inline E operator ~ (E lhs){\
-        using T = std::underlying_type<E>::type;\
         return E(~T(lhs));\
     }\
     inline E operator |= (E &lhs, E rhs){\
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index f0daca26a..f045fe4a5 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -184,7 +184,7 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
   code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n";
   code += "};\n";
   if (parser.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags"))
-    code += "DEFINE_BITMASK_OPERATORS(" + enum_def.name + ")\n";
+    code += "DEFINE_BITMASK_OPERATORS(" + enum_def.name + ", " +  GenTypeBasic(enum_def.underlying_type, false) + ")\n";
   code += "\n";
 
   // Generate a generate string table for enum values.

From 038ea7c1d37cccac23ff962d8dcf62f6bce2a67f Mon Sep 17 00:00:00 2001
From: BogDan Vatra <taipanromania@gmail.com>
Date: Wed, 1 Jun 2016 10:05:27 +0300
Subject: [PATCH 157/185] Add ! operator

---
 include/flatbuffers/flatbuffers.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index b6260b6d5..e487fe4d6 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -1509,6 +1509,10 @@ volatile __attribute__((weak)) const char *flatbuffer_version_string =
     inline E operator ^= (E &lhs, E rhs){\
         lhs = lhs ^ rhs;\
         return lhs;\
+    }\
+    inline bool operator !(E rhs) \
+    {\
+        return !bool(T(rhs)); \
     }
 /// @endcond
 }  // namespace flatbuffers

From cccd7003ed395d7f48ce28cac0cfd79e8e137eab Mon Sep 17 00:00:00 2001
From: BogDan Vatra <taipanromania@gmail.com>
Date: Wed, 1 Jun 2016 10:03:40 +0300
Subject: [PATCH 158/185] MIN & MAX are useless for bit_flags

Instead we need NONE (0) and ANY (all orred values), if the user didn't
already defined them
---
 src/idl_gen_cpp.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index f045fe4a5..a163ee816 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -166,6 +166,7 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
   if (parser.opts.scoped_enums)
     code += " : " + GenTypeBasic(enum_def.underlying_type, false);
   code += " {\n";
+  int64_t anyv = 0;
   EnumVal *minv = nullptr, *maxv = nullptr;
   for (auto it = enum_def.vals.vec.begin();
        it != enum_def.vals.vec.end();
@@ -176,12 +177,20 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
     code += NumToString(ev.value) + ",\n";
     minv = !minv || minv->value > ev.value ? &ev : minv;
     maxv = !maxv || maxv->value < ev.value ? &ev : maxv;
+    anyv |= ev.value;
   }
   assert(minv && maxv);
-  code += "  " + GenEnumVal(enum_def, "MIN", parser.opts) + " = ";
-  code += GenEnumVal(enum_def, minv->name, parser.opts) + ",\n";
-  code += "  " + GenEnumVal(enum_def, "MAX", parser.opts) + " = ";
-  code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n";
+  if (enum_def.attributes.Lookup("bit_flags")) {
+    if (minv->value != 0) // If the user didn't defined NONE value
+      code += "  " + GenEnumVal(enum_def, "NONE", parser.opts) + " = 0,\n";
+    if (maxv->value != anyv) // If the user didn't defined ANY value
+      code += "  " + GenEnumVal(enum_def, "ANY", parser.opts) + " = " + NumToString(anyv) + "\n";
+  } else { // MIN & MAX are useless for bit_flags
+    code += "  " + GenEnumVal(enum_def, "MIN", parser.opts) + " = ";
+    code += GenEnumVal(enum_def, minv->name, parser.opts) + ",\n";
+    code += "  " + GenEnumVal(enum_def, "MAX", parser.opts) + " = ";
+    code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n";
+  }
   code += "};\n";
   if (parser.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags"))
     code += "DEFINE_BITMASK_OPERATORS(" + enum_def.name + ", " +  GenTypeBasic(enum_def.underlying_type, false) + ")\n";

From 3e52fecd1ed1c68e62b441c9e227b64351eef1c4 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <taipanromania@gmail.com>
Date: Wed, 1 Jun 2016 10:23:44 +0300
Subject: [PATCH 159/185] Don't generate MIN & MAX enum values if "--no-prefix"
 is used.

Close #3892
---
 src/idl_gen_cpp.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index a163ee816..1cb801356 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -179,17 +179,19 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
     maxv = !maxv || maxv->value < ev.value ? &ev : maxv;
     anyv |= ev.value;
   }
-  assert(minv && maxv);
-  if (enum_def.attributes.Lookup("bit_flags")) {
-    if (minv->value != 0) // If the user didn't defined NONE value
-      code += "  " + GenEnumVal(enum_def, "NONE", parser.opts) + " = 0,\n";
-    if (maxv->value != anyv) // If the user didn't defined ANY value
-      code += "  " + GenEnumVal(enum_def, "ANY", parser.opts) + " = " + NumToString(anyv) + "\n";
-  } else { // MIN & MAX are useless for bit_flags
-    code += "  " + GenEnumVal(enum_def, "MIN", parser.opts) + " = ";
-    code += GenEnumVal(enum_def, minv->name, parser.opts) + ",\n";
-    code += "  " + GenEnumVal(enum_def, "MAX", parser.opts) + " = ";
-    code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n";
+  if (parser.opts.scoped_enums || parser.opts.prefixed_enums) {
+    assert(minv && maxv);
+    if (enum_def.attributes.Lookup("bit_flags")) {
+      if (minv->value != 0) // If the user didn't defined NONE value
+        code += "  " + GenEnumVal(enum_def, "NONE", parser.opts) + " = 0,\n";
+      if (maxv->value != anyv) // If the user didn't defined ANY value
+        code += "  " + GenEnumVal(enum_def, "ANY", parser.opts) + " = " + NumToString(anyv) + "\n";
+    } else { // MIN & MAX are useless for bit_flags
+      code += "  " + GenEnumVal(enum_def, "MIN", parser.opts) + " = ";
+      code += GenEnumVal(enum_def, minv->name, parser.opts) + ",\n";
+      code += "  " + GenEnumVal(enum_def, "MAX", parser.opts) + " = ";
+      code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n";
+    }
   }
   code += "};\n";
   if (parser.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags"))

From b3c35750c2a40d09b6fa8982663dd10337d3b5dd Mon Sep 17 00:00:00 2001
From: Martin Ankerl <martin.ankerl@gmail.com>
Date: Wed, 1 Jun 2016 13:13:00 +0200
Subject: [PATCH 160/185] renamed functions

More descriptive name, show that it's really just a temporary object.
---
 include/flatbuffers/flatbuffers.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 07b7cadec..e94d0de70 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -1153,13 +1153,13 @@ template<typename T> const T *GetRoot(const void *buf) {
 
 /// Helpers to get a typed pointer to objects that are currently beeing built.
 /// @warning Creating new objects will lead to reallocations and invalidates the pointer!
-template<typename T> T *GetMutableObject(FlatBufferBuilder &fbb, Offset<T> offset) {
+template<typename T> T *GetMutableTemporaryPointer(FlatBufferBuilder &fbb, Offset<T> offset) {
   return reinterpret_cast<T *>(fbb.GetCurrentBufferPointer() +
     fbb.GetSize() - offset.o);
 }
 
-template<typename T> const T *GetObject(FlatBufferBuilder &fbb, Offset<T> offset) {
-  return GetMutableObject<T>(fbb, offset);
+template<typename T> const T *GetTemporaryPointer(FlatBufferBuilder &fbb, Offset<T> offset) {
+  return GetMutableTemporaryPointer<T>(fbb, offset);
 }
 
 // Helper to see if the identifier in a buffer has the expected value.

From a9194c4c686ace7455b1ae5b146544d788feaafd Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Thu, 2 Jun 2016 21:56:27 +0200
Subject: [PATCH 161/185] cpp generator : pulling all methods inside the class

---
 src/idl_gen_cpp.cpp            | 1406 ++++++++++++++++----------------
 tests/monster_test_generated.h |    4 +-
 2 files changed, 698 insertions(+), 712 deletions(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 7efa1334e..875345933 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -22,706 +22,6 @@
 #include "flatbuffers/code_generators.h"
 
 namespace flatbuffers {
-namespace cpp {
-
-// This tracks the current namespace so we can insert namespace declarations.
-// TODO(wvo): this needs to be moved into a code generator context object.
-static const Namespace *code_generator_cur_name_space = nullptr;
-
-// Ensure that a type is prefixed with its namespace whenever it is used
-// outside of its namespace.
-static std::string WrapInNameSpace(const Namespace *ns,
-                                   const std::string &name) {
-  if (code_generator_cur_name_space != ns) {
-    std::string qualified_name;
-    for (auto it = ns->components.begin();
-             it != ns->components.end(); ++it) {
-      qualified_name += *it + "::";
-    }
-    return qualified_name + name;
-  } else {
-    return name;
-  }
-}
-
-static std::string WrapInNameSpace(const Definition &def) {
-  return WrapInNameSpace(def.defined_namespace, def.name);
-}
-
-// Translates a qualified name in flatbuffer text format to the same name in
-// the equivalent C++ namespace.
-static std::string TranslateNameSpace(const std::string &qualified_name) {
-  std::string cpp_qualified_name = qualified_name;
-  size_t start_pos = 0;
-  while((start_pos = cpp_qualified_name.find(".", start_pos)) !=
-         std::string::npos) {
-    cpp_qualified_name.replace(start_pos, 1, "::");
-  }
-  return cpp_qualified_name;
-}
-
-
-// Return a C++ type from the table in idl.h
-static std::string GenTypeBasic(const Type &type, bool user_facing_type) {
-  static const char *ctypename[] = {
-    #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
-      #CTYPE,
-      FLATBUFFERS_GEN_TYPES(FLATBUFFERS_TD)
-    #undef FLATBUFFERS_TD
-  };
-  if (user_facing_type) {
-    if (type.enum_def) return WrapInNameSpace(*type.enum_def);
-    if (type.base_type == BASE_TYPE_BOOL) return "bool";
-  }
-  return ctypename[type.base_type];
-}
-
-static std::string GenTypeWire(const Parser &parser, const Type &type,
-                               const char *postfix, bool user_facing_type);
-
-// Return a C++ pointer type, specialized to the actual struct/table types,
-// and vector element types.
-static std::string GenTypePointer(const Parser &parser, const Type &type) {
-  switch (type.base_type) {
-    case BASE_TYPE_STRING:
-      return "flatbuffers::String";
-    case BASE_TYPE_VECTOR:
-      return "flatbuffers::Vector<" +
-             GenTypeWire(parser, type.VectorType(), "", false) + ">";
-    case BASE_TYPE_STRUCT: {
-      return WrapInNameSpace(*type.struct_def);
-    }
-    case BASE_TYPE_UNION:
-      // fall through
-    default:
-      return "void";
-  }
-}
-
-// Return a C++ type for any type (scalar/pointer) specifically for
-// building a flatbuffer.
-static std::string GenTypeWire(const Parser &parser, const Type &type,
-                               const char *postfix, bool user_facing_type) {
-  return IsScalar(type.base_type)
-    ? GenTypeBasic(type, user_facing_type) + postfix
-    : IsStruct(type)
-      ? "const " + GenTypePointer(parser, type) + " *"
-      : "flatbuffers::Offset<" + GenTypePointer(parser, type) + ">" + postfix;
-}
-
-// Return a C++ type for any type (scalar/pointer) that reflects its
-// serialized size.
-static std::string GenTypeSize(const Parser &parser, const Type &type) {
-  return IsScalar(type.base_type)
-    ? GenTypeBasic(type, false)
-    : IsStruct(type)
-      ? GenTypePointer(parser, type)
-      : "flatbuffers::uoffset_t";
-}
-
-// Return a C++ type for any type (scalar/pointer) specifically for
-// using a flatbuffer.
-static std::string GenTypeGet(const Parser &parser, const Type &type,
-                              const char *afterbasic, const char *beforeptr,
-                              const char *afterptr, bool user_facing_type) {
-  return IsScalar(type.base_type)
-    ? GenTypeBasic(type, user_facing_type) + afterbasic
-    : beforeptr + GenTypePointer(parser, type) + afterptr;
-}
-
-static std::string GenEnumDecl(const EnumDef &enum_def,
-                               const IDLOptions &opts) {
-  return (opts.scoped_enums ? "enum class " : "enum ") + enum_def.name;
-}
-
-static std::string GenEnumVal(const EnumDef &enum_def,
-                              const std::string &enum_val,
-                              const IDLOptions &opts) {
-  return opts.prefixed_enums ? enum_def.name + "_" + enum_val : enum_val;
-}
-
-static std::string GetEnumVal(const EnumDef &enum_def, const EnumVal &enum_val,
-                              const IDLOptions &opts) {
-  if (opts.scoped_enums) {
-      return enum_def.name + "::" + enum_val.name;
-  } else if (opts.prefixed_enums) {
-      return enum_def.name + "_" + enum_val.name;
-  } else {
-      return enum_val.name;
-  }
-}
-
-std::string EnumSignature(EnumDef &enum_def) {
-  return "inline bool Verify" + enum_def.name +
-         "(flatbuffers::Verifier &verifier, " +
-         "const void *union_obj, " + enum_def.name + " type)";
-}
-
-// Generate an enum declaration and an enum string lookup table.
-static void GenEnum(const Parser &parser, EnumDef &enum_def,
-                    std::string *code_ptr) {
-  std::string &code = *code_ptr;
-  GenComment(enum_def.doc_comment, code_ptr, nullptr);
-  code += GenEnumDecl(enum_def, parser.opts);
-  if (parser.opts.scoped_enums)
-    code += " : " + GenTypeBasic(enum_def.underlying_type, false);
-  code += " {\n";
-  int64_t anyv = 0;
-  EnumVal *minv = nullptr, *maxv = nullptr;
-  for (auto it = enum_def.vals.vec.begin();
-       it != enum_def.vals.vec.end();
-       ++it) {
-    auto &ev = **it;
-    GenComment(ev.doc_comment, code_ptr, nullptr, "  ");
-    code += "  " + GenEnumVal(enum_def, ev.name, parser.opts) + " = ";
-    code += NumToString(ev.value) + ",\n";
-    minv = !minv || minv->value > ev.value ? &ev : minv;
-    maxv = !maxv || maxv->value < ev.value ? &ev : maxv;
-    anyv |= ev.value;
-  }
-  if (parser.opts.scoped_enums || parser.opts.prefixed_enums) {
-    assert(minv && maxv);
-    if (enum_def.attributes.Lookup("bit_flags")) {
-      if (minv->value != 0) // If the user didn't defined NONE value
-        code += "  " + GenEnumVal(enum_def, "NONE", parser.opts) + " = 0,\n";
-      if (maxv->value != anyv) // If the user didn't defined ANY value
-        code += "  " + GenEnumVal(enum_def, "ANY", parser.opts) + " = " + NumToString(anyv) + "\n";
-    } else { // MIN & MAX are useless for bit_flags
-      code += "  " + GenEnumVal(enum_def, "MIN", parser.opts) + " = ";
-      code += GenEnumVal(enum_def, minv->name, parser.opts) + ",\n";
-      code += "  " + GenEnumVal(enum_def, "MAX", parser.opts) + " = ";
-      code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n";
-    }
-  }
-  code += "};\n";
-  if (parser.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags"))
-    code += "DEFINE_BITMASK_OPERATORS(" + enum_def.name + ", " +  GenTypeBasic(enum_def.underlying_type, false) + ")\n";
-  code += "\n";
-
-  // Generate a generate string table for enum values.
-  // Problem is, if values are very sparse that could generate really big
-  // tables. Ideally in that case we generate a map lookup instead, but for
-  // the moment we simply don't output a table at all.
-  auto range = enum_def.vals.vec.back()->value -
-               enum_def.vals.vec.front()->value + 1;
-  // 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) {
-    code += "inline const char **EnumNames" + enum_def.name + "() {\n";
-    code += "  static const char *names[] = { ";
-    auto val = enum_def.vals.vec.front()->value;
-    for (auto it = enum_def.vals.vec.begin();
-         it != enum_def.vals.vec.end();
-         ++it) {
-      while (val++ != (*it)->value) code += "\"\", ";
-      code += "\"" + (*it)->name + "\", ";
-    }
-    code += "nullptr };\n  return names;\n}\n\n";
-    code += "inline const char *EnumName" + enum_def.name;
-    code += "(" + enum_def.name + " e) { return EnumNames" + enum_def.name;
-    code += "()[static_cast<int>(e)";
-    if (enum_def.vals.vec.front()->value) {
-      code += " - static_cast<int>(";
-      code += GetEnumVal(enum_def, *enum_def.vals.vec.front(), parser.opts) +")";
-    }
-    code += "]; }\n\n";
-  }
-
-  if (enum_def.is_union) {
-    code += EnumSignature(enum_def) + ";\n\n";
-  }
-}
-
-static void GenEnumPost(const Parser &parser, EnumDef &enum_def,
-                    std::string *code_ptr_post) {
-  // Generate a verifier function for this union that can be called by the
-  // table verifier functions. It uses a switch case to select a specific
-  // verifier function to call, this should be safe even if the union type
-  // has been corrupted, since the verifiers will simply fail when called
-  // on the wrong type.
-  std::string &code_post = *code_ptr_post;
-  code_post += EnumSignature(enum_def) + " {\n  switch (type) {\n";
-  for (auto it = enum_def.vals.vec.begin();
-       it != enum_def.vals.vec.end();
-       ++it) {
-    auto &ev = **it;
-    code_post += "    case " + GetEnumVal(enum_def, ev, parser.opts);
-    if (!ev.value) {
-      code_post += ": return true;\n";  // "NONE" enum value.
-    } else {
-      code_post += ": return verifier.VerifyTable(reinterpret_cast<const ";
-      code_post += WrapInNameSpace(*ev.struct_def);
-      code_post += " *>(union_obj));\n";
-    }
-  }
-  code_post += "    default: return false;\n  }\n}\n\n";
-}
-
-// Generates a value with optionally a cast applied if the field has a
-// different underlying type from its interface type (currently only the
-// case for enums. "from" specify the direction, true meaning from the
-// underlying type to the interface type.
-std::string GenUnderlyingCast(const FieldDef &field, bool from,
-                              const std::string &val) {
-  if (from && field.value.type.base_type == BASE_TYPE_BOOL) {
-    return val + " != 0";
-  } else if ((field.value.type.enum_def &&
-              IsScalar(field.value.type.base_type)) ||
-             field.value.type.base_type == BASE_TYPE_BOOL) {
-    return "static_cast<" + GenTypeBasic(field.value.type, from) +
-           ">(" + val + ")";
-  } else {
-    return val;
-  }
-}
-
-std::string GenFieldOffsetName(const FieldDef &field) {
-  std::string uname = field.name;
-  std::transform(uname.begin(), uname.end(), uname.begin(), ::toupper);
-  return "VT_" + uname;
-}
-
-static void GenFullyQualifiedNameGetter(const Parser &parser, const std::string& name, std::string &code) {
-  if (parser.opts.generate_name_strings) {
-    code += "  static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() {\n";
-    code += "    return \"" + parser.namespaces_.back()->GetFullyQualifiedName(name) + "\";\n";
-    code += "  }\n";
-  }
-}
-
-std::string GenDefaultConstant(const FieldDef &field) {
-  return field.value.type.base_type == BASE_TYPE_FLOAT
-      ? field.value.constant + "f"
-      : field.value.constant;
-}
-
-// Generate an accessor struct, builder structs & function for a table.
-static void GenTable(const Parser &parser, StructDef &struct_def,
-                     std::string *code_ptr) {
-  std::string &code = *code_ptr;
-  // Generate an accessor struct, with methods of the form:
-  // type name() const { return GetField<type>(offset, defaultval); }
-  GenComment(struct_def.doc_comment, code_ptr, nullptr);
-  code += "struct " + struct_def.name;
-  code += " FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table";
-  code += " {\n";
-  // Generate GetFullyQualifiedName
-  GenFullyQualifiedNameGetter(parser, struct_def.name, code);
-  // Generate field id constants.
-  if (struct_def.fields.vec.size() > 0) {
-    code += "  enum {\n";
-    bool is_first_field = true; // track the first field that's not deprecated
-    for (auto it = struct_def.fields.vec.begin();
-         it != struct_def.fields.vec.end();
-         ++it) {
-      auto &field = **it;
-      if (!field.deprecated) {  // Deprecated fields won't be accessible.
-        if (!is_first_field) {
-          // Add trailing comma and newline to previous element. Don't add trailing comma to
-          // last element since older versions of gcc complain about this.
-          code += ",\n";
-        } else {
-          is_first_field = false;
-        }
-        code += "    " + GenFieldOffsetName(field) + " = ";
-        code += NumToString(field.value.offset);
-      }
-    }
-    code += "\n  };\n";
-  }
-  // Generate the accessors.
-  for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
-       ++it) {
-    auto &field = **it;
-    if (!field.deprecated) {  // Deprecated fields won't be accessible.
-      auto is_scalar = IsScalar(field.value.type.base_type);
-      GenComment(field.doc_comment, code_ptr, nullptr, "  ");
-      code += "  " + GenTypeGet(parser, field.value.type, " ", "const ", " *",
-                                true);
-      code += field.name + "() const { return ";
-      // Call a different accessor for pointers, that indirects.
-      auto accessor = is_scalar
-        ? "GetField<"
-        : (IsStruct(field.value.type) ? "GetStruct<" : "GetPointer<");
-      auto offsetstr = GenFieldOffsetName(field);
-      auto call =
-          accessor +
-          GenTypeGet(parser, field.value.type, "", "const ", " *", false) +
-          ">(" + offsetstr;
-      // Default value as second arg for non-pointer types.
-      if (IsScalar(field.value.type.base_type))
-        call += ", " + GenDefaultConstant(field);
-      call += ")";
-      code += GenUnderlyingCast(field, true, call);
-      code += "; }\n";
-      if (parser.opts.mutable_buffer) {
-        if (is_scalar) {
-          code += "  bool mutate_" + field.name + "(";
-          code += GenTypeBasic(field.value.type, true);
-          code += " _" + field.name + ") { return SetField(" + offsetstr + ", ";
-          code += GenUnderlyingCast(field, false, "_" + field.name);
-          code += "); }\n";
-        } else {
-          auto type = GenTypeGet(parser, field.value.type, " ", "", " *", true);
-          code += "  " + type + "mutable_" + field.name + "() { return ";
-          code += GenUnderlyingCast(field, true,
-                                    accessor + type + ">(" + offsetstr + ")");
-          code += "; }\n";
-        }
-      }
-      auto nested = field.attributes.Lookup("nested_flatbuffer");
-      if (nested) {
-        std::string qualified_name =
-            parser.namespaces_.back()->GetFullyQualifiedName(nested->constant);
-        auto nested_root = parser.structs_.Lookup(qualified_name);
-        assert(nested_root);  // Guaranteed to exist by parser.
-        (void)nested_root;
-        std::string cpp_qualified_name = TranslateNameSpace(qualified_name);
-
-        code += "  const " + cpp_qualified_name + " *" + field.name;
-        code += "_nested_root() const { return flatbuffers::GetRoot<";
-        code += cpp_qualified_name + ">(" + field.name + "()->Data()); }\n";
-      }
-      // Generate a comparison function for this field if it is a key.
-      if (field.key) {
-        code += "  bool KeyCompareLessThan(const " + struct_def.name;
-        code += " *o) const { return ";
-        if (field.value.type.base_type == BASE_TYPE_STRING) code += "*";
-        code += field.name + "() < ";
-        if (field.value.type.base_type == BASE_TYPE_STRING) code += "*";
-        code += "o->" + field.name + "(); }\n";
-        code += "  int KeyCompareWithValue(";
-        if (field.value.type.base_type == BASE_TYPE_STRING) {
-          code += "const char *val) const { return strcmp(" + field.name;
-          code += "()->c_str(), val); }\n";
-        } else {
-          if (parser.opts.scoped_enums &&
-            field.value.type.enum_def &&
-            IsScalar(field.value.type.base_type)) {
-            code += GenTypeGet(parser, field.value.type, " ", "const ", " *",
-                               true);
-          } else {
-            code += GenTypeBasic(field.value.type, false);
-          }
-          code += " val) const { return " + field.name + "() < val ? -1 : ";
-          code += field.name + "() > val; }\n";
-        }
-      }
-    }
-  }
-  // Generate a verifier function that can check a buffer from an untrusted
-  // source will never cause reads outside the buffer.
-  code += "  bool Verify(flatbuffers::Verifier &verifier) const {\n";
-  code += "    return VerifyTableStart(verifier)";
-  std::string prefix = " &&\n           ";
-  for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
-       ++it) {
-    auto &field = **it;
-    if (!field.deprecated) {
-      code += prefix + "VerifyField";
-      if (field.required) code += "Required";
-      code += "<" + GenTypeSize(parser, field.value.type);
-      code += ">(verifier, " + GenFieldOffsetName(field) + ")";
-      switch (field.value.type.base_type) {
-        case BASE_TYPE_UNION:
-          code += prefix + "Verify" + field.value.type.enum_def->name;
-          code += "(verifier, " + field.name + "(), " + field.name + "_type())";
-          break;
-        case BASE_TYPE_STRUCT:
-          if (!field.value.type.struct_def->fixed) {
-            code += prefix + "verifier.VerifyTable(" + field.name;
-            code += "())";
-          }
-          break;
-        case BASE_TYPE_STRING:
-          code += prefix + "verifier.Verify(" + field.name + "())";
-          break;
-        case BASE_TYPE_VECTOR:
-          code += prefix + "verifier.Verify(" + field.name + "())";
-          switch (field.value.type.element) {
-            case BASE_TYPE_STRING: {
-              code += prefix + "verifier.VerifyVectorOfStrings(" + field.name;
-              code += "())";
-              break;
-            }
-            case BASE_TYPE_STRUCT: {
-              if (!field.value.type.struct_def->fixed) {
-                code += prefix + "verifier.VerifyVectorOfTables(" + field.name;
-                code += "())";
-              }
-              break;
-            }
-            default:
-              break;
-          }
-          break;
-        default:
-          break;
-      }
-    }
-  }
-  code += prefix + "verifier.EndTable()";
-  code += ";\n  }\n";
-  code += "};\n\n";
-
-  // Generate a builder struct, with methods of the form:
-  // void add_name(type name) { fbb_.AddElement<type>(offset, name, default); }
-  code += "struct " + struct_def.name;
-  code += "Builder {\n  flatbuffers::FlatBufferBuilder &fbb_;\n";
-  code += "  flatbuffers::uoffset_t start_;\n";
-  for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
-       ++it) {
-    auto &field = **it;
-    if (!field.deprecated) {
-      code += "  void add_" + field.name + "(";
-      code += GenTypeWire(parser, field.value.type, " ", true) + field.name;
-      code += ") { fbb_.Add";
-      if (IsScalar(field.value.type.base_type)) {
-        code += "Element<" + GenTypeWire(parser, field.value.type, "", false);
-        code += ">";
-      } else if (IsStruct(field.value.type)) {
-        code += "Struct";
-      } else {
-        code += "Offset";
-      }
-      code += "(" + struct_def.name + "::" + GenFieldOffsetName(field) + ", ";
-      code += GenUnderlyingCast(field, false, field.name);
-      if (IsScalar(field.value.type.base_type))
-        code += ", " + GenDefaultConstant(field);
-      code += "); }\n";
-    }
-  }
-  code += "  " + struct_def.name;
-  code += "Builder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) ";
-  code += "{ start_ = fbb_.StartTable(); }\n";
-  code += "  " + struct_def.name + "Builder &operator=(const ";
-  code += struct_def.name + "Builder &);\n";
-  code += "  flatbuffers::Offset<" + struct_def.name;
-  code += "> Finish() {\n    auto o = flatbuffers::Offset<" + struct_def.name;
-  code += ">(fbb_.EndTable(start_, ";
-  code += NumToString(struct_def.fields.vec.size()) + "));\n";
-  for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
-       ++it) {
-    auto &field = **it;
-    if (!field.deprecated && field.required) {
-      code += "    fbb_.Required(o, ";
-      code += struct_def.name + "::" + GenFieldOffsetName(field);
-      code += ");  // " + field.name + "\n";
-    }
-  }
-  code += "    return o;\n  }\n};\n\n";
-
-  // Generate a convenient CreateX function that uses the above builder
-  // to create a table in one go.
-  code += "inline flatbuffers::Offset<" + struct_def.name + "> Create";
-  code += struct_def.name;
-  code += "(flatbuffers::FlatBufferBuilder &_fbb";
-  for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
-       ++it) {
-    auto &field = **it;
-    if (!field.deprecated) {
-      code += ",\n   " + GenTypeWire(parser, field.value.type, " ", true);
-      code += field.name + " = ";
-      if (field.value.type.enum_def && IsScalar(field.value.type.base_type)) {
-        auto ev = field.value.type.enum_def->ReverseLookup(
-           static_cast<int>(StringToInt(field.value.constant.c_str())), false);
-        if (ev) {
-          code += WrapInNameSpace(field.value.type.enum_def->defined_namespace,
-                                  GetEnumVal(*field.value.type.enum_def, *ev,
-                                             parser.opts));
-        } else {
-          code += GenUnderlyingCast(field, true, field.value.constant);
-        }
-      } else if (field.value.type.base_type == BASE_TYPE_BOOL) {
-        code += field.value.constant == "0" ? "false" : "true";
-      } else {
-        code += GenDefaultConstant(field);
-      }
-    }
-  }
-  code += ") {\n  " + struct_def.name + "Builder builder_(_fbb);\n";
-  for (size_t size = struct_def.sortbysize ? sizeof(largest_scalar_t) : 1;
-       size;
-       size /= 2) {
-    for (auto it = struct_def.fields.vec.rbegin();
-         it != struct_def.fields.vec.rend();
-         ++it) {
-      auto &field = **it;
-      if (!field.deprecated &&
-          (!struct_def.sortbysize ||
-           size == SizeOf(field.value.type.base_type))) {
-        code += "  builder_.add_" + field.name + "(" + field.name + ");\n";
-      }
-    }
-  }
-  code += "  return builder_.Finish();\n}\n\n";
-}
-
-static void GenPadding(const FieldDef &field, std::string &code,
-                       int &padding_id,
-                       const std::function<void (int bits, std::string &code,
-                                                 int &padding_id)> &f) {
-  if (field.padding) {
-    for (int i = 0; i < 4; i++)
-      if (static_cast<int>(field.padding) & (1 << i))
-        f((1 << i) * 8, code, padding_id);
-    assert(!(field.padding & ~0xF));
-  }
-}
-
-static void PaddingDefinition(int bits, std::string &code, int &padding_id) {
-  code += "  int" + NumToString(bits) +
-          "_t __padding" + NumToString(padding_id++) + ";\n";
-}
-
-static void PaddingDeclaration(int bits, std::string &code, int &padding_id) {
-  (void)bits;
-  code += " (void)__padding" + NumToString(padding_id++) + ";";
-}
-
-static void PaddingInitializer(int bits, std::string &code, int &padding_id) {
-  (void)bits;
-  code += ", __padding" + NumToString(padding_id++) + "(0)";
-}
-
-// Generate an accessor struct with constructor for a flatbuffers struct.
-static void GenStruct(const Parser &parser, StructDef &struct_def,
-                      std::string *code_ptr) {
-  if (struct_def.generated) return;
-  std::string &code = *code_ptr;
-
-  // Generate an accessor struct, with private variables of the form:
-  // type name_;
-  // Generates manual padding and alignment.
-  // Variables are private because they contain little endian data on all
-  // platforms.
-  GenComment(struct_def.doc_comment, code_ptr, nullptr);
-  code += "MANUALLY_ALIGNED_STRUCT(" + NumToString(struct_def.minalign) + ") ";
-  code += struct_def.name + " FLATBUFFERS_FINAL_CLASS {\n private:\n";
-  int padding_id = 0;
-  for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
-       ++it) {
-    auto &field = **it;
-    code += "  " + GenTypeGet(parser, field.value.type, " ", "", " ", false);
-    code += field.name + "_;\n";
-    GenPadding(field, code, padding_id, PaddingDefinition);
-  }
-
-  // Generate GetFullyQualifiedName
-  code += "\n public:\n";
-  GenFullyQualifiedNameGetter(parser, struct_def.name, code);
-
-  // Generate a constructor that takes all fields as arguments.
-  code += "  " + struct_def.name + "(";
-  for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
-       ++it) {
-    auto &field = **it;
-    if (it != struct_def.fields.vec.begin()) code += ", ";
-    code += GenTypeGet(parser, field.value.type, " ", "const ", " &", true);
-    code += "_" + field.name;
-  }
-  code += ")\n    : ";
-  padding_id = 0;
-  for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
-       ++it) {
-    auto &field = **it;
-    if (it != struct_def.fields.vec.begin()) code += ", ";
-    code += field.name + "_(";
-    if (IsScalar(field.value.type.base_type)) {
-      code += "flatbuffers::EndianScalar(";
-      code += GenUnderlyingCast(field, false, "_" + field.name);
-      code += "))";
-    } else {
-      code += "_" + field.name + ")";
-    }
-    GenPadding(field, code, padding_id, PaddingInitializer);
-  }
-
-  code += " {";
-  padding_id = 0;
-  for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
-       ++it) {
-    auto &field = **it;
-    GenPadding(field, code, padding_id, PaddingDeclaration);
-  }
-  code += " }\n\n";
-
-  // Generate accessor methods of the form:
-  // type name() const { return flatbuffers::EndianScalar(name_); }
-  for (auto it = struct_def.fields.vec.begin();
-       it != struct_def.fields.vec.end();
-       ++it) {
-    auto &field = **it;
-    GenComment(field.doc_comment, code_ptr, nullptr, "  ");
-    auto is_scalar = IsScalar(field.value.type.base_type);
-    code += "  " + GenTypeGet(parser, field.value.type, " ", "const ", " &",
-                              true);
-    code += field.name + "() const { return ";
-    code += GenUnderlyingCast(field, true,
-      is_scalar
-        ? "flatbuffers::EndianScalar(" + field.name + "_)"
-        : field.name + "_");
-    code += "; }\n";
-    if (parser.opts.mutable_buffer) {
-      if (is_scalar) {
-        code += "  void mutate_" + field.name + "(";
-        code += GenTypeBasic(field.value.type, true);
-        code += " _" + field.name + ") { flatbuffers::WriteScalar(&";
-        code += field.name + "_, ";
-        code += GenUnderlyingCast(field, false, "_" + field.name);
-        code += "); }\n";
-      } else {
-        code += "  ";
-        code += GenTypeGet(parser, field.value.type, "", "", " &", true);
-        code += "mutable_" + field.name + "() { return " + field.name;
-        code += "_; }\n";
-      }
-    }
-  }
-  code += "};\nSTRUCT_END(" + struct_def.name + ", ";
-  code += NumToString(struct_def.bytesize) + ");\n\n";
-}
-
-void GenerateNestedNameSpaces(const Namespace *ns, std::string *code_ptr) {
-  for (auto it = ns->components.begin(); it != ns->components.end(); ++it) {
-    *code_ptr += "namespace " + *it + " {\n";
-  }
-}
-
-void CloseNestedNameSpaces(const Namespace *ns, std::string *code_ptr) {
-  for (auto it = ns->components.rbegin(); it != ns->components.rend(); ++it) {
-    *code_ptr += "}  // namespace " + *it + "\n";
-  }
-}
-
-void CheckNameSpace(const Definition &def, std::string *code_ptr) {
-  // Set up the correct namespace. Only open a namespace if
-  // the existing one is different.
-  // TODO: this could be done more intelligently, by sorting to
-  // namespace path and only opening/closing what is necessary, but that's
-  // quite a bit more complexity.
-  if (code_generator_cur_name_space != def.defined_namespace) {
-    if (code_generator_cur_name_space) {
-      CloseNestedNameSpaces(code_generator_cur_name_space, code_ptr);
-      if (code_generator_cur_name_space->components.size()) *code_ptr += "\n";
-    }
-    GenerateNestedNameSpaces(def.defined_namespace, code_ptr);
-    code_generator_cur_name_space = def.defined_namespace;
-    if (code_generator_cur_name_space->components.size()) *code_ptr += "\n";
-  }
-}
-
-}  // namespace cpp
 
 struct IsAlnum {
   bool operator()(char c) {
@@ -790,8 +90,8 @@ class CppGenerator : public BaseGenerator {
 
     // Generate forward declarations for all structs/tables, since they may
     // have circular references.
-    for (auto it = parser_.structs_.vec.begin(); it != parser_.structs_.vec.end();
-         ++it) {
+    for (auto it = parser_.structs_.vec.begin();
+         it != parser_.structs_.vec.end(); ++it) {
       auto &struct_def = **it;
       if (!struct_def.generated) {
         CheckNameSpace(struct_def, &code);
@@ -805,25 +105,25 @@ class CppGenerator : public BaseGenerator {
       auto &enum_def = **it;
       if (!enum_def.generated) {
         CheckNameSpace(**it, &code);
-        GenEnum(parser_, **it, &code);
+        GenEnum(**it, &code);
       }
     }
 
     // Generate code for all structs, then all tables.
-    for (auto it = parser_.structs_.vec.begin(); it != parser_.structs_.vec.end();
-         ++it) {
+    for (auto it = parser_.structs_.vec.begin();
+         it != parser_.structs_.vec.end(); ++it) {
       auto &struct_def = **it;
       if (struct_def.fixed && !struct_def.generated) {
         CheckNameSpace(struct_def, &code);
-        GenStruct(parser_, struct_def, &code);
+        GenStruct(struct_def, &code);
       }
     }
-    for (auto it = parser_.structs_.vec.begin(); it != parser_.structs_.vec.end();
-         ++it) {
+    for (auto it = parser_.structs_.vec.begin();
+         it != parser_.structs_.vec.end(); ++it) {
       auto &struct_def = **it;
       if (!struct_def.fixed && !struct_def.generated) {
         CheckNameSpace(struct_def, &code);
-        GenTable(parser_, struct_def, &code);
+        GenTable(struct_def, &code);
       }
     }
 
@@ -833,7 +133,7 @@ class CppGenerator : public BaseGenerator {
       auto &enum_def = **it;
       if (enum_def.is_union && !enum_def.generated) {
         CheckNameSpace(enum_def, &code);
-        GenEnumPost(parser_, enum_def, &code);
+        GenEnumPost(enum_def, &code);
       }
     }
 
@@ -905,6 +205,692 @@ class CppGenerator : public BaseGenerator {
 
     return SaveFile(GeneratedFileName(path_, file_name_).c_str(), code, false);
   }
+
+ private:
+  // This tracks the current namespace so we can insert namespace declarations.
+  const Namespace *code_generator_cur_name_space = nullptr;
+
+  // Ensure that a type is prefixed with its namespace whenever it is used
+  // outside of its namespace.
+  std::string WrapInNameSpace(const Namespace *ns, const std::string &name) {
+    if (code_generator_cur_name_space != ns) {
+      std::string qualified_name;
+      for (auto it = ns->components.begin(); it != ns->components.end(); ++it) {
+        qualified_name += *it + "::";
+      }
+      return qualified_name + name;
+    } else {
+      return name;
+    }
+  }
+
+  std::string WrapInNameSpace(const Definition &def) {
+    return WrapInNameSpace(def.defined_namespace, def.name);
+  }
+
+  // Translates a qualified name in flatbuffer text format to the same name in
+  // the equivalent C++ namespace.
+  static std::string TranslateNameSpace(const std::string &qualified_name) {
+    std::string cpp_qualified_name = qualified_name;
+    size_t start_pos = 0;
+    while ((start_pos = cpp_qualified_name.find(".", start_pos)) !=
+           std::string::npos) {
+      cpp_qualified_name.replace(start_pos, 1, "::");
+    }
+    return cpp_qualified_name;
+  }
+
+  // Return a C++ type from the table in idl.h
+  std::string GenTypeBasic(const Type &type, bool user_facing_type) {
+    static const char *ctypename[] = {
+#define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) #CTYPE,
+        FLATBUFFERS_GEN_TYPES(FLATBUFFERS_TD)
+#undef FLATBUFFERS_TD
+    };
+    if (user_facing_type) {
+      if (type.enum_def) return WrapInNameSpace(*type.enum_def);
+      if (type.base_type == BASE_TYPE_BOOL) return "bool";
+    }
+    return ctypename[type.base_type];
+  }
+
+  // Return a C++ pointer type, specialized to the actual struct/table types,
+  // and vector element types.
+  std::string GenTypePointer(const Type &type) {
+    switch (type.base_type) {
+      case BASE_TYPE_STRING:
+        return "flatbuffers::String";
+      case BASE_TYPE_VECTOR:
+        return "flatbuffers::Vector<" +
+               GenTypeWire(type.VectorType(), "", false) + ">";
+      case BASE_TYPE_STRUCT: {
+        return WrapInNameSpace(*type.struct_def);
+      }
+      case BASE_TYPE_UNION:
+      // fall through
+      default:
+        return "void";
+    }
+  }
+
+  // Return a C++ type for any type (scalar/pointer) specifically for
+  // building a flatbuffer.
+  std::string GenTypeWire(const Type &type,
+                          const char *postfix, bool user_facing_type) {
+    return IsScalar(type.base_type)
+               ? GenTypeBasic(type, user_facing_type) + postfix
+               : IsStruct(type)
+                     ? "const " + GenTypePointer(type) + " *"
+                     : "flatbuffers::Offset<" + GenTypePointer(type) +
+                           ">" + postfix;
+  }
+
+  // Return a C++ type for any type (scalar/pointer) that reflects its
+  // serialized size.
+  std::string GenTypeSize(const Type &type) {
+    return IsScalar(type.base_type)
+               ? GenTypeBasic(type, false)
+               : IsStruct(type) ? GenTypePointer(type)
+                                : "flatbuffers::uoffset_t";
+  }
+
+  // Return a C++ type for any type (scalar/pointer) specifically for
+  // using a flatbuffer.
+  std::string GenTypeGet(const Type &type,
+                         const char *afterbasic, const char *beforeptr,
+                         const char *afterptr, bool user_facing_type) {
+    return IsScalar(type.base_type)
+               ? GenTypeBasic(type, user_facing_type) + afterbasic
+               : beforeptr + GenTypePointer(type) + afterptr;
+  }
+
+  static std::string GenEnumDecl(const EnumDef &enum_def,
+                                 const IDLOptions &opts) {
+    return (opts.scoped_enums ? "enum class " : "enum ") + enum_def.name;
+  }
+
+  static std::string GenEnumVal(const EnumDef &enum_def,
+                                const std::string &enum_val,
+                                const IDLOptions &opts) {
+    return opts.prefixed_enums ? enum_def.name + "_" + enum_val : enum_val;
+  }
+
+  static std::string GetEnumVal(const EnumDef &enum_def,
+                                const EnumVal &enum_val,
+                                const IDLOptions &opts) {
+    if (opts.scoped_enums) {
+      return enum_def.name + "::" + enum_val.name;
+    } else if (opts.prefixed_enums) {
+      return enum_def.name + "_" + enum_val.name;
+    } else {
+      return enum_val.name;
+    }
+  }
+
+  std::string EnumSignature(EnumDef &enum_def) {
+    return "inline bool Verify" + enum_def.name +
+           "(flatbuffers::Verifier &verifier, " + "const void *union_obj, " +
+           enum_def.name + " type)";
+  }
+
+  // Generate an enum declaration and an enum string lookup table.
+  void GenEnum(EnumDef &enum_def, std::string *code_ptr) {
+    std::string &code = *code_ptr;
+    GenComment(enum_def.doc_comment, code_ptr, nullptr);
+    code += GenEnumDecl(enum_def, parser_.opts);
+    if (parser_.opts.scoped_enums)
+      code += " : " + GenTypeBasic(enum_def.underlying_type, false);
+    code += " {\n";
+    int64_t anyv = 0;
+    EnumVal *minv = nullptr, *maxv = nullptr;
+    for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
+         ++it) {
+      auto &ev = **it;
+      GenComment(ev.doc_comment, code_ptr, nullptr, "  ");
+      code += "  " + GenEnumVal(enum_def, ev.name, parser_.opts) + " = ";
+      code += NumToString(ev.value) + ",\n";
+      minv = !minv || minv->value > ev.value ? &ev : minv;
+      maxv = !maxv || maxv->value < ev.value ? &ev : maxv;
+      anyv |= ev.value;
+    }
+    if (parser_.opts.scoped_enums || parser_.opts.prefixed_enums) {
+      assert(minv && maxv);
+      if (enum_def.attributes.Lookup("bit_flags")) {
+        if (minv->value != 0)  // If the user didn't defined NONE value
+          code += "  " + GenEnumVal(enum_def, "NONE", parser_.opts) + " = 0,\n";
+        if (maxv->value != anyv)  // If the user didn't defined ANY value
+          code += "  " + GenEnumVal(enum_def, "ANY", parser_.opts) + " = " +
+                  NumToString(anyv) + "\n";
+      } else {  // MIN & MAX are useless for bit_flags
+        code += "  " + GenEnumVal(enum_def, "MIN", parser_.opts) + " = ";
+        code += GenEnumVal(enum_def, minv->name, parser_.opts) + ",\n";
+        code += "  " + GenEnumVal(enum_def, "MAX", parser_.opts) + " = ";
+        code += GenEnumVal(enum_def, maxv->name, parser_.opts) + "\n";
+      }
+    }
+    code += "};\n";
+    if (parser_.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags"))
+      code += "DEFINE_BITMASK_OPERATORS(" + enum_def.name + ", " +
+              GenTypeBasic(enum_def.underlying_type, false) + ")\n";
+    code += "\n";
+
+    // Generate a generate string table for enum values.
+    // Problem is, if values are very sparse that could generate really big
+    // tables. Ideally in that case we generate a map lookup instead, but for
+    // the moment we simply don't output a table at all.
+    auto range =
+        enum_def.vals.vec.back()->value - enum_def.vals.vec.front()->value + 1;
+    // 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) {
+      code += "inline const char **EnumNames" + enum_def.name + "() {\n";
+      code += "  static const char *names[] = { ";
+      auto val = enum_def.vals.vec.front()->value;
+      for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
+           ++it) {
+        while (val++ != (*it)->value) code += "\"\", ";
+        code += "\"" + (*it)->name + "\", ";
+      }
+      code += "nullptr };\n  return names;\n}\n\n";
+      code += "inline const char *EnumName" + enum_def.name;
+      code += "(" + enum_def.name + " e) { return EnumNames" + enum_def.name;
+      code += "()[static_cast<int>(e)";
+      if (enum_def.vals.vec.front()->value) {
+        code += " - static_cast<int>(";
+        code +=
+            GetEnumVal(enum_def, *enum_def.vals.vec.front(), parser_.opts) + ")";
+      }
+      code += "]; }\n\n";
+    }
+
+    if (enum_def.is_union) {
+      code += EnumSignature(enum_def) + ";\n\n";
+    }
+  }
+
+  void GenEnumPost(EnumDef &enum_def, std::string *code_ptr_post) {
+    // Generate a verifier function for this union that can be called by the
+    // table verifier functions. It uses a switch case to select a specific
+    // verifier function to call, this should be safe even if the union type
+    // has been corrupted, since the verifiers will simply fail when called
+    // on the wrong type.
+    std::string &code_post = *code_ptr_post;
+    code_post += EnumSignature(enum_def) + " {\n  switch (type) {\n";
+    for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
+         ++it) {
+      auto &ev = **it;
+      code_post += "    case " + GetEnumVal(enum_def, ev, parser_.opts);
+      if (!ev.value) {
+        code_post += ": return true;\n";  // "NONE" enum value.
+      } else {
+        code_post += ": return verifier.VerifyTable(reinterpret_cast<const ";
+        code_post += WrapInNameSpace(*ev.struct_def);
+        code_post += " *>(union_obj));\n";
+      }
+    }
+    code_post += "    default: return false;\n  }\n}\n\n";
+  }
+
+  // Generates a value with optionally a cast applied if the field has a
+  // different underlying type from its interface type (currently only the
+  // case for enums. "from" specify the direction, true meaning from the
+  // underlying type to the interface type.
+  std::string GenUnderlyingCast(const FieldDef &field, bool from,
+                                const std::string &val) {
+    if (from && field.value.type.base_type == BASE_TYPE_BOOL) {
+      return val + " != 0";
+    } else if ((field.value.type.enum_def &&
+                IsScalar(field.value.type.base_type)) ||
+               field.value.type.base_type == BASE_TYPE_BOOL) {
+      return "static_cast<" + GenTypeBasic(field.value.type, from) + ">(" +
+             val + ")";
+    } else {
+      return val;
+    }
+  }
+
+  std::string GenFieldOffsetName(const FieldDef &field) {
+    std::string uname = field.name;
+    std::transform(uname.begin(), uname.end(), uname.begin(), ::toupper);
+    return "VT_" + uname;
+  }
+
+  void GenFullyQualifiedNameGetter(const std::string &name,
+                                          std::string &code) {
+    if (parser_.opts.generate_name_strings) {
+      code +=
+          "  static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() "
+          "{\n";
+      code += "    return \"" +
+              parser_.namespaces_.back()->GetFullyQualifiedName(name) + "\";\n";
+      code += "  }\n";
+    }
+  }
+
+  std::string GenDefaultConstant(const FieldDef &field) {
+    return field.value.type.base_type == BASE_TYPE_FLOAT
+               ? field.value.constant + "f"
+               : field.value.constant;
+  }
+
+  // Generate an accessor struct, builder structs & function for a table.
+  void GenTable(StructDef &struct_def, std::string *code_ptr) {
+    std::string &code = *code_ptr;
+    // Generate an accessor struct, with methods of the form:
+    // type name() const { return GetField<type>(offset, defaultval); }
+    GenComment(struct_def.doc_comment, code_ptr, nullptr);
+    code += "struct " + struct_def.name;
+    code += " FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table";
+    code += " {\n";
+    // Generate GetFullyQualifiedName
+    GenFullyQualifiedNameGetter(struct_def.name, code);
+    // Generate field id constants.
+    if (struct_def.fields.vec.size() > 0) {
+      code += "  enum {\n";
+      bool is_first_field =
+          true;  // track the first field that's not deprecated
+      for (auto it = struct_def.fields.vec.begin();
+           it != struct_def.fields.vec.end(); ++it) {
+        auto &field = **it;
+        if (!field.deprecated) {  // Deprecated fields won't be accessible.
+          if (!is_first_field) {
+            // Add trailing comma and newline to previous element. Don't add
+            // trailing comma to
+            // last element since older versions of gcc complain about this.
+            code += ",\n";
+          } else {
+            is_first_field = false;
+          }
+          code += "    " + GenFieldOffsetName(field) + " = ";
+          code += NumToString(field.value.offset);
+        }
+      }
+      code += "\n  };\n";
+    }
+    // Generate the accessors.
+    for (auto it = struct_def.fields.vec.begin();
+         it != struct_def.fields.vec.end(); ++it) {
+      auto &field = **it;
+      if (!field.deprecated) {  // Deprecated fields won't be accessible.
+        auto is_scalar = IsScalar(field.value.type.base_type);
+        GenComment(field.doc_comment, code_ptr, nullptr, "  ");
+        code += "  " +
+                GenTypeGet(field.value.type, " ", "const ", " *", true);
+        code += field.name + "() const { return ";
+        // Call a different accessor for pointers, that indirects.
+        auto accessor =
+            is_scalar
+                ? "GetField<"
+                : (IsStruct(field.value.type) ? "GetStruct<" : "GetPointer<");
+        auto offsetstr = GenFieldOffsetName(field);
+        auto call = accessor + GenTypeGet(field.value.type, "",
+                                          "const ", " *", false) +
+                    ">(" + offsetstr;
+        // Default value as second arg for non-pointer types.
+        if (IsScalar(field.value.type.base_type))
+          call += ", " + GenDefaultConstant(field);
+        call += ")";
+        code += GenUnderlyingCast(field, true, call);
+        code += "; }\n";
+        if (parser_.opts.mutable_buffer) {
+          if (is_scalar) {
+            code += "  bool mutate_" + field.name + "(";
+            code += GenTypeBasic(field.value.type, true);
+            code +=
+                " _" + field.name + ") { return SetField(" + offsetstr + ", ";
+            code += GenUnderlyingCast(field, false, "_" + field.name);
+            code += "); }\n";
+          } else {
+            auto type =
+                GenTypeGet(field.value.type, " ", "", " *", true);
+            code += "  " + type + "mutable_" + field.name + "() { return ";
+            code += GenUnderlyingCast(field, true,
+                                      accessor + type + ">(" + offsetstr + ")");
+            code += "; }\n";
+          }
+        }
+        auto nested = field.attributes.Lookup("nested_flatbuffer");
+        if (nested) {
+          std::string qualified_name =
+              parser_.namespaces_.back()->GetFullyQualifiedName(
+                  nested->constant);
+          auto nested_root = parser_.structs_.Lookup(qualified_name);
+          assert(nested_root);  // Guaranteed to exist by parser.
+          (void)nested_root;
+          std::string cpp_qualified_name = TranslateNameSpace(qualified_name);
+
+          code += "  const " + cpp_qualified_name + " *" + field.name;
+          code += "_nested_root() const { return flatbuffers::GetRoot<";
+          code += cpp_qualified_name + ">(" + field.name + "()->Data()); }\n";
+        }
+        // Generate a comparison function for this field if it is a key.
+        if (field.key) {
+          code += "  bool KeyCompareLessThan(const " + struct_def.name;
+          code += " *o) const { return ";
+          if (field.value.type.base_type == BASE_TYPE_STRING) code += "*";
+          code += field.name + "() < ";
+          if (field.value.type.base_type == BASE_TYPE_STRING) code += "*";
+          code += "o->" + field.name + "(); }\n";
+          code += "  int KeyCompareWithValue(";
+          if (field.value.type.base_type == BASE_TYPE_STRING) {
+            code += "const char *val) const { return strcmp(" + field.name;
+            code += "()->c_str(), val); }\n";
+          } else {
+            if (parser_.opts.scoped_enums && field.value.type.enum_def &&
+                IsScalar(field.value.type.base_type)) {
+              code += GenTypeGet(field.value.type, " ", "const ", " *", true);
+            } else {
+              code += GenTypeBasic(field.value.type, false);
+            }
+            code += " val) const { return " + field.name + "() < val ? -1 : ";
+            code += field.name + "() > val; }\n";
+          }
+        }
+      }
+    }
+    // Generate a verifier function that can check a buffer from an untrusted
+    // source will never cause reads outside the buffer.
+    code += "  bool Verify(flatbuffers::Verifier &verifier) const {\n";
+    code += "    return VerifyTableStart(verifier)";
+    std::string prefix = " &&\n           ";
+    for (auto it = struct_def.fields.vec.begin();
+         it != struct_def.fields.vec.end(); ++it) {
+      auto &field = **it;
+      if (!field.deprecated) {
+        code += prefix + "VerifyField";
+        if (field.required) code += "Required";
+        code += "<" + GenTypeSize(field.value.type);
+        code += ">(verifier, " + GenFieldOffsetName(field) + ")";
+        switch (field.value.type.base_type) {
+          case BASE_TYPE_UNION:
+            code += prefix + "Verify" + field.value.type.enum_def->name;
+            code +=
+                "(verifier, " + field.name + "(), " + field.name + "_type())";
+            break;
+          case BASE_TYPE_STRUCT:
+            if (!field.value.type.struct_def->fixed) {
+              code += prefix + "verifier.VerifyTable(" + field.name;
+              code += "())";
+            }
+            break;
+          case BASE_TYPE_STRING:
+            code += prefix + "verifier.Verify(" + field.name + "())";
+            break;
+          case BASE_TYPE_VECTOR:
+            code += prefix + "verifier.Verify(" + field.name + "())";
+            switch (field.value.type.element) {
+              case BASE_TYPE_STRING: {
+                code += prefix + "verifier.VerifyVectorOfStrings(" + field.name;
+                code += "())";
+                break;
+              }
+              case BASE_TYPE_STRUCT: {
+                if (!field.value.type.struct_def->fixed) {
+                  code +=
+                      prefix + "verifier.VerifyVectorOfTables(" + field.name;
+                  code += "())";
+                }
+                break;
+              }
+              default:
+                break;
+            }
+            break;
+          default:
+            break;
+        }
+      }
+    }
+    code += prefix + "verifier.EndTable()";
+    code += ";\n  }\n";
+    code += "};\n\n";
+
+    // Generate a builder struct, with methods of the form:
+    // void add_name(type name) { fbb_.AddElement<type>(offset, name, default);
+    // }
+    code += "struct " + struct_def.name;
+    code += "Builder {\n  flatbuffers::FlatBufferBuilder &fbb_;\n";
+    code += "  flatbuffers::uoffset_t start_;\n";
+    for (auto it = struct_def.fields.vec.begin();
+         it != struct_def.fields.vec.end(); ++it) {
+      auto &field = **it;
+      if (!field.deprecated) {
+        code += "  void add_" + field.name + "(";
+        code += GenTypeWire(field.value.type, " ", true) + field.name;
+        code += ") { fbb_.Add";
+        if (IsScalar(field.value.type.base_type)) {
+          code += "Element<" + GenTypeWire(field.value.type, "", false);
+          code += ">";
+        } else if (IsStruct(field.value.type)) {
+          code += "Struct";
+        } else {
+          code += "Offset";
+        }
+        code += "(" + struct_def.name + "::" + GenFieldOffsetName(field) + ", ";
+        code += GenUnderlyingCast(field, false, field.name);
+        if (IsScalar(field.value.type.base_type))
+          code += ", " + GenDefaultConstant(field);
+        code += "); }\n";
+      }
+    }
+    code += "  " + struct_def.name;
+    code += "Builder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) ";
+    code += "{ start_ = fbb_.StartTable(); }\n";
+    code += "  " + struct_def.name + "Builder &operator=(const ";
+    code += struct_def.name + "Builder &);\n";
+    code += "  flatbuffers::Offset<" + struct_def.name;
+    code += "> Finish() {\n    auto o = flatbuffers::Offset<" + struct_def.name;
+    code += ">(fbb_.EndTable(start_, ";
+    code += NumToString(struct_def.fields.vec.size()) + "));\n";
+    for (auto it = struct_def.fields.vec.begin();
+         it != struct_def.fields.vec.end(); ++it) {
+      auto &field = **it;
+      if (!field.deprecated && field.required) {
+        code += "    fbb_.Required(o, ";
+        code += struct_def.name + "::" + GenFieldOffsetName(field);
+        code += ");  // " + field.name + "\n";
+      }
+    }
+    code += "    return o;\n  }\n};\n\n";
+
+    // Generate a convenient CreateX function that uses the above builder
+    // to create a table in one go.
+    code += "inline flatbuffers::Offset<" + struct_def.name + "> Create";
+    code += struct_def.name;
+    code += "(flatbuffers::FlatBufferBuilder &_fbb";
+    for (auto it = struct_def.fields.vec.begin();
+         it != struct_def.fields.vec.end(); ++it) {
+      auto &field = **it;
+      if (!field.deprecated) {
+        code += ",\n   " + GenTypeWire(field.value.type, " ", true);
+        code += field.name + " = ";
+        if (field.value.type.enum_def && IsScalar(field.value.type.base_type)) {
+          auto ev = field.value.type.enum_def->ReverseLookup(
+              static_cast<int>(StringToInt(field.value.constant.c_str())),
+              false);
+          if (ev) {
+            code += WrapInNameSpace(
+                field.value.type.enum_def->defined_namespace,
+                GetEnumVal(*field.value.type.enum_def, *ev, parser_.opts));
+          } else {
+            code += GenUnderlyingCast(field, true, field.value.constant);
+          }
+        } else if (field.value.type.base_type == BASE_TYPE_BOOL) {
+          code += field.value.constant == "0" ? "false" : "true";
+        } else {
+          code += GenDefaultConstant(field);
+        }
+      }
+    }
+    code += ") {\n  " + struct_def.name + "Builder builder_(_fbb);\n";
+    for (size_t size = struct_def.sortbysize ? sizeof(largest_scalar_t) : 1;
+         size; size /= 2) {
+      for (auto it = struct_def.fields.vec.rbegin();
+           it != struct_def.fields.vec.rend(); ++it) {
+        auto &field = **it;
+        if (!field.deprecated && (!struct_def.sortbysize ||
+                                  size == SizeOf(field.value.type.base_type))) {
+          code += "  builder_.add_" + field.name + "(" + field.name + ");\n";
+        }
+      }
+    }
+    code += "  return builder_.Finish();\n}\n\n";
+  }
+
+  static void GenPadding(const FieldDef &field, std::string &code,
+                         int &padding_id,
+                         const std::function<void(int bits, std::string &code,
+                                                  int &padding_id)> &f) {
+    if (field.padding) {
+      for (int i = 0; i < 4; i++)
+        if (static_cast<int>(field.padding) & (1 << i))
+          f((1 << i) * 8, code, padding_id);
+      assert(!(field.padding & ~0xF));
+    }
+  }
+
+  static void PaddingDefinition(int bits, std::string &code, int &padding_id) {
+    code += "  int" + NumToString(bits) + "_t __padding" +
+            NumToString(padding_id++) + ";\n";
+  }
+
+  static void PaddingDeclaration(int bits, std::string &code, int &padding_id) {
+    (void)bits;
+    code += " (void)__padding" + NumToString(padding_id++) + ";";
+  }
+
+  static void PaddingInitializer(int bits, std::string &code, int &padding_id) {
+    (void)bits;
+    code += ", __padding" + NumToString(padding_id++) + "(0)";
+  }
+
+  // Generate an accessor struct with constructor for a flatbuffers struct.
+  void GenStruct(StructDef &struct_def, std::string *code_ptr) {
+    if (struct_def.generated) return;
+    std::string &code = *code_ptr;
+
+    // Generate an accessor struct, with private variables of the form:
+    // type name_;
+    // Generates manual padding and alignment.
+    // Variables are private because they contain little endian data on all
+    // platforms.
+    GenComment(struct_def.doc_comment, code_ptr, nullptr);
+    code +=
+        "MANUALLY_ALIGNED_STRUCT(" + NumToString(struct_def.minalign) + ") ";
+    code += struct_def.name + " FLATBUFFERS_FINAL_CLASS {\n private:\n";
+    int padding_id = 0;
+    for (auto it = struct_def.fields.vec.begin();
+         it != struct_def.fields.vec.end(); ++it) {
+      auto &field = **it;
+      code += "  " + GenTypeGet(field.value.type, " ", "", " ", false);
+      code += field.name + "_;\n";
+      GenPadding(field, code, padding_id, PaddingDefinition);
+    }
+
+    // Generate GetFullyQualifiedName
+    code += "\n public:\n";
+    GenFullyQualifiedNameGetter(struct_def.name, code);
+
+    // Generate a constructor that takes all fields as arguments.
+    code += "  " + struct_def.name + "(";
+    for (auto it = struct_def.fields.vec.begin();
+         it != struct_def.fields.vec.end(); ++it) {
+      auto &field = **it;
+      if (it != struct_def.fields.vec.begin()) code += ", ";
+      code += GenTypeGet(field.value.type, " ", "const ", " &", true);
+      code += "_" + field.name;
+    }
+    code += ")\n    : ";
+    padding_id = 0;
+    for (auto it = struct_def.fields.vec.begin();
+         it != struct_def.fields.vec.end(); ++it) {
+      auto &field = **it;
+      if (it != struct_def.fields.vec.begin()) code += ", ";
+      code += field.name + "_(";
+      if (IsScalar(field.value.type.base_type)) {
+        code += "flatbuffers::EndianScalar(";
+        code += GenUnderlyingCast(field, false, "_" + field.name);
+        code += "))";
+      } else {
+        code += "_" + field.name + ")";
+      }
+      GenPadding(field, code, padding_id, PaddingInitializer);
+    }
+
+    code += " {";
+    padding_id = 0;
+    for (auto it = struct_def.fields.vec.begin();
+         it != struct_def.fields.vec.end(); ++it) {
+      auto &field = **it;
+      GenPadding(field, code, padding_id, PaddingDeclaration);
+    }
+    code += " }\n\n";
+
+    // Generate accessor methods of the form:
+    // type name() const { return flatbuffers::EndianScalar(name_); }
+    for (auto it = struct_def.fields.vec.begin();
+         it != struct_def.fields.vec.end(); ++it) {
+      auto &field = **it;
+      GenComment(field.doc_comment, code_ptr, nullptr, "  ");
+      auto is_scalar = IsScalar(field.value.type.base_type);
+      code += "  " +
+              GenTypeGet(field.value.type, " ", "const ", " &", true);
+      code += field.name + "() const { return ";
+      code += GenUnderlyingCast(
+          field, true, is_scalar
+                           ? "flatbuffers::EndianScalar(" + field.name + "_)"
+                           : field.name + "_");
+      code += "; }\n";
+      if (parser_.opts.mutable_buffer) {
+        if (is_scalar) {
+          code += "  void mutate_" + field.name + "(";
+          code += GenTypeBasic(field.value.type, true);
+          code += " _" + field.name + ") { flatbuffers::WriteScalar(&";
+          code += field.name + "_, ";
+          code += GenUnderlyingCast(field, false, "_" + field.name);
+          code += "); }\n";
+        } else {
+          code += "  ";
+          code += GenTypeGet(field.value.type, "", "", " &", true);
+          code += "mutable_" + field.name + "() { return " + field.name;
+          code += "_; }\n";
+        }
+      }
+    }
+    code += "};\nSTRUCT_END(" + struct_def.name + ", ";
+    code += NumToString(struct_def.bytesize) + ");\n\n";
+  }
+
+  void GenerateNestedNameSpaces(const Namespace *ns, std::string *code_ptr) {
+    for (auto it = ns->components.begin(); it != ns->components.end(); ++it) {
+      *code_ptr += "namespace " + *it + " {\n";
+    }
+  }
+
+  void CloseNestedNameSpaces(const Namespace *ns, std::string *code_ptr) {
+    for (auto it = ns->components.rbegin(); it != ns->components.rend(); ++it) {
+      *code_ptr += "}  // namespace " + *it + "\n";
+    }
+  }
+
+  void CheckNameSpace(const Definition &def, std::string *code_ptr) {
+    // Set up the correct namespace. Only open a namespace if
+    // the existing one is different.
+    // TODO: this could be done more intelligently, by sorting to
+    // namespace path and only opening/closing what is necessary, but that's
+    // quite a bit more complexity.
+    if (code_generator_cur_name_space != def.defined_namespace) {
+      if (code_generator_cur_name_space) {
+        CloseNestedNameSpaces(code_generator_cur_name_space, code_ptr);
+        if (code_generator_cur_name_space->components.size()) *code_ptr += "\n";
+      }
+      GenerateNestedNameSpaces(def.defined_namespace, code_ptr);
+      code_generator_cur_name_space = def.defined_namespace;
+      if (code_generator_cur_name_space->components.size()) *code_ptr += "\n";
+    }
+  }
 };
 }  // namespace cpp
 
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index 594c6f7c8..3da41faef 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -22,8 +22,8 @@ enum Color {
   Color_Red = 1,
   Color_Green = 2,
   Color_Blue = 8,
-  Color_MIN = Color_Red,
-  Color_MAX = Color_Blue
+  Color_NONE = 0,
+  Color_ANY = 11
 };
 
 inline const char **EnumNamesColor() {

From a3a2bf890f9e02f3f0f5f28f2e07edb630419707 Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Thu, 2 Jun 2016 23:01:40 +0200
Subject: [PATCH 162/185] Better C++ namespace management

---
 src/idl_gen_cpp.cpp                           | 72 ++++++++-----------
 .../namespace_test2_generated.h               |  4 --
 2 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 875345933..f3a9f1254 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -86,7 +86,7 @@ class CppGenerator : public BaseGenerator {
       if (num_includes) code += "\n";
     }
 
-    assert(!code_generator_cur_name_space);
+    assert(!cur_name_space_);
 
     // Generate forward declarations for all structs/tables, since they may
     // have circular references.
@@ -94,7 +94,7 @@ class CppGenerator : public BaseGenerator {
          it != parser_.structs_.vec.end(); ++it) {
       auto &struct_def = **it;
       if (!struct_def.generated) {
-        CheckNameSpace(struct_def, &code);
+        CheckNameSpace(struct_def.defined_namespace, &code);
         code += "struct " + struct_def.name + ";\n\n";
       }
     }
@@ -104,7 +104,7 @@ class CppGenerator : public BaseGenerator {
          ++it) {
       auto &enum_def = **it;
       if (!enum_def.generated) {
-        CheckNameSpace(**it, &code);
+        CheckNameSpace((**it).defined_namespace, &code);
         GenEnum(**it, &code);
       }
     }
@@ -114,7 +114,7 @@ class CppGenerator : public BaseGenerator {
          it != parser_.structs_.vec.end(); ++it) {
       auto &struct_def = **it;
       if (struct_def.fixed && !struct_def.generated) {
-        CheckNameSpace(struct_def, &code);
+        CheckNameSpace(struct_def.defined_namespace, &code);
         GenStruct(struct_def, &code);
       }
     }
@@ -122,7 +122,7 @@ class CppGenerator : public BaseGenerator {
          it != parser_.structs_.vec.end(); ++it) {
       auto &struct_def = **it;
       if (!struct_def.fixed && !struct_def.generated) {
-        CheckNameSpace(struct_def, &code);
+        CheckNameSpace(struct_def.defined_namespace, &code);
         GenTable(struct_def, &code);
       }
     }
@@ -132,14 +132,14 @@ class CppGenerator : public BaseGenerator {
          ++it) {
       auto &enum_def = **it;
       if (enum_def.is_union && !enum_def.generated) {
-        CheckNameSpace(enum_def, &code);
+        CheckNameSpace(enum_def.defined_namespace, &code);
         GenEnumPost(enum_def, &code);
       }
     }
 
     // Generate convenient global helper functions:
     if (parser_.root_struct_def_) {
-      CheckNameSpace(*parser_.root_struct_def_, &code);
+      CheckNameSpace((*parser_.root_struct_def_).defined_namespace, &code);
       auto &name = parser_.root_struct_def_->name;
       std::string qualified_name =
           parser_.namespaces_.back()->GetFullyQualifiedName(name);
@@ -195,25 +195,23 @@ class CppGenerator : public BaseGenerator {
       code += "); }\n\n";
     }
 
-    assert(code_generator_cur_name_space);
-    CloseNestedNameSpaces(code_generator_cur_name_space, &code);
-
-    code_generator_cur_name_space = nullptr;
+    assert(cur_name_space_);
+    CheckNameSpace(nullptr, &code);
 
     // Close the include guard.
-    code += "\n#endif  // " + include_guard + "\n";
+    code += "#endif  // " + include_guard + "\n";
 
     return SaveFile(GeneratedFileName(path_, file_name_).c_str(), code, false);
   }
 
  private:
   // This tracks the current namespace so we can insert namespace declarations.
-  const Namespace *code_generator_cur_name_space = nullptr;
+  const Namespace *cur_name_space_ = nullptr;
 
   // Ensure that a type is prefixed with its namespace whenever it is used
   // outside of its namespace.
   std::string WrapInNameSpace(const Namespace *ns, const std::string &name) {
-    if (code_generator_cur_name_space != ns) {
+    if (cur_name_space_ != ns) {
       std::string qualified_name;
       for (auto it = ns->components.begin(); it != ns->components.end(); ++it) {
         qualified_name += *it + "::";
@@ -863,33 +861,25 @@ class CppGenerator : public BaseGenerator {
     code += NumToString(struct_def.bytesize) + ");\n\n";
   }
 
-  void GenerateNestedNameSpaces(const Namespace *ns, std::string *code_ptr) {
-    for (auto it = ns->components.begin(); it != ns->components.end(); ++it) {
-      *code_ptr += "namespace " + *it + " {\n";
-    }
-  }
-
-  void CloseNestedNameSpaces(const Namespace *ns, std::string *code_ptr) {
-    for (auto it = ns->components.rbegin(); it != ns->components.rend(); ++it) {
-      *code_ptr += "}  // namespace " + *it + "\n";
-    }
-  }
-
-  void CheckNameSpace(const Definition &def, std::string *code_ptr) {
-    // Set up the correct namespace. Only open a namespace if
-    // the existing one is different.
-    // TODO: this could be done more intelligently, by sorting to
-    // namespace path and only opening/closing what is necessary, but that's
-    // quite a bit more complexity.
-    if (code_generator_cur_name_space != def.defined_namespace) {
-      if (code_generator_cur_name_space) {
-        CloseNestedNameSpaces(code_generator_cur_name_space, code_ptr);
-        if (code_generator_cur_name_space->components.size()) *code_ptr += "\n";
-      }
-      GenerateNestedNameSpaces(def.defined_namespace, code_ptr);
-      code_generator_cur_name_space = def.defined_namespace;
-      if (code_generator_cur_name_space->components.size()) *code_ptr += "\n";
-    }
+  // Set up the correct namespace. Only open a namespace if
+  // the existing one is different (opening/closing only what is necessary)
+  // the file must start and end with an empty namespace
+  void CheckNameSpace(const Namespace *ns, std::string *code_ptr) {
+    if (cur_name_space_ == ns) return;
+    auto s1 = cur_name_space_ == nullptr ? 0 : cur_name_space_->components.size();
+    auto s2 = ns == nullptr ? 0 : ns->components.size();
+    std::vector<std::string>::size_type limit = 0;
+    while (limit < s1 && limit < s2 &&
+           ns->components[limit] == cur_name_space_->components[limit])
+      limit++;
+    for (auto j = s1; j > limit; --j)
+      *code_ptr +=
+          "}  // namespace " + cur_name_space_->components[j - 1] + "\n";
+    if (s1 != limit) *code_ptr += "\n";
+    for (auto j = limit; j != s2; ++j)
+      *code_ptr += "namespace " + ns->components[j] + " {\n";
+    if (s2 != limit) *code_ptr += "\n";
+    cur_name_space_ = ns;
   }
 };
 }  // namespace cpp
diff --git a/tests/namespace_test/namespace_test2_generated.h b/tests/namespace_test/namespace_test2_generated.h
index d0cc5fab2..8e6b3ada8 100644
--- a/tests/namespace_test/namespace_test2_generated.h
+++ b/tests/namespace_test/namespace_test2_generated.h
@@ -23,10 +23,6 @@ namespace NamespaceA {
 
 struct SecondTableInA;
 
-}  // namespace NamespaceA
-
-namespace NamespaceA {
-
 struct TableInFirstNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum {
     VT_FOO_TABLE = 4,

From e92ae5199d52fd59540a800bec7eef46cd778257 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <aardappel@gmail.com>
Date: Thu, 2 Jun 2016 14:55:35 -0700
Subject: [PATCH 163/185] Fixed compile errors on Windows

---
 include/flatbuffers/code_generators.h |  4 ++++
 src/idl_parser.cpp                    | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/flatbuffers/code_generators.h b/include/flatbuffers/code_generators.h
index a832334ec..95fa0c1ac 100644
--- a/include/flatbuffers/code_generators.h
+++ b/include/flatbuffers/code_generators.h
@@ -45,6 +45,10 @@ class BaseGenerator {
         namespace_dir_(BaseGenerator::NamespaceDir(parser, path)){};
   virtual ~BaseGenerator(){};
 
+  // No copy/assign.
+  BaseGenerator &operator=(const BaseGenerator &);
+  BaseGenerator(const BaseGenerator &);
+
   const char *FlatBuffersGeneratedWarning() {
     return "automatically generated by the FlatBuffers compiler,"
            " do not modify\n\n";
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 2bf99eac0..f5badab16 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -275,7 +275,7 @@ CheckedError Parser::Next() {
                     return Error(
                       "illegal Unicode sequence (multiple high surrogates)");
                   } else {
-                    unicode_high_surrogate = val;
+                    unicode_high_surrogate = static_cast<int>(val);
                   }
                 } else if (val >= 0xDC00 && val <= 0xDFFF) {
                   if (unicode_high_surrogate == -1) {
@@ -2001,14 +2001,14 @@ flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<
     Definition::SerializeAttributes(FlatBufferBuilder *builder,
                                     const Parser &parser) const {
   std::vector<flatbuffers::Offset<reflection::KeyValue>> attrs;
-  for (auto kv : attributes.dict) {
-    auto it = parser.known_attributes_.find(kv.first);
+  for (auto kv = attributes.dict.begin(); kv != attributes.dict.end(); ++kv) {
+    auto it = parser.known_attributes_.find(kv->first);
     assert(it != parser.known_attributes_.end());
     if (!it->second) {  // Custom attribute.
       attrs.push_back(
-          reflection::CreateKeyValue(*builder, builder->CreateString(kv.first),
+          reflection::CreateKeyValue(*builder, builder->CreateString(kv->first),
                                      builder->CreateString(
-                                         kv.second->constant)));
+                                         kv->second->constant)));
     }
   }
   if (attrs.size()) {

From 4ffc881fb6002f37163ec7507c3dd2d1009abd08 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 25 May 2016 17:47:44 -0700
Subject: [PATCH 164/185] Fixed LoadFile crashing on directory arguments.

Change-Id: I737f6fd0bb1302ab7cfa6ab8b06108e221ebb63c
Tested: on Linux.
---
 include/flatbuffers/util.h  |  6 +++++-
 samples/monster_generated.h | 19 ++++++++++++++++++-
 src/util.cpp                | 17 ++++++++++++++++-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h
index cfb211f09..7bd7513bb 100644
--- a/include/flatbuffers/util.h
+++ b/include/flatbuffers/util.h
@@ -35,9 +35,10 @@
 #include <winbase.h>
 #include <direct.h>
 #else
-#include <sys/stat.h>
 #include <limits.h>
 #endif
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "flatbuffers/flatbuffers.h"
 
@@ -124,6 +125,9 @@ FileExistsFunction SetFileExistsFunction(FileExistsFunction
 // Check if file "name" exists.
 bool FileExists(const char *name);
 
+// Check if "name" exists and it is also a directory.
+bool DirExists(const char *name);
+
 // Load file "name" into "buf" returning true if successful
 // false otherwise.  If "binary" is false data is read
 // using ifstream's text mode, otherwise data is read with
diff --git a/samples/monster_generated.h b/samples/monster_generated.h
index cf45bbb91..1a16126a5 100644
--- a/samples/monster_generated.h
+++ b/samples/monster_generated.h
@@ -5,12 +5,13 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-
 namespace MyGame {
 namespace Sample {
 
 struct Vec3;
+
 struct Monster;
+
 struct Weapon;
 
 enum Color {
@@ -55,8 +56,11 @@ MANUALLY_ALIGNED_STRUCT(4) Vec3 FLATBUFFERS_FINAL_CLASS {
     : x_(flatbuffers::EndianScalar(_x)), y_(flatbuffers::EndianScalar(_y)), z_(flatbuffers::EndianScalar(_z)) { }
 
   float x() const { return flatbuffers::EndianScalar(x_); }
+  void mutate_x(float _x) { flatbuffers::WriteScalar(&x_, _x); }
   float y() const { return flatbuffers::EndianScalar(y_); }
+  void mutate_y(float _y) { flatbuffers::WriteScalar(&y_, _y); }
   float z() const { return flatbuffers::EndianScalar(z_); }
+  void mutate_z(float _z) { flatbuffers::WriteScalar(&z_, _z); }
 };
 STRUCT_END(Vec3, 12);
 
@@ -73,14 +77,23 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
     VT_EQUIPPED = 22
   };
   const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
+  Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
   int16_t mana() const { return GetField<int16_t>(VT_MANA, 150); }
+  bool mutate_mana(int16_t _mana) { return SetField(VT_MANA, _mana); }
   int16_t hp() const { return GetField<int16_t>(VT_HP, 100); }
+  bool mutate_hp(int16_t _hp) { return SetField(VT_HP, _hp); }
   const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
+  flatbuffers::String *mutable_name() { return GetPointer<flatbuffers::String *>(VT_NAME); }
   const flatbuffers::Vector<uint8_t> *inventory() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); }
+  flatbuffers::Vector<uint8_t> *mutable_inventory() { return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); }
   Color color() const { return static_cast<Color>(GetField<int8_t>(VT_COLOR, 2)); }
+  bool mutate_color(Color _color) { return SetField(VT_COLOR, static_cast<int8_t>(_color)); }
   const flatbuffers::Vector<flatbuffers::Offset<Weapon>> *weapons() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Weapon>> *>(VT_WEAPONS); }
+  flatbuffers::Vector<flatbuffers::Offset<Weapon>> *mutable_weapons() { return GetPointer<flatbuffers::Vector<flatbuffers::Offset<Weapon>> *>(VT_WEAPONS); }
   Equipment equipped_type() const { return static_cast<Equipment>(GetField<uint8_t>(VT_EQUIPPED_TYPE, 0)); }
+  bool mutate_equipped_type(Equipment _equipped_type) { return SetField(VT_EQUIPPED_TYPE, static_cast<uint8_t>(_equipped_type)); }
   const void *equipped() const { return GetPointer<const void *>(VT_EQUIPPED); }
+  void *mutable_equipped() { return GetPointer<void *>(VT_EQUIPPED); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<Vec3>(verifier, VT_POS) &&
@@ -150,7 +163,9 @@ struct Weapon FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
     VT_DAMAGE = 6
   };
   const flatbuffers::String *name() const { return GetPointer<const flatbuffers::String *>(VT_NAME); }
+  flatbuffers::String *mutable_name() { return GetPointer<flatbuffers::String *>(VT_NAME); }
   int16_t damage() const { return GetField<int16_t>(VT_DAMAGE, 0); }
+  bool mutate_damage(int16_t _damage) { return SetField(VT_DAMAGE, _damage); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
@@ -192,6 +207,8 @@ inline bool VerifyEquipment(flatbuffers::Verifier &verifier, const void *union_o
 
 inline const MyGame::Sample::Monster *GetMonster(const void *buf) { return flatbuffers::GetRoot<MyGame::Sample::Monster>(buf); }
 
+inline Monster *GetMutableMonster(void *buf) { return flatbuffers::GetMutableRoot<Monster>(buf); }
+
 inline bool VerifyMonsterBuffer(flatbuffers::Verifier &verifier) { return verifier.VerifyBuffer<MyGame::Sample::Monster>(); }
 
 inline void FinishMonsterBuffer(flatbuffers::FlatBufferBuilder &fbb, flatbuffers::Offset<MyGame::Sample::Monster> root) { fbb.Finish(root); }
diff --git a/src/util.cpp b/src/util.cpp
index 452e9eae5..f4aecb5c3 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -24,12 +24,14 @@ bool FileExistsRaw(const char *name) {
 }
 
 bool LoadFileRaw(const char *name, bool binary, std::string *buf) {
+  if (DirExists(name)) return false;
   std::ifstream ifs(name, binary ? std::ifstream::binary : std::ifstream::in);
   if (!ifs.is_open()) return false;
   if (binary) {
     // The fastest way to read a file into a string.
     ifs.seekg(0, std::ios::end);
-    (*buf).resize(static_cast<size_t>(ifs.tellg()));
+    auto size = ifs.tellg();
+    (*buf).resize(static_cast<size_t>(size));
     ifs.seekg(0, std::ios::beg);
     ifs.read(&(*buf)[0], (*buf).size());
   } else {
@@ -54,6 +56,19 @@ bool FileExists(const char *name) {
   return g_file_exists_function(name);
 }
 
+bool DirExists(const char *name) {
+  #ifdef _WIN32
+    #define flatbuffers_stat _stat
+    #define FLATBUFFERS_S_IFDIR _S_IFDIR
+  #else
+    #define flatbuffers_stat stat
+    #define FLATBUFFERS_S_IFDIR S_IFDIR
+  #endif
+  struct flatbuffers_stat file_info;
+  if (flatbuffers_stat(name, &file_info) != 0) return false;
+  return (file_info.st_mode & FLATBUFFERS_S_IFDIR) != 0;
+}
+
 LoadFileFunction SetLoadFileFunction(LoadFileFunction load_file_function) {
   LoadFileFunction previous_function = g_load_file_function;
   g_load_file_function = load_file_function ? load_file_function : LoadFileRaw;

From 2bdf44a25d435f5428afb79e18657d0ba03cb7c2 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 6 Jun 2016 17:38:21 -0700
Subject: [PATCH 165/185] Added a way to get mutable tables out of a mutable
 vector of tables.

Change-Id: I8f9ef1d14f86671ced929c7a159115b1d8510327
Tested: on Linux.
---
 include/flatbuffers/flatbuffers.h | 10 ++++++++++
 tests/test.cpp                    |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 0fa31250f..b22aaaa6a 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -207,6 +207,7 @@ template<typename T> size_t AlignOf() {
 // (avoiding the need for a trailing return decltype)
 template<typename T> struct IndirectHelper {
   typedef T return_type;
+  typedef T mutable_return_type;
   static const size_t element_stride = sizeof(T);
   static return_type Read(const uint8_t *p, uoffset_t i) {
     return EndianScalar((reinterpret_cast<const T *>(p))[i]);
@@ -214,6 +215,7 @@ template<typename T> struct IndirectHelper {
 };
 template<typename T> struct IndirectHelper<Offset<T>> {
   typedef const T *return_type;
+  typedef T *mutable_return_type;
   static const size_t element_stride = sizeof(uoffset_t);
   static return_type Read(const uint8_t *p, uoffset_t i) {
     p += i * sizeof(uoffset_t);
@@ -222,6 +224,7 @@ template<typename T> struct IndirectHelper<Offset<T>> {
 };
 template<typename T> struct IndirectHelper<const T *> {
   typedef const T *return_type;
+  typedef T *mutable_return_type;
   static const size_t element_stride = sizeof(T);
   static return_type Read(const uint8_t *p, uoffset_t i) {
     return reinterpret_cast<const T *>(p + i * sizeof(T));
@@ -306,6 +309,7 @@ public:
   uoffset_t Length() const { return size(); }
 
   typedef typename IndirectHelper<T>::return_type return_type;
+  typedef typename IndirectHelper<T>::mutable_return_type mutable_return_type;
 
   return_type Get(uoffset_t i) const {
     assert(i < size());
@@ -347,6 +351,12 @@ public:
     WriteScalar(data() + i, val - (Data() + i * sizeof(uoffset_t)));
   }
 
+  // Get a mutable pointer to tables/strings inside this vector.
+  mutable_return_type GetMutableObject(uoffset_t i) const {
+    assert(i < size());
+    return const_cast<mutable_return_type>(IndirectHelper<T>::Read(Data(), i));
+  }
+
   // The raw data in little endian format. Use with care.
   const uint8_t *Data() const {
     return reinterpret_cast<const uint8_t *>(&length_ + 1);
diff --git a/tests/test.cpp b/tests/test.cpp
index e636f1f3c..73af97133 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -108,6 +108,7 @@ flatbuffers::unique_ptr_t CreateFlatBufferTest(std::string &buffer) {
   mlocs[0] = mb1.Finish();
   MonsterBuilder mb2(builder);
   mb2.add_name(barney);
+  mb2.add_hp(1000);
   mlocs[1] = mb2.Finish();
   MonsterBuilder mb3(builder);
   mb3.add_name(wilma);
@@ -203,6 +204,7 @@ void AccessFlatBufferTest(const uint8_t *flatbuf, size_t length) {
   for (auto it = vecoftables->begin(); it != vecoftables->end(); ++it)
     TEST_EQ(strlen(it->name()->c_str()) >= 4, true);
   TEST_EQ_STR(vecoftables->Get(0)->name()->c_str(), "Barney");
+  TEST_EQ(vecoftables->Get(0)->hp(), 1000);
   TEST_EQ_STR(vecoftables->Get(1)->name()->c_str(), "Fred");
   TEST_EQ_STR(vecoftables->Get(2)->name()->c_str(), "Wilma");
   TEST_NOTNULL(vecoftables->LookupByKey("Barney"));
@@ -260,6 +262,13 @@ void MutateFlatBuffersTest(uint8_t *flatbuf, std::size_t length) {
   TEST_EQ(inventory->Get(9), 100);
   inventory->Mutate(9, 9);
 
+  auto tables = monster->mutable_testarrayoftables();
+  auto first = tables->GetMutableObject(0);
+  TEST_EQ(first->hp(), 1000);
+  first->mutate_hp(0);
+  TEST_EQ(first->hp(), 0);
+  first->mutate_hp(1000);
+
   // Run the verifier and the regular test to make sure we didn't trample on
   // anything.
   AccessFlatBufferTest(flatbuf, length);

From 15863c34a0733929069da177aab2861ddb719e80 Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Tue, 7 Jun 2016 14:46:25 +0200
Subject: [PATCH 166/185] SetNameSpace algorithm documentation and more
 meaningful variable names

---
 src/idl_gen_cpp.cpp | 52 ++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index f3a9f1254..b1402d8e6 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -94,7 +94,7 @@ class CppGenerator : public BaseGenerator {
          it != parser_.structs_.vec.end(); ++it) {
       auto &struct_def = **it;
       if (!struct_def.generated) {
-        CheckNameSpace(struct_def.defined_namespace, &code);
+        SetNameSpace(struct_def.defined_namespace, &code);
         code += "struct " + struct_def.name + ";\n\n";
       }
     }
@@ -104,7 +104,7 @@ class CppGenerator : public BaseGenerator {
          ++it) {
       auto &enum_def = **it;
       if (!enum_def.generated) {
-        CheckNameSpace((**it).defined_namespace, &code);
+        SetNameSpace((**it).defined_namespace, &code);
         GenEnum(**it, &code);
       }
     }
@@ -114,7 +114,7 @@ class CppGenerator : public BaseGenerator {
          it != parser_.structs_.vec.end(); ++it) {
       auto &struct_def = **it;
       if (struct_def.fixed && !struct_def.generated) {
-        CheckNameSpace(struct_def.defined_namespace, &code);
+        SetNameSpace(struct_def.defined_namespace, &code);
         GenStruct(struct_def, &code);
       }
     }
@@ -122,7 +122,7 @@ class CppGenerator : public BaseGenerator {
          it != parser_.structs_.vec.end(); ++it) {
       auto &struct_def = **it;
       if (!struct_def.fixed && !struct_def.generated) {
-        CheckNameSpace(struct_def.defined_namespace, &code);
+        SetNameSpace(struct_def.defined_namespace, &code);
         GenTable(struct_def, &code);
       }
     }
@@ -132,14 +132,14 @@ class CppGenerator : public BaseGenerator {
          ++it) {
       auto &enum_def = **it;
       if (enum_def.is_union && !enum_def.generated) {
-        CheckNameSpace(enum_def.defined_namespace, &code);
+        SetNameSpace(enum_def.defined_namespace, &code);
         GenEnumPost(enum_def, &code);
       }
     }
 
     // Generate convenient global helper functions:
     if (parser_.root_struct_def_) {
-      CheckNameSpace((*parser_.root_struct_def_).defined_namespace, &code);
+      SetNameSpace((*parser_.root_struct_def_).defined_namespace, &code);
       auto &name = parser_.root_struct_def_->name;
       std::string qualified_name =
           parser_.namespaces_.back()->GetFullyQualifiedName(name);
@@ -196,7 +196,7 @@ class CppGenerator : public BaseGenerator {
     }
 
     assert(cur_name_space_);
-    CheckNameSpace(nullptr, &code);
+    SetNameSpace(nullptr, &code);
 
     // Close the include guard.
     code += "#endif  // " + include_guard + "\n";
@@ -862,23 +862,35 @@ class CppGenerator : public BaseGenerator {
   }
 
   // Set up the correct namespace. Only open a namespace if
-  // the existing one is different (opening/closing only what is necessary)
-  // the file must start and end with an empty namespace
-  void CheckNameSpace(const Namespace *ns, std::string *code_ptr) {
+  // the existing one is different (closing/opening only what is necessary) :
+  //
+  // the file must start and end with an empty (or null) namespace
+  // so that namespaces are properly opened and closed
+  void SetNameSpace(const Namespace *ns, std::string *code_ptr) {
     if (cur_name_space_ == ns) return;
-    auto s1 = cur_name_space_ == nullptr ? 0 : cur_name_space_->components.size();
-    auto s2 = ns == nullptr ? 0 : ns->components.size();
-    std::vector<std::string>::size_type limit = 0;
-    while (limit < s1 && limit < s2 &&
-           ns->components[limit] == cur_name_space_->components[limit])
-      limit++;
-    for (auto j = s1; j > limit; --j)
+    // compute the size of the longest common namespace prefix.  
+    // if cur_name_space is A::B::C::D and ns is A::B::E::F::G, 
+    // the common prefix is A::B:: and we have old_size = 4, new_size = 5
+    // and common_prefix_size = 2
+    auto old_size =
+        cur_name_space_ == nullptr ? 0 : cur_name_space_->components.size();
+    auto new_size = ns == nullptr ? 0 : ns->components.size();
+    std::vector<std::string>::size_type common_prefix_size = 0;
+    while (common_prefix_size < old_size && common_prefix_size < new_size &&
+           ns->components[common_prefix_size] ==
+               cur_name_space_->components[common_prefix_size])
+      common_prefix_size++;
+    // close cur_name_space in reverse order to reach the common prefix
+    // in the previous example, D then C are closed  
+    for (auto j = old_size; j > common_prefix_size; --j)
       *code_ptr +=
           "}  // namespace " + cur_name_space_->components[j - 1] + "\n";
-    if (s1 != limit) *code_ptr += "\n";
-    for (auto j = limit; j != s2; ++j)
+    if (old_size != common_prefix_size) *code_ptr += "\n";
+    // open namespace parts to reach the ns namespace
+    // in the previous example, E, then F, then G are opened  
+    for (auto j = common_prefix_size; j != new_size; ++j)
       *code_ptr += "namespace " + ns->components[j] + " {\n";
-    if (s2 != limit) *code_ptr += "\n";
+    if (new_size != common_prefix_size) *code_ptr += "\n";
     cur_name_space_ = ns;
   }
 };

From 3ae503a19194666eb56a78f5b5cbb106e2d201f3 Mon Sep 17 00:00:00 2001
From: Alexander Gallego <gallego.alexx@gmail.com>
Date: Tue, 7 Jun 2016 18:08:09 -0400
Subject: [PATCH 167/185] Add env var for flatc schema compiler cmake module

---
 CMake/BuildFlatBuffers.cmake | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CMake/BuildFlatBuffers.cmake b/CMake/BuildFlatBuffers.cmake
index 2c28899a7..42f78de77 100644
--- a/CMake/BuildFlatBuffers.cmake
+++ b/CMake/BuildFlatBuffers.cmake
@@ -63,6 +63,13 @@ function(build_flatbuffers flatbuffers_schemas
     set(FLATC_TARGET flatc)
     set(FLATC flatc)
   endif()
+  set(FLATC_SCHEMA_ARGS --gen-mutable)
+  if(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS)
+    set(FLATC_SCHEMA_ARGS
+      ${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}
+      ${FLATC_SCHEMA_ARGS}
+      )
+  endif()
 
   set(schema_glob "*.fbs")
   # Generate the include files parameters.
@@ -86,7 +93,7 @@ function(build_flatbuffers flatbuffers_schemas
       set(generated_include ${generated_includes_dir}/${filename}_generated.h)
       add_custom_command(
         OUTPUT ${generated_include}
-        COMMAND ${FLATC} --gen-mutable
+        COMMAND ${FLATC} ${FLATC_SCHEMA_ARGS}
         -o ${generated_includes_dir}
         ${include_params}
         -c ${schema}

From afa276288c8db9a983aa8ae134328b1b447bec70 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 15 Jun 2016 12:10:01 -0700
Subject: [PATCH 168/185] Added additional convenience overloads to
 CreateVector().

Bug: 29337887, 29336299
Change-Id: Iad8b3b2263f6cea7ee7e45994369194960df293b
Tested: on Linux.
---
 docs/source/Tutorial.md           |  10 ++++-
 include/flatbuffers/flatbuffers.h |  55 +++++++++++++++++++++------
 tests/MyGame/Example/Monster.cs   |   7 +++-
 tests/MyGame/Example/Monster.go   |  22 ++++++++++-
 tests/MyGame/Example/Monster.java |   7 +++-
 tests/MyGame/Example/Monster.php  |  60 ++++++++++++++++++++++++++++--
 tests/MyGame/Example/Monster.py   |  19 +++++++++-
 tests/monster_test.fbs            |   1 +
 tests/monster_test_generated.h    |  19 +++++++---
 tests/monster_test_generated.js   |  49 +++++++++++++++++++++++-
 tests/monsterdata_test.mon        | Bin 384 -> 384 bytes
 tests/test.cpp                    |  29 +++++++++++----
 12 files changed, 244 insertions(+), 34 deletions(-)

diff --git a/docs/source/Tutorial.md b/docs/source/Tutorial.md
index 1e48796d9..6f6ac9a51 100644
--- a/docs/source/Tutorial.md
+++ b/docs/source/Tutorial.md
@@ -790,6 +790,14 @@ offsets.
 ~~~
 </div>
 
+<div class="language-cpp">
+<br>
+Note there's additional convenience overloads of `CreateVector`, allowing you
+to work with data that's not in a `std::vector`, or allowing you to generate
+elements by calling a lambda. For the common case of `std::vector<std::string>`
+there's also `CreateVectorOfStrings`.
+</div>
+
 To create a `struct`, use the `Vec3` class/struct that was generated by
 the schema compiler:
 
@@ -1075,7 +1083,7 @@ Here is a repetition these lines, to help highlight them more clearly:
 <div class="language-c">
 ~~~{.c}
   // Add union type and data simultanously.
-  ns(Monster_equipped_Weapon_add(B, axe)); 
+  ns(Monster_equipped_Weapon_add(B, axe));
 ~~~
 </div>
 
diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index ff83da6d2..ae50d57d6 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -36,16 +36,17 @@
     (!defined(_MSC_VER) || _MSC_VER < 1600) && \
     (!defined(__GNUC__) || \
       (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40400))
-  #error A C++11 compatible compiler with support for the auto typing is required for FlatBuffers.
+  #error A C++11 compatible compiler with support for the auto typing is \
+         required for FlatBuffers.
   #error __cplusplus _MSC_VER __GNUC__  __GNUC_MINOR__  __GNUC_PATCHLEVEL__
 #endif
 
 #if !defined(__clang__) && \
     defined(__GNUC__) && \
     (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40600)
-  // Backwards compatability for g++ 4.4, and 4.5 which don't have the nullptr and constexpr
-  // keywords. Note the __clang__ check is needed, because clang presents itself as an older GNUC
-  // compiler.
+  // Backwards compatability for g++ 4.4, and 4.5 which don't have the nullptr
+  // and constexpr keywords. Note the __clang__ check is needed, because clang
+  // presents itself as an older GNUC compiler.
   #ifndef nullptr_t
     const class nullptr_t {
     public:
@@ -983,6 +984,33 @@ FLATBUFFERS_FINAL_CLASS
     return CreateVector(v.data(), v.size());
   }
 
+  /// @brief Serialize values returned by a function into a FlatBuffer `vector`.
+  /// This is a convenience function that takes care of iteration for you.
+  /// @tparam T The data type of the `std::vector` elements.
+  /// @param f A function that takes the current iteration 0..vector_size-1 and
+  /// returns any type that you can construct a FlatBuffers vector out of.
+  /// @return Returns a typed `Offset` into the serialized data indicating
+  /// where the vector is stored.
+  template<typename T> Offset<Vector<T>> CreateVector(size_t vector_size,
+      const std::function<T (size_t i)> &f) {
+    std::vector<T> elems(vector_size);
+    for (size_t i = 0; i < vector_size; i++) elems[i] = f(i);
+    return CreateVector(elems.data(), elems.size());
+  }
+
+  /// @brief Serialize a `std::vector<std::string>` into a FlatBuffer `vector`.
+  /// This is a convenience function for a common case.
+  /// @param v A const reference to the `std::vector` to serialize into the
+  /// buffer as a `vector`.
+  /// @return Returns a typed `Offset` into the serialized data indicating
+  /// where the vector is stored.
+  Offset<Vector<Offset<String>>> CreateVectorOfStrings(
+      const std::vector<std::string> &v) {
+    std::vector<Offset<String>> offsets(v.size());
+    for (size_t i = 0; i < v.size(); i++) offsets[i] = CreateString(v[i]);
+    return CreateVector(offsets.data(), offsets.size());
+  }
+
   /// @brief Serialize an array of structs into a FlatBuffer `vector`.
   /// @tparam T The data type of the struct array elements.
   /// @param[in] v A pointer to the array of type `T` to serialize into the
@@ -991,7 +1019,7 @@ FLATBUFFERS_FINAL_CLASS
   /// @return Returns a typed `Offset` into the serialized data indicating
   /// where the vector is stored.
   template<typename T> Offset<Vector<const T *>> CreateVectorOfStructs(
-                                                       const T *v, size_t len) {
+      const T *v, size_t len) {
     StartVector(len * sizeof(T) / AlignOf<T>(), AlignOf<T>());
     PushBytes(reinterpret_cast<const uint8_t *>(v), sizeof(T) * len);
     return Offset<Vector<const T *>>(EndVector(len));
@@ -1004,7 +1032,7 @@ FLATBUFFERS_FINAL_CLASS
   /// @return Returns a typed `Offset` into the serialized data indicating
   /// where the vector is stored.
   template<typename T> Offset<Vector<const T *>> CreateVectorOfStructs(
-                                                      const std::vector<T> &v) {
+      const std::vector<T> &v) {
     return CreateVectorOfStructs(v.data(), v.size());
   }
 
@@ -1033,7 +1061,7 @@ FLATBUFFERS_FINAL_CLASS
   /// @return Returns a typed `Offset` into the serialized data indicating
   /// where the vector is stored.
   template<typename T> Offset<Vector<Offset<T>>> CreateVectorOfSortedTables(
-                                                     Offset<T> *v, size_t len) {
+      Offset<T> *v, size_t len) {
     std::sort(v, v + len, TableKeyComparator<T>(buf_));
     return CreateVector(v, len);
   }
@@ -1046,7 +1074,7 @@ FLATBUFFERS_FINAL_CLASS
   /// @return Returns a typed `Offset` into the serialized data indicating
   /// where the vector is stored.
   template<typename T> Offset<Vector<Offset<T>>> CreateVectorOfSortedTables(
-                                                    std::vector<Offset<T>> *v) {
+      std::vector<Offset<T>> *v) {
     return CreateVectorOfSortedTables(v->data(), v->size());
   }
 
@@ -1077,7 +1105,7 @@ FLATBUFFERS_FINAL_CLASS
   /// written to at a later time to serialize the data into a `vector`
   /// in the buffer.
   template<typename T> Offset<Vector<T>> CreateUninitializedVector(
-                                                    size_t len, T **buf) {
+      size_t len, T **buf) {
     return CreateUninitializedVector(len, sizeof(T),
                                      reinterpret_cast<uint8_t **>(buf));
   }
@@ -1162,13 +1190,16 @@ template<typename T> const T *GetRoot(const void *buf) {
 }
 
 /// Helpers to get a typed pointer to objects that are currently beeing built.
-/// @warning Creating new objects will lead to reallocations and invalidates the pointer!
-template<typename T> T *GetMutableTemporaryPointer(FlatBufferBuilder &fbb, Offset<T> offset) {
+/// @warning Creating new objects will lead to reallocations and invalidates
+/// the pointer!
+template<typename T> T *GetMutableTemporaryPointer(FlatBufferBuilder &fbb,
+                                                   Offset<T> offset) {
   return reinterpret_cast<T *>(fbb.GetCurrentBufferPointer() +
     fbb.GetSize() - offset.o);
 }
 
-template<typename T> const T *GetTemporaryPointer(FlatBufferBuilder &fbb, Offset<T> offset) {
+template<typename T> const T *GetTemporaryPointer(FlatBufferBuilder &fbb,
+                                                  Offset<T> offset) {
   return GetMutableTemporaryPointer<T>(fbb, offset);
 }
 
diff --git a/tests/MyGame/Example/Monster.cs b/tests/MyGame/Example/Monster.cs
index 6101f464c..fdfd2b0a3 100644
--- a/tests/MyGame/Example/Monster.cs
+++ b/tests/MyGame/Example/Monster.cs
@@ -78,8 +78,10 @@ public sealed class Monster : Table {
   public bool MutateTestf2(float testf2) { int o = __offset(56); if (o != 0) { bb.PutFloat(o + bb_pos, testf2); return true; } else { return false; } }
   public float Testf3 { get { int o = __offset(58); return o != 0 ? bb.GetFloat(o + bb_pos) : (float)0.0f; } }
   public bool MutateTestf3(float testf3) { int o = __offset(58); if (o != 0) { bb.PutFloat(o + bb_pos, testf3); return true; } else { return false; } }
+  public string GetTestarrayofstring2(int j) { int o = __offset(60); return o != 0 ? __string(__vector(o) + j * 4) : null; }
+  public int Testarrayofstring2Length { get { int o = __offset(60); return o != 0 ? __vector_len(o) : 0; } }
 
-  public static void StartMonster(FlatBufferBuilder builder) { builder.StartObject(28); }
+  public static void StartMonster(FlatBufferBuilder builder) { builder.StartObject(29); }
   public static void AddPos(FlatBufferBuilder builder, Offset<Vec3> posOffset) { builder.AddStruct(0, posOffset.Value, 0); }
   public static void AddMana(FlatBufferBuilder builder, short mana) { builder.AddShort(1, mana, 150); }
   public static void AddHp(FlatBufferBuilder builder, short hp) { builder.AddShort(2, hp, 100); }
@@ -118,6 +120,9 @@ public sealed class Monster : Table {
   public static void AddTestf(FlatBufferBuilder builder, float testf) { builder.AddFloat(25, testf, 3.14159f); }
   public static void AddTestf2(FlatBufferBuilder builder, float testf2) { builder.AddFloat(26, testf2, 3.0f); }
   public static void AddTestf3(FlatBufferBuilder builder, float testf3) { builder.AddFloat(27, testf3, 0.0f); }
+  public static void AddTestarrayofstring2(FlatBufferBuilder builder, VectorOffset testarrayofstring2Offset) { builder.AddOffset(28, testarrayofstring2Offset.Value, 0); }
+  public static VectorOffset CreateTestarrayofstring2Vector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); }
+  public static void StartTestarrayofstring2Vector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); }
   public static Offset<Monster> EndMonster(FlatBufferBuilder builder) {
     int o = builder.EndObject();
     builder.Required(o, 10);  // name
diff --git a/tests/MyGame/Example/Monster.go b/tests/MyGame/Example/Monster.go
index fbd849e81..0c42f45a5 100644
--- a/tests/MyGame/Example/Monster.go
+++ b/tests/MyGame/Example/Monster.go
@@ -337,7 +337,24 @@ func (rcv *Monster) Testf3() float32 {
 	return 0.0
 }
 
-func MonsterStart(builder *flatbuffers.Builder) { builder.StartObject(28) }
+func (rcv *Monster) Testarrayofstring2(j int) []byte {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(60))
+	if o != 0 {
+		a := rcv._tab.Vector(o)
+		return rcv._tab.ByteVector(a + flatbuffers.UOffsetT(j * 4))
+	}
+	return nil
+}
+
+func (rcv *Monster) Testarrayofstring2Length() int {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(60))
+	if o != 0 {
+		return rcv._tab.VectorLen(o)
+	}
+	return 0
+}
+
+func MonsterStart(builder *flatbuffers.Builder) { builder.StartObject(29) }
 func MonsterAddPos(builder *flatbuffers.Builder, pos flatbuffers.UOffsetT) { builder.PrependStructSlot(0, flatbuffers.UOffsetT(pos), 0) }
 func MonsterAddMana(builder *flatbuffers.Builder, mana int16) { builder.PrependInt16Slot(1, mana, 150) }
 func MonsterAddHp(builder *flatbuffers.Builder, hp int16) { builder.PrependInt16Slot(2, hp, 100) }
@@ -377,4 +394,7 @@ func MonsterStartTestarrayofboolsVector(builder *flatbuffers.Builder, numElems i
 func MonsterAddTestf(builder *flatbuffers.Builder, testf float32) { builder.PrependFloat32Slot(25, testf, 3.14159) }
 func MonsterAddTestf2(builder *flatbuffers.Builder, testf2 float32) { builder.PrependFloat32Slot(26, testf2, 3.0) }
 func MonsterAddTestf3(builder *flatbuffers.Builder, testf3 float32) { builder.PrependFloat32Slot(27, testf3, 0.0) }
+func MonsterAddTestarrayofstring2(builder *flatbuffers.Builder, testarrayofstring2 flatbuffers.UOffsetT) { builder.PrependUOffsetTSlot(28, flatbuffers.UOffsetT(testarrayofstring2), 0) }
+func MonsterStartTestarrayofstring2Vector(builder *flatbuffers.Builder, numElems int) flatbuffers.UOffsetT { return builder.StartVector(4, numElems, 4)
+}
 func MonsterEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT { return builder.EndObject() }
diff --git a/tests/MyGame/Example/Monster.java b/tests/MyGame/Example/Monster.java
index d85e4baac..bfd4be1c9 100644
--- a/tests/MyGame/Example/Monster.java
+++ b/tests/MyGame/Example/Monster.java
@@ -84,8 +84,10 @@ public final class Monster extends Table {
   public boolean mutateTestf2(float testf2) { int o = __offset(56); if (o != 0) { bb.putFloat(o + bb_pos, testf2); return true; } else { return false; } }
   public float testf3() { int o = __offset(58); return o != 0 ? bb.getFloat(o + bb_pos) : 0.0f; }
   public boolean mutateTestf3(float testf3) { int o = __offset(58); if (o != 0) { bb.putFloat(o + bb_pos, testf3); return true; } else { return false; } }
+  public String testarrayofstring2(int j) { int o = __offset(60); return o != 0 ? __string(__vector(o) + j * 4) : null; }
+  public int testarrayofstring2Length() { int o = __offset(60); return o != 0 ? __vector_len(o) : 0; }
 
-  public static void startMonster(FlatBufferBuilder builder) { builder.startObject(28); }
+  public static void startMonster(FlatBufferBuilder builder) { builder.startObject(29); }
   public static void addPos(FlatBufferBuilder builder, int posOffset) { builder.addStruct(0, posOffset, 0); }
   public static void addMana(FlatBufferBuilder builder, short mana) { builder.addShort(1, mana, 150); }
   public static void addHp(FlatBufferBuilder builder, short hp) { builder.addShort(2, hp, 100); }
@@ -124,6 +126,9 @@ public final class Monster extends Table {
   public static void addTestf(FlatBufferBuilder builder, float testf) { builder.addFloat(25, testf, 3.14159f); }
   public static void addTestf2(FlatBufferBuilder builder, float testf2) { builder.addFloat(26, testf2, 3.0f); }
   public static void addTestf3(FlatBufferBuilder builder, float testf3) { builder.addFloat(27, testf3, 0.0f); }
+  public static void addTestarrayofstring2(FlatBufferBuilder builder, int testarrayofstring2Offset) { builder.addOffset(28, testarrayofstring2Offset, 0); }
+  public static int createTestarrayofstring2Vector(FlatBufferBuilder builder, int[] data) { builder.startVector(4, data.length, 4); for (int i = data.length - 1; i >= 0; i--) builder.addOffset(data[i]); return builder.endVector(); }
+  public static void startTestarrayofstring2Vector(FlatBufferBuilder builder, int numElems) { builder.startVector(4, numElems, 4); }
   public static int endMonster(FlatBufferBuilder builder) {
     int o = builder.endObject();
     builder.required(o, 10);  // name
diff --git a/tests/MyGame/Example/Monster.php b/tests/MyGame/Example/Monster.php
index 9f82d5a9c..c06cffbc6 100644
--- a/tests/MyGame/Example/Monster.php
+++ b/tests/MyGame/Example/Monster.php
@@ -360,22 +360,41 @@ class Monster extends Table
         return $o != 0 ? $this->bb->getFloat($o + $this->bb_pos) : 0.0;
     }
 
+    /**
+     * @param int offset
+     * @return string
+     */
+    public function getTestarrayofstring2($j)
+    {
+        $o = $this->__offset(60);
+        return $o != 0 ? $this->__string($this->__vector($o) + $j * 4) : 0;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTestarrayofstring2Length()
+    {
+        $o = $this->__offset(60);
+        return $o != 0 ? $this->__vector_len($o) : 0;
+    }
+
     /**
      * @param FlatBufferBuilder $builder
      * @return void
      */
     public static function startMonster(FlatBufferBuilder $builder)
     {
-        $builder->StartObject(28);
+        $builder->StartObject(29);
     }
 
     /**
      * @param FlatBufferBuilder $builder
      * @return Monster
      */
-    public static function createMonster(FlatBufferBuilder $builder, $pos, $mana, $hp, $name, $inventory, $color, $test_type, $test, $test4, $testarrayofstring, $testarrayoftables, $enemy, $testnestedflatbuffer, $testempty, $testbool, $testhashs32_fnv1, $testhashu32_fnv1, $testhashs64_fnv1, $testhashu64_fnv1, $testhashs32_fnv1a, $testhashu32_fnv1a, $testhashs64_fnv1a, $testhashu64_fnv1a, $testarrayofbools, $testf, $testf2, $testf3)
+    public static function createMonster(FlatBufferBuilder $builder, $pos, $mana, $hp, $name, $inventory, $color, $test_type, $test, $test4, $testarrayofstring, $testarrayoftables, $enemy, $testnestedflatbuffer, $testempty, $testbool, $testhashs32_fnv1, $testhashu32_fnv1, $testhashs64_fnv1, $testhashu64_fnv1, $testhashs32_fnv1a, $testhashu32_fnv1a, $testhashs64_fnv1a, $testhashu64_fnv1a, $testarrayofbools, $testf, $testf2, $testf3, $testarrayofstring2)
     {
-        $builder->startObject(28);
+        $builder->startObject(29);
         self::addPos($builder, $pos);
         self::addMana($builder, $mana);
         self::addHp($builder, $hp);
@@ -403,6 +422,7 @@ class Monster extends Table
         self::addTestf($builder, $testf);
         self::addTestf2($builder, $testf2);
         self::addTestf3($builder, $testf3);
+        self::addTestarrayofstring2($builder, $testarrayofstring2);
         $o = $builder->endObject();
         $builder->required($o, 10);  // name
         return $o;
@@ -817,6 +837,40 @@ class Monster extends Table
         $builder->addFloatX(27, $testf3, 0.0);
     }
 
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param VectorOffset
+     * @return void
+     */
+    public static function addTestarrayofstring2(FlatBufferBuilder $builder, $testarrayofstring2)
+    {
+        $builder->addOffsetX(28, $testarrayofstring2, 0);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param array offset array
+     * @return int vector offset
+     */
+    public static function createTestarrayofstring2Vector(FlatBufferBuilder $builder, array $data)
+    {
+        $builder->startVector(4, count($data), 4);
+        for ($i = count($data) - 1; $i >= 0; $i--) {
+            $builder->addOffset($data[$i]);
+        }
+        return $builder->endVector();
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param int $numElems
+     * @return void
+     */
+    public static function startTestarrayofstring2Vector(FlatBufferBuilder $builder, $numElems)
+    {
+        $builder->startVector(4, $numElems, 4);
+    }
+
     /**
      * @param FlatBufferBuilder $builder
      * @return int table offset
diff --git a/tests/MyGame/Example/Monster.py b/tests/MyGame/Example/Monster.py
index 4f1ca2dfa..9d2909e89 100644
--- a/tests/MyGame/Example/Monster.py
+++ b/tests/MyGame/Example/Monster.py
@@ -283,7 +283,22 @@ class Monster(object):
             return self._tab.Get(flatbuffers.number_types.Float32Flags, o + self._tab.Pos)
         return 0.0
 
-def MonsterStart(builder): builder.StartObject(28)
+    # Monster
+    def Testarrayofstring2(self, j):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(60))
+        if o != 0:
+            a = self._tab.Vector(o)
+            return self._tab.String(a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
+        return ""
+
+    # Monster
+    def Testarrayofstring2Length(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(60))
+        if o != 0:
+            return self._tab.VectorLen(o)
+        return 0
+
+def MonsterStart(builder): builder.StartObject(29)
 def MonsterAddPos(builder, pos): builder.PrependStructSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(pos), 0)
 def MonsterAddMana(builder, mana): builder.PrependInt16Slot(1, mana, 150)
 def MonsterAddHp(builder, hp): builder.PrependInt16Slot(2, hp, 100)
@@ -317,4 +332,6 @@ def MonsterStartTestarrayofboolsVector(builder, numElems): return builder.StartV
 def MonsterAddTestf(builder, testf): builder.PrependFloat32Slot(25, testf, 3.14159)
 def MonsterAddTestf2(builder, testf2): builder.PrependFloat32Slot(26, testf2, 3.0)
 def MonsterAddTestf3(builder, testf3): builder.PrependFloat32Slot(27, testf3, 0.0)
+def MonsterAddTestarrayofstring2(builder, testarrayofstring2): builder.PrependUOffsetTRelativeSlot(28, flatbuffers.number_types.UOffsetTFlags.py_type(testarrayofstring2), 0)
+def MonsterStartTestarrayofstring2Vector(builder, numElems): return builder.StartVector(4, numElems, 4)
 def MonsterEnd(builder): return builder.EndObject()
diff --git a/tests/monster_test.fbs b/tests/monster_test.fbs
index f302ce444..08e72d4a5 100755
--- a/tests/monster_test.fbs
+++ b/tests/monster_test.fbs
@@ -44,6 +44,7 @@ table Monster {
   /// multiline too
   testarrayoftables:[Monster] (id: 11);
   testarrayofstring:[string] (id: 10);
+  testarrayofstring2:[string] (id: 28);
   testarrayofbools:[bool] (id: 24);
   enemy:MyGame.Example.Monster (id:12);  // Test referring by full namespace.
   test:Any (id: 8);
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index 594c6f7c8..60abbdecd 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -22,8 +22,8 @@ enum Color {
   Color_Red = 1,
   Color_Green = 2,
   Color_Blue = 8,
-  Color_MIN = Color_Red,
-  Color_MAX = Color_Blue
+  Color_NONE = 0,
+  Color_ANY = 11
 };
 
 inline const char **EnumNamesColor() {
@@ -206,7 +206,8 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
     VT_TESTARRAYOFBOOLS = 52,
     VT_TESTF = 54,
     VT_TESTF2 = 56,
-    VT_TESTF3 = 58
+    VT_TESTF3 = 58,
+    VT_TESTARRAYOFSTRING2 = 60
   };
   const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
   Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
@@ -267,6 +268,8 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   bool mutate_testf2(float _testf2) { return SetField(VT_TESTF2, _testf2); }
   float testf3() const { return GetField<float>(VT_TESTF3, 0.0f); }
   bool mutate_testf3(float _testf3) { return SetField(VT_TESTF3, _testf3); }
+  const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *testarrayofstring2() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *>(VT_TESTARRAYOFSTRING2); }
+  flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *mutable_testarrayofstring2() { return GetPointer<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *>(VT_TESTARRAYOFSTRING2); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<Vec3>(verifier, VT_POS) &&
@@ -308,6 +311,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
            VerifyField<float>(verifier, VT_TESTF) &&
            VerifyField<float>(verifier, VT_TESTF2) &&
            VerifyField<float>(verifier, VT_TESTF3) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_TESTARRAYOFSTRING2) &&
+           verifier.Verify(testarrayofstring2()) &&
+           verifier.VerifyVectorOfStrings(testarrayofstring2()) &&
            verifier.EndTable();
   }
 };
@@ -342,10 +348,11 @@ struct MonsterBuilder {
   void add_testf(float testf) { fbb_.AddElement<float>(Monster::VT_TESTF, testf, 3.14159f); }
   void add_testf2(float testf2) { fbb_.AddElement<float>(Monster::VT_TESTF2, testf2, 3.0f); }
   void add_testf3(float testf3) { fbb_.AddElement<float>(Monster::VT_TESTF3, testf3, 0.0f); }
+  void add_testarrayofstring2(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> testarrayofstring2) { fbb_.AddOffset(Monster::VT_TESTARRAYOFSTRING2, testarrayofstring2); }
   MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   MonsterBuilder &operator=(const MonsterBuilder &);
   flatbuffers::Offset<Monster> Finish() {
-    auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 28));
+    auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 29));
     fbb_.Required(o, Monster::VT_NAME);  // name
     return o;
   }
@@ -378,12 +385,14 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
    flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testarrayofbools = 0,
    float testf = 3.14159f,
    float testf2 = 3.0f,
-   float testf3 = 0.0f) {
+   float testf3 = 0.0f,
+   flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> testarrayofstring2 = 0) {
   MonsterBuilder builder_(_fbb);
   builder_.add_testhashu64_fnv1a(testhashu64_fnv1a);
   builder_.add_testhashs64_fnv1a(testhashs64_fnv1a);
   builder_.add_testhashu64_fnv1(testhashu64_fnv1);
   builder_.add_testhashs64_fnv1(testhashs64_fnv1);
+  builder_.add_testarrayofstring2(testarrayofstring2);
   builder_.add_testf3(testf3);
   builder_.add_testf2(testf2);
   builder_.add_testf(testf);
diff --git a/tests/monster_test_generated.js b/tests/monster_test_generated.js
index 8316fbc69..f967b9d83 100644
--- a/tests/monster_test_generated.js
+++ b/tests/monster_test_generated.js
@@ -701,11 +701,29 @@ MyGame.Example.Monster.prototype.testf3 = function() {
   return offset ? this.bb.readFloat32(this.bb_pos + offset) : 0.0;
 };
 
+/**
+ * @param {number} index
+ * @param {flatbuffers.Encoding=} optionalEncoding
+ * @returns {string|Uint8Array}
+ */
+MyGame.Example.Monster.prototype.testarrayofstring2 = function(index, optionalEncoding) {
+  var offset = this.bb.__offset(this.bb_pos, 60);
+  return offset ? this.bb.__string(this.bb.__vector(this.bb_pos + offset) + index * 4, optionalEncoding) : null;
+};
+
+/**
+ * @returns {number}
+ */
+MyGame.Example.Monster.prototype.testarrayofstring2Length = function() {
+  var offset = this.bb.__offset(this.bb_pos, 60);
+  return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0;
+};
+
 /**
  * @param {flatbuffers.Builder} builder
  */
 MyGame.Example.Monster.startMonster = function(builder) {
-  builder.startObject(28);
+  builder.startObject(29);
 };
 
 /**
@@ -1037,6 +1055,35 @@ MyGame.Example.Monster.addTestf3 = function(builder, testf3) {
   builder.addFieldFloat32(27, testf3, 0.0);
 };
 
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {flatbuffers.Offset} testarrayofstring2Offset
+ */
+MyGame.Example.Monster.addTestarrayofstring2 = function(builder, testarrayofstring2Offset) {
+  builder.addFieldOffset(28, testarrayofstring2Offset, 0);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {Array.<flatbuffers.Offset>} data
+ * @returns {flatbuffers.Offset}
+ */
+MyGame.Example.Monster.createTestarrayofstring2Vector = function(builder, data) {
+  builder.startVector(4, data.length, 4);
+  for (var i = data.length - 1; i >= 0; i--) {
+    builder.addOffset(data[i]);
+  }
+  return builder.endVector();
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @param {number} numElems
+ */
+MyGame.Example.Monster.startTestarrayofstring2Vector = function(builder, numElems) {
+  builder.startVector(4, numElems, 4);
+};
+
 /**
  * @param {flatbuffers.Builder} builder
  * @returns {flatbuffers.Offset}
diff --git a/tests/monsterdata_test.mon b/tests/monsterdata_test.mon
index 7a7fbf707f84e8b7ef957001da0ce8b3d9a89324..01bd5279453ac6fd4e290c1d5a3b8537275d9619 100644
GIT binary patch
delta 156
zcmZo*ZeaHGU|?YI_4f;AV6bDTVc-Dr*cfzxqyZ4KGMF$}FxUWD4nPb7E({(F5ex|o
zJ`4d284LvsArN68X*bbRTl5c*@dk*m0C5Wt#{jX*#EHU;8WWc)^8z^x%s|Wtgu5nQ
cbOs98fo%jyuuN8D)Sqm?$iiqhIgn8w05${_r~m)}

delta 171
zcmZo*ZeaHGU|?YI_4f+~QVcc>4GbJWnvKB(NLm0fD^SdV!3D?ysRIEYh5&{Hh75)f
zh6siNh6;ulh%kfAL{Du)D4XF6knseF&j4`)5Jv#90}wl&th@`tg-aUyKv-qsTxCvX
gpadfj?wNSjncD{J0H6p1%Vb4HeW0Ap<UmG!0B0&43;+NC

diff --git a/tests/test.cpp b/tests/test.cpp
index ca3ea03ab..bd85da231 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -114,13 +114,17 @@ flatbuffers::unique_ptr_t CreateFlatBufferTest(std::string &buffer) {
   mb3.add_name(wilma);
   mlocs[2] = mb3.Finish();
 
-  // Create an array of strings. Also test string pooling.
-  flatbuffers::Offset<flatbuffers::String> strings[4];
-  strings[0] = builder.CreateSharedString("bob");
-  strings[1] = builder.CreateSharedString("fred");
-  strings[2] = builder.CreateSharedString("bob");
-  strings[3] = builder.CreateSharedString("fred");
-  auto vecofstrings = builder.CreateVector(strings, 4);
+  // Create an array of strings. Also test string pooling, and lambdas.
+  const char *names[] = { "bob", "fred", "bob", "fred" };
+  auto vecofstrings =
+      builder.CreateVector<flatbuffers::Offset<flatbuffers::String>>(4,
+        [&](size_t i) {
+    return builder.CreateSharedString(names[i]);
+  });
+
+  // Creating vectors of strings in one convenient call.
+  std::vector<std::string> names2 = { "jane", "mary" };
+  auto vecofstrings2 = builder.CreateVectorOfStrings(names2);
 
   // Create an array of sorted tables, can be used with binary search when read:
   auto vecoftables = builder.CreateVectorOfSortedTables(mlocs, 3);
@@ -128,7 +132,9 @@ flatbuffers::unique_ptr_t CreateFlatBufferTest(std::string &buffer) {
   // shortcut for creating monster with all fields set:
   auto mloc = CreateMonster(builder, &vec, 150, 80, name, inventory, Color_Blue,
                             Any_Monster, mlocs[1].Union(), // Store a union.
-                            testv, vecofstrings, vecoftables, 0);
+                            testv, vecofstrings, vecoftables, 0, 0, 0, false,
+                            0, 0, 0, 0, 0, 0, 0, 0, 0, 3.14159f, 3.0f, 0.0f,
+                            vecofstrings2);
 
   FinishMonsterBuffer(builder, mloc);
 
@@ -198,6 +204,13 @@ void AccessFlatBufferTest(const uint8_t *flatbuf, size_t length) {
   TEST_EQ(vecofstrings->Get(0)->c_str(), vecofstrings->Get(2)->c_str());
   TEST_EQ(vecofstrings->Get(1)->c_str(), vecofstrings->Get(3)->c_str());
 
+  auto vecofstrings2 = monster->testarrayofstring2();
+  if (vecofstrings2) {
+    TEST_EQ(vecofstrings2->Length(), 2U);
+    TEST_EQ_STR(vecofstrings2->Get(0)->c_str(), "jane");
+    TEST_EQ_STR(vecofstrings2->Get(1)->c_str(), "mary");
+  }
+
   // Example of accessing a vector of tables:
   auto vecoftables = monster->testarrayoftables();
   TEST_EQ(vecoftables->Length(), 3U);

From d3ac0bc149a9e62feec8e3a00f10ca88491e2254 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 15 Jun 2016 13:54:17 -0700
Subject: [PATCH 169/185] Added conversion operations that can be used inline
 in JSON.

e.g.: { myfield: cos(rad(180)) } is equivalent to writing { myfield: -1.0 }

Bug: 29338398
Change-Id: I6fc4ef1fd10bda3ba78cba464414dd071a2f50ca
Tested: on Linux.
---
 docs/source/Schemas.md |  4 ++++
 src/idl_parser.cpp     | 34 ++++++++++++++++++++++++++++++++--
 tests/test.cpp         | 23 ++++++++++++++++-------
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/docs/source/Schemas.md b/docs/source/Schemas.md
index 4004803de..14bd3bd0e 100755
--- a/docs/source/Schemas.md
+++ b/docs/source/Schemas.md
@@ -333,6 +333,10 @@ JSON:
 -   A field that has the value `null` (e.g. `field: null`) is intended to
     have the default value for that field (thus has the same effect as if
     that field wasn't specified at all).
+-   It has some built in conversion functions, so you can write for example
+    `rad(180)` where ever you'd normally write `3.14159`.
+    Currently supports the following functions: `rad`, `deg`, `cos`, `sin`,
+    `tan`, `acos`, `asin`, `atan`.
 
 When parsing JSON, it recognizes the following escape codes in strings:
 
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index f5badab16..66e794b3d 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -17,6 +17,14 @@
 #include <algorithm>
 #include <list>
 
+#ifdef _WIN32
+#if !defined(_USE_MATH_DEFINES)
+#define _USE_MATH_DEFINES  // For M_PI.
+#endif                     // !defined(_USE_MATH_DEFINES)
+#endif                     // _WIN32
+
+#include <math.h>
+
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
 
@@ -1004,8 +1012,30 @@ CheckedError Parser::ParseHash(Value &e, FieldDef* field) {
 }
 
 CheckedError Parser::ParseSingleValue(Value &e) {
-  // First check if this could be a string/identifier enum value:
-  if (e.type.base_type != BASE_TYPE_STRING &&
+  // First see if this could be a conversion function:
+  if (token_ == kTokenIdentifier && *cursor_ == '(') {
+    auto functionname = attribute_;
+    NEXT();
+    EXPECT('(');
+    ECHECK(ParseSingleValue(e));
+    EXPECT(')');
+    #define FLATBUFFERS_FN_DOUBLE(name, op) \
+      if (functionname == name) { \
+        auto x = strtod(e.constant.c_str(), nullptr); \
+        e.constant = NumToString(op); \
+      }
+    FLATBUFFERS_FN_DOUBLE("deg", x / M_PI * 180);
+    FLATBUFFERS_FN_DOUBLE("rad", x * M_PI / 180);
+    FLATBUFFERS_FN_DOUBLE("sin", sin(x));
+    FLATBUFFERS_FN_DOUBLE("cos", cos(x));
+    FLATBUFFERS_FN_DOUBLE("tan", tan(x));
+    FLATBUFFERS_FN_DOUBLE("asin", asin(x));
+    FLATBUFFERS_FN_DOUBLE("acos", acos(x));
+    FLATBUFFERS_FN_DOUBLE("atan", atan(x));
+    // TODO(wvo): add more useful conversion functions here.
+    #undef FLATBUFFERS_FN_DOUBLE
+  // Then check if this could be a string/identifier enum value:
+  } else if (e.type.base_type != BASE_TYPE_STRING &&
       e.type.base_type != BASE_TYPE_NONE &&
       (token_ == kTokenIdentifier || token_ == kTokenStringConstant)) {
     if (IsIdentifierStart(attribute_[0])) {  // Enum value.
diff --git a/tests/test.cpp b/tests/test.cpp
index bd85da231..73e009c20 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -814,20 +814,29 @@ void ErrorTest() {
   TestError("table X { Y:byte; } root_type X; { Y:1, Y:2 }", "more than once");
 }
 
-// Additional parser testing not covered elsewhere.
-void ScientificTest() {
+float TestValue(const char *json) {
   flatbuffers::Parser parser;
 
   // Simple schema.
   TEST_EQ(parser.Parse("table X { Y:float; } root_type X;"), true);
 
-  // Test scientific notation numbers.
-  TEST_EQ(parser.Parse("{ Y:0.0314159e+2 }"), true);
+  TEST_EQ(parser.Parse(json), true);
   auto root = flatbuffers::GetRoot<float>(parser.builder_.GetBufferPointer());
   // root will point to the table, which is a 32bit vtable offset followed
   // by a float:
-  TEST_EQ(sizeof(flatbuffers::soffset_t) == 4 &&  // Test assumes 32bit offsets
-          fabs(root[1] - 3.14159) < 0.001, true);
+  TEST_EQ(sizeof(flatbuffers::soffset_t), 4);  // Test assumes 32bit offsets
+  return root[1];
+}
+
+bool FloatCompare(float a, float b) { return fabs(a - b) < 0.001; }
+
+// Additional parser testing not covered elsewhere.
+void ValueTest() {
+  // Test scientific notation numbers.
+  TEST_EQ(FloatCompare(TestValue("{ Y:0.0314159e+2 }"), 3.14159), true);
+
+  // Test conversion functions.
+  TEST_EQ(FloatCompare(TestValue("{ Y:cos(rad(180)) }"), -1), true);
 }
 
 void EnumStringsTest() {
@@ -963,7 +972,7 @@ int main(int /*argc*/, const char * /*argv*/[]) {
   FuzzTest2();
 
   ErrorTest();
-  ScientificTest();
+  ValueTest();
   EnumStringsTest();
   IntegerOutOfRangeTest();
   UnicodeTest();

From fd43d3709e7fd84b201e0a80da0238b8b690191a Mon Sep 17 00:00:00 2001
From: rw <me@rwinslow.com>
Date: Sat, 18 Jun 2016 01:12:56 -0700
Subject: [PATCH 170/185] Fix test using compat.binary_types (from March).

---
 tests/py_test.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/py_test.py b/tests/py_test.py
index d12cfb43d..82f839005 100644
--- a/tests/py_test.py
+++ b/tests/py_test.py
@@ -162,9 +162,10 @@ class TestFuzz(unittest.TestCase):
     ''' Low level stress/fuzz test: serialize/deserialize a variety of
         different kinds of data in different combinations '''
 
-    ofInt32Bytes = compat.binary_type([0x83, 0x33, 0x33, 0x33])
-    ofInt64Bytes = compat.binary_type([0x84, 0x44, 0x44, 0x44,
-                                       0x44, 0x44, 0x44, 0x44])
+    binary_type = compat.binary_types[0] # this will always exist
+    ofInt32Bytes = binary_type([0x83, 0x33, 0x33, 0x33])
+    ofInt64Bytes = binary_type([0x84, 0x44, 0x44, 0x44,
+                                0x44, 0x44, 0x44, 0x44])
     overflowingInt32Val = flatbuffers.encode.Get(flatbuffers.packer.int32,
                                                  ofInt32Bytes, 0)
     overflowingInt64Val = flatbuffers.encode.Get(flatbuffers.packer.int64,

From 3639032d1e2224663202f79ca33c5039eed95f29 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Fri, 17 Jun 2016 18:16:11 -0700
Subject: [PATCH 171/185] Allow unions of table types with the same name but
 from different namespaces.

Also fixed most codegenerators using the wrong namespace when multiple
namespace were used in a file, with some files not being generated.

Change-Id: Ib42969221239d7244e431cbd667ef69200fc415f
Tested: on Linux.
Bug: 29338474
---
 include/flatbuffers/code_generators.h         |  23 ++--
 src/idl_gen_general.cpp                       |  36 ++++---
 src/idl_gen_go.cpp                            |   5 +-
 src/idl_gen_php.cpp                           |   7 +-
 src/idl_gen_python.cpp                        |   5 +-
 src/idl_parser.cpp                            |   8 +-
 tests/MyGame/Example/Any.cs                   |   1 +
 tests/MyGame/Example/Any.go                   |   1 +
 tests/MyGame/Example/Any.java                 |   3 +-
 tests/MyGame/Example/Any.php                  |   2 +
 tests/MyGame/Example/Any.py                   |   1 +
 tests/MyGame/Example2/Monster.cs              |  23 ++++
 tests/MyGame/Example2/Monster.go              |  18 ++++
 tests/MyGame/Example2/Monster.java            |  23 ++++
 tests/MyGame/Example2/Monster.php             |  79 ++++++++++++++
 tests/MyGame/Example2/Monster.py              |  15 +++
 tests/monster_test.bfbs                       | Bin 3008 -> 3152 bytes
 tests/monster_test.fbs                        |   6 +-
 tests/monster_test_generated.h                |  43 +++++++-
 tests/monster_test_generated.js               |  59 ++++++++++-
 tests/namespace_test/NamespaceC/TableInC.cs   |  38 +++++++
 tests/namespace_test/NamespaceC/TableInC.go   |  46 ++++++++
 tests/namespace_test/NamespaceC/TableInC.java |  38 +++++++
 tests/namespace_test/NamespaceC/TableInC.php  | 100 ++++++++++++++++++
 tests/namespace_test/NamespaceC/TableInC.py   |  39 +++++++
 25 files changed, 584 insertions(+), 35 deletions(-)
 create mode 100644 tests/MyGame/Example2/Monster.cs
 create mode 100644 tests/MyGame/Example2/Monster.go
 create mode 100644 tests/MyGame/Example2/Monster.java
 create mode 100644 tests/MyGame/Example2/Monster.php
 create mode 100644 tests/MyGame/Example2/Monster.py
 create mode 100644 tests/namespace_test/NamespaceC/TableInC.cs
 create mode 100644 tests/namespace_test/NamespaceC/TableInC.go
 create mode 100644 tests/namespace_test/NamespaceC/TableInC.java
 create mode 100644 tests/namespace_test/NamespaceC/TableInC.php
 create mode 100644 tests/namespace_test/NamespaceC/TableInC.py

diff --git a/include/flatbuffers/code_generators.h b/include/flatbuffers/code_generators.h
index 95fa0c1ac..dc5f6bdd8 100644
--- a/include/flatbuffers/code_generators.h
+++ b/include/flatbuffers/code_generators.h
@@ -24,11 +24,12 @@ class BaseGenerator {
   virtual bool generate() = 0;
 
   static const std::string NamespaceDir(const Parser &parser,
-                                        const std::string &path) {
+                                        const std::string &path,
+                                        const Namespace &ns) {
     EnsureDirExists(path.c_str());
     if (parser.opts.one_file) return path;
     std::string namespace_dir = path;  // Either empty or ends in separator.
-    auto &namespaces = parser.namespaces_.back()->components;
+    auto &namespaces = ns.components;
     for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
       namespace_dir += *it + kPathSeparator;
       EnsureDirExists(namespace_dir.c_str());
@@ -41,14 +42,17 @@ class BaseGenerator {
                 const std::string &file_name)
       : parser_(parser),
         path_(path),
-        file_name_(file_name),
-        namespace_dir_(BaseGenerator::NamespaceDir(parser, path)){};
-  virtual ~BaseGenerator(){};
+        file_name_(file_name) {};
+  virtual ~BaseGenerator() {};
 
   // No copy/assign.
   BaseGenerator &operator=(const BaseGenerator &);
   BaseGenerator(const BaseGenerator &);
 
+  const std::string NamespaceDir(const Namespace &ns) {
+    return BaseGenerator::NamespaceDir(parser_, path_, ns);
+  }
+
   const char *FlatBuffersGeneratedWarning() {
     return "automatically generated by the FlatBuffers compiler,"
            " do not modify\n\n";
@@ -66,9 +70,9 @@ class BaseGenerator {
     return true;
   }
 
-  std::string FullNamespace(const char *separator) {
+  std::string FullNamespace(const char *separator, const Namespace &ns) {
     std::string namespace_name;
-    auto &namespaces = parser_.namespaces_.back()->components;
+    auto &namespaces = ns.components;
     for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
       if (namespace_name.length()) namespace_name += separator;
       namespace_name += *it;
@@ -76,15 +80,14 @@ class BaseGenerator {
     return namespace_name;
   }
 
-  const std::string LastNamespacePart() {
-    auto &namespaces = parser_.namespaces_.back()->components;
+  const std::string LastNamespacePart(const Namespace &ns) {
+    auto &namespaces = ns.components;
     if (namespaces.size()) return *(namespaces.end() - 1); else return std::string("");
   }
 
   const Parser &parser_;
   const std::string &path_;
   const std::string &file_name_;
-  const std::string namespace_dir_;
 };
 
 }  // namespace flatbuffers
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index a0b837a20..36dbd64ba 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -1129,27 +1129,32 @@ class GeneralGenerator : public BaseGenerator {
     for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
          ++it) {
       std::string enumcode;
-      GenEnum(lang, parser_, **it, &enumcode);
+      auto &enum_def = **it;
+      GenEnum(lang, parser_, enum_def, &enumcode);
       if (parser_.opts.one_file) {
         one_file_code += enumcode;
       } else {
-        if (!SaveType(lang, (**it).name, enumcode, false)) return false;
+        if (!SaveType(lang, enum_def.name, *enum_def.defined_namespace,
+                      enumcode, false)) return false;
       }
     }
 
     for (auto it = parser_.structs_.vec.begin();
          it != parser_.structs_.vec.end(); ++it) {
       std::string declcode;
-      GenStruct(lang, parser_, **it, &declcode);
+      auto &struct_def = **it;
+      GenStruct(lang, parser_, struct_def, &declcode);
       if (parser_.opts.one_file) {
         one_file_code += declcode;
       } else {
-        if (!SaveType(lang, (**it).name, declcode, true)) return false;
+        if (!SaveType(lang, struct_def.name, *struct_def.defined_namespace,
+                      declcode, true)) return false;
       }
     }
 
     if (parser_.opts.one_file) {
-      return SaveType(lang, file_name_, one_file_code, true);
+      return SaveType(lang, file_name_, *parser_.namespaces_.back(),
+                      one_file_code, true);
     }
     return true;
   }
@@ -1157,12 +1162,13 @@ class GeneralGenerator : public BaseGenerator {
   // Save out the generated code for a single class while adding
   // declaration boilerplate.
   bool SaveType(const LanguageParameters &lang, const std::string &defname,
-                const std::string &classcode, bool needs_includes) {
+                const Namespace &ns, const std::string &classcode,
+                bool needs_includes) {
     if (!classcode.length()) return true;
 
     std::string code;
     code = code + "// " + FlatBuffersGeneratedWarning();
-    std::string namespace_name = FullNamespace(".");
+    std::string namespace_name = FullNamespace(".", ns);
     if (!namespace_name.empty()) {
       code += lang.namespace_ident + namespace_name + lang.namespace_begin;
       code += "\n\n";
@@ -1170,7 +1176,7 @@ class GeneralGenerator : public BaseGenerator {
     if (needs_includes) code += lang.includes;
     code += classcode;
     if (!namespace_name.empty()) code += lang.namespace_end;
-    auto filename = namespace_dir_ + defname + lang.file_extension;
+    auto filename = NamespaceDir(ns) + defname + lang.file_extension;
     return SaveFile(filename.c_str(), code, false);
   }
 };
@@ -1188,19 +1194,25 @@ std::string GeneralMakeRule(const Parser &parser, const std::string &path,
   auto lang = language_parameters[parser.opts.lang];
 
   std::string make_rule;
-  std::string directory =
-      BaseGenerator::NamespaceDir(parser, path) + kPathSeparator;
 
   for (auto it = parser.enums_.vec.begin(); it != parser.enums_.vec.end();
        ++it) {
+    auto &enum_def = **it;
     if (make_rule != "") make_rule += " ";
-    make_rule += directory + (**it).name + lang.file_extension;
+    std::string directory =
+        BaseGenerator::NamespaceDir(parser, path, *enum_def.defined_namespace) +
+        kPathSeparator;
+    make_rule += directory + enum_def.name + lang.file_extension;
   }
 
   for (auto it = parser.structs_.vec.begin(); it != parser.structs_.vec.end();
        ++it) {
+    auto &struct_def = **it;
     if (make_rule != "") make_rule += " ";
-    make_rule += directory + (**it).name + lang.file_extension;
+    std::string directory =
+        BaseGenerator::NamespaceDir(parser, path, *struct_def.defined_namespace) +
+        kPathSeparator;
+    make_rule += directory + struct_def.name + lang.file_extension;
   }
 
   make_rule += ": ";
diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp
index 5841e121c..5c60c1052 100644
--- a/src/idl_gen_go.cpp
+++ b/src/idl_gen_go.cpp
@@ -664,9 +664,10 @@ class GoGenerator : public BaseGenerator {
     if (!classcode.length()) return true;
 
     std::string code = "";
-    BeginFile(LastNamespacePart(), needs_imports, &code);
+    BeginFile(LastNamespacePart(*def.defined_namespace), needs_imports, &code);
     code += classcode;
-    std::string filename = namespace_dir_ + def.name + ".go";
+    std::string filename =
+        NamespaceDir(*def.defined_namespace) + def.name + ".go";
     return SaveFile(filename.c_str(), code, false);
   }
 };
diff --git a/src/idl_gen_php.cpp b/src/idl_gen_php.cpp
index 599d5571d..68ddc8171 100644
--- a/src/idl_gen_php.cpp
+++ b/src/idl_gen_php.cpp
@@ -985,11 +985,12 @@ namespace php {
         if (!classcode.length()) return true;
 
         std::string code = "";
-        BeginFile(FullNamespace("\\"), needs_imports, &code);
+        BeginFile(FullNamespace("\\", *def.defined_namespace),
+                  needs_imports, &code);
         code += classcode;
 
-        std::string filename =
-            namespace_dir_ + kPathSeparator + def.name + ".php";
+        std::string filename = NamespaceDir(*def.defined_namespace) +
+                               kPathSeparator + def.name + ".php";
         return SaveFile(filename.c_str(), code, false);
       }
     };
diff --git a/src/idl_gen_python.cpp b/src/idl_gen_python.cpp
index 7b8d168c1..5f5c6be3b 100644
--- a/src/idl_gen_python.cpp
+++ b/src/idl_gen_python.cpp
@@ -652,9 +652,10 @@ class PythonGenerator : public BaseGenerator {
     }
 
     std::string code = "";
-    BeginFile(LastNamespacePart(), needs_imports, &code);
+    BeginFile(LastNamespacePart(*def.defined_namespace), needs_imports, &code);
     code += classcode;
-    std::string filename = namespace_dir_ + kPathSeparator + def.name + ".py";
+    std::string filename = NamespaceDir(*def.defined_namespace) +
+                           kPathSeparator + def.name + ".py";
     return SaveFile(filename.c_str(), code, false);
   }
 };
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 66e794b3d..518283de5 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -1180,7 +1180,13 @@ CheckedError Parser::ParseEnum(bool is_union, EnumDef **dest) {
       auto full_name = value_name;
       std::vector<std::string> value_comment = doc_comment_;
       EXPECT(kTokenIdentifier);
-      if (is_union) ECHECK(ParseNamespacing(&full_name, &value_name));
+      if (is_union) {
+        ECHECK(ParseNamespacing(&full_name, &value_name));
+        // Since we can't namespace the actual enum identifiers, turn
+        // namespace parts into part of the identifier.
+        value_name = full_name;
+        std::replace(value_name.begin(), value_name.end(), '.', '_');
+      }
       auto prevsize = enum_def.vals.vec.size();
       auto value = enum_def.vals.vec.size()
         ? enum_def.vals.vec.back()->value + 1
diff --git a/tests/MyGame/Example/Any.cs b/tests/MyGame/Example/Any.cs
index 1f018ad89..8fdc2fca1 100644
--- a/tests/MyGame/Example/Any.cs
+++ b/tests/MyGame/Example/Any.cs
@@ -8,6 +8,7 @@ public enum Any : byte
  NONE = 0,
  Monster = 1,
  TestSimpleTableWithEnum = 2,
+ MyGame_Example2_Monster = 3,
 };
 
 
diff --git a/tests/MyGame/Example/Any.go b/tests/MyGame/Example/Any.go
index 0322364c6..df9f823fc 100644
--- a/tests/MyGame/Example/Any.go
+++ b/tests/MyGame/Example/Any.go
@@ -6,4 +6,5 @@ const (
 	AnyNONE = 0
 	AnyMonster = 1
 	AnyTestSimpleTableWithEnum = 2
+	AnyMyGame_Example2_Monster = 3
 )
diff --git a/tests/MyGame/Example/Any.java b/tests/MyGame/Example/Any.java
index 27dc1bcb9..25d74af55 100644
--- a/tests/MyGame/Example/Any.java
+++ b/tests/MyGame/Example/Any.java
@@ -7,8 +7,9 @@ public final class Any {
   public static final byte NONE = 0;
   public static final byte Monster = 1;
   public static final byte TestSimpleTableWithEnum = 2;
+  public static final byte MyGame_Example2_Monster = 3;
 
-  private static final String[] names = { "NONE", "Monster", "TestSimpleTableWithEnum", };
+  private static final String[] names = { "NONE", "Monster", "TestSimpleTableWithEnum", "MyGame_Example2_Monster", };
 
   public static String name(int e) { return names[e]; }
 };
diff --git a/tests/MyGame/Example/Any.php b/tests/MyGame/Example/Any.php
index f04f4ad3f..da691760c 100644
--- a/tests/MyGame/Example/Any.php
+++ b/tests/MyGame/Example/Any.php
@@ -8,11 +8,13 @@ class Any
     const NONE = 0;
     const Monster = 1;
     const TestSimpleTableWithEnum = 2;
+    const MyGame_Example2_Monster = 3;
 
     private static $names = array(
         "NONE",
         "Monster",
         "TestSimpleTableWithEnum",
+        "MyGame_Example2_Monster",
     );
 
     public static function Name($e)
diff --git a/tests/MyGame/Example/Any.py b/tests/MyGame/Example/Any.py
index b642ede01..f1b8d519d 100644
--- a/tests/MyGame/Example/Any.py
+++ b/tests/MyGame/Example/Any.py
@@ -6,4 +6,5 @@ class Any(object):
     NONE = 0
     Monster = 1
     TestSimpleTableWithEnum = 2
+    MyGame_Example2_Monster = 3
 
diff --git a/tests/MyGame/Example2/Monster.cs b/tests/MyGame/Example2/Monster.cs
new file mode 100644
index 000000000..e6c512abc
--- /dev/null
+++ b/tests/MyGame/Example2/Monster.cs
@@ -0,0 +1,23 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+namespace MyGame.Example2
+{
+
+using System;
+using FlatBuffers;
+
+public sealed class Monster : Table {
+  public static Monster GetRootAsMonster(ByteBuffer _bb) { return GetRootAsMonster(_bb, new Monster()); }
+  public static Monster GetRootAsMonster(ByteBuffer _bb, Monster obj) { return (obj.__init(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
+  public Monster __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+
+  public static void StartMonster(FlatBufferBuilder builder) { builder.StartObject(0); }
+  public static Offset<MyGame.Example2.Monster> EndMonster(FlatBufferBuilder builder) {
+    int o = builder.EndObject();
+    return new Offset<MyGame.Example2.Monster>(o);
+  }
+};
+
+
+}
diff --git a/tests/MyGame/Example2/Monster.go b/tests/MyGame/Example2/Monster.go
new file mode 100644
index 000000000..e12b05453
--- /dev/null
+++ b/tests/MyGame/Example2/Monster.go
@@ -0,0 +1,18 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package Example2
+
+import (
+	flatbuffers "github.com/google/flatbuffers/go"
+)
+type Monster struct {
+	_tab flatbuffers.Table
+}
+
+func (rcv *Monster) Init(buf []byte, i flatbuffers.UOffsetT) {
+	rcv._tab.Bytes = buf
+	rcv._tab.Pos = i
+}
+
+func MonsterStart(builder *flatbuffers.Builder) { builder.StartObject(0) }
+func MonsterEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT { return builder.EndObject() }
diff --git a/tests/MyGame/Example2/Monster.java b/tests/MyGame/Example2/Monster.java
new file mode 100644
index 000000000..6432494f3
--- /dev/null
+++ b/tests/MyGame/Example2/Monster.java
@@ -0,0 +1,23 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package MyGame.Example2;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class Monster extends Table {
+  public static Monster getRootAsMonster(ByteBuffer _bb) { return getRootAsMonster(_bb, new Monster()); }
+  public static Monster getRootAsMonster(ByteBuffer _bb, Monster obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__init(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public Monster __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+
+  public static void startMonster(FlatBufferBuilder builder) { builder.startObject(0); }
+  public static int endMonster(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+};
+
diff --git a/tests/MyGame/Example2/Monster.php b/tests/MyGame/Example2/Monster.php
new file mode 100644
index 000000000..b00f150e5
--- /dev/null
+++ b/tests/MyGame/Example2/Monster.php
@@ -0,0 +1,79 @@
+<?php
+// automatically generated by the FlatBuffers compiler, do not modify
+
+namespace MyGame\Example2;
+
+use \Google\FlatBuffers\Struct;
+use \Google\FlatBuffers\Table;
+use \Google\FlatBuffers\ByteBuffer;
+use \Google\FlatBuffers\FlatBufferBuilder;
+
+class Monster extends Table
+{
+    /**
+     * @param ByteBuffer $bb
+     * @return Monster
+     */
+    public static function getRootAsMonster(ByteBuffer $bb)
+    {
+        $obj = new Monster();
+        return ($obj->init($bb->getInt($bb->getPosition()) + $bb->getPosition(), $bb));
+    }
+
+    public static function MonsterIdentifier()
+    {
+        return "MONS";
+    }
+
+    public static function MonsterBufferHasIdentifier(ByteBuffer $buf)
+    {
+        return self::__has_identifier($buf, self::MonsterIdentifier());
+    }
+
+    public static function MonsterExtension()
+    {
+        return "mon";
+    }
+
+    /**
+     * @param int $_i offset
+     * @param ByteBuffer $_bb
+     * @return Monster
+     **/
+    public function init($_i, ByteBuffer $_bb)
+    {
+        $this->bb_pos = $_i;
+        $this->bb = $_bb;
+        return $this;
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return void
+     */
+    public static function startMonster(FlatBufferBuilder $builder)
+    {
+        $builder->StartObject(0);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return Monster
+     */
+    public static function createMonster(FlatBufferBuilder $builder, )
+    {
+        $builder->startObject(0);
+        $o = $builder->endObject();
+        return $o;
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return int table offset
+     */
+    public static function endMonster(FlatBufferBuilder $builder)
+    {
+        $o = $builder->endObject();
+        return $o;
+    }
+}
diff --git a/tests/MyGame/Example2/Monster.py b/tests/MyGame/Example2/Monster.py
new file mode 100644
index 000000000..0b98211e4
--- /dev/null
+++ b/tests/MyGame/Example2/Monster.py
@@ -0,0 +1,15 @@
+# automatically generated by the FlatBuffers compiler, do not modify
+
+# namespace: Example2
+
+import flatbuffers
+
+class Monster(object):
+    __slots__ = ['_tab']
+
+    # Monster
+    def Init(self, buf, pos):
+        self._tab = flatbuffers.table.Table(buf, pos)
+
+def MonsterStart(builder): builder.StartObject(0)
+def MonsterEnd(builder): return builder.EndObject()
diff --git a/tests/monster_test.bfbs b/tests/monster_test.bfbs
index e16b2bd13ce4dce50406e3a089d132f4ebf28688..e131ac8c2ee97914bfc1c02ce683ac4f5ecb43d6 100644
GIT binary patch
delta 1100
zcmYjPO-NKx82#>>nK$o^Gioy8&y0+#M1wSc5e!Q-Tcj09*h(iF(-=q7A)FwLf`|}F
zzLEli7A_1VibM!RL?SdIB&2eYNUIhu+Gve`uXEp3@WFZKo_D_cy>ox&vX-*LK_aR<
zQ+El3CzZ0vNd|c-o%~RQH&F>t1Jnbp8j&0PA%*B1#xn+y6XU3dXbs$A5;@?@IYEKC
zkt<b$`4IBs=~x2oF$s7Ev;gVA=!Rv1P)_v8vMl?jXeQ?zJXshtB^txsk+z0`aCdJs
zQrgzk6YGyh`rvr%;9f*W4m<P&f*_xKM!r{w8up2-%)LF!k^v-|&o?(n_bOM5P)<8W
z<$#QHZ_|$Bka_0$rpVKYejyf*iD0JR-XQr$RcwdmMR8vn+vH{~cQ6meL;N6)^gG}w
z7tthm9oz}{(ajIN2EQEaM~88YPhnmscnYb10H2}n0<AzV^d#yGa6PyL90e}`PGA{&
z{I6vNsip{ffUO5IfOw=o9`5T4Cwe;i<9%JR>!n!Iwp?DSZ<&8;0Wr);tys)*p`+2%
z|Je&q>E(o@SiIy{jsmkoee*2wile|Ys+37d_BfB4AC)vpxY}7@ZYt$&=PszDNxPZn
zF+Yd8tdu#&i%<`gGX8K9YFa6GJ{P(|=BiTKS-$8B`DVB5E@@aG#rck_Oib`wSHPER
zFM`srctSK+u`Wl>ZBEsXi*i1xA9G<Z=^A(I0pB-OEYFsP_^BS!v>l$-OMR6)c6a-v
z*Lg$l5nCK__lp>>xNF60&M_LrCWnns>X%)W1BXZHyF6?Zi8uV-2$(mNp<_3VEb)jp
zj4E?pee*@R!mKTf;?lV&*FF~+0e8SYmoo4wJW!g<`h;JYfk7P?4Z@Bz1J{8oDNpq9
z%oEVJ)J*RhSVM)Z@d9!iZUdvrPa*UZ`*-%hPr#qv_kV*A%{@W`Fu(4b3*dLHo=TCC
TeyD{C!xyw{Twfv{N-6&j>n02Z

delta 964
zcmYjPZ%9*76u)<SZ+rJ`FBe#QwrU13vm$E-Y8fsemmf4CsR$8+7Wu^@CEO4d8dBf1
z^F<>fqNHF+e<1o0VIk2cF(@!77!g8YAQ8*7T)+G73LpIVo!{@Ad+xcsGh<H%4Vy7m
z-%x*a#BbN^L|hHTfKnG@9<U8=H5kj7j1>bXe2mRQyOG-sd<KR`PE{S)h(MYLyOIv4
z5qAL6zqXRkgE)ZCWH!^7pBaeI6u3+luj4Ul;=y%GsMX*}G#_a`1Y+%!<l&ODh-!fV
za4Y9@bjy~X=po;<-$W-3J!OAYgUSDYI->Z6M4}7Xz^Xbwd``OSl4dOC^H=@$fSk7#
zm&fp!*Wf`M?FByt?*+0F$YtbX;b%eT5my6gTzMC`4zC5+2E?HIFy<^!EXRee1&;!6
zA#X!Z{mkb>Y@eK-j=R_Le(H2r@Ch1o$3+e~l=(X73%p?}(aOXz%nHw(q(-gG98yXw
zEK*8~h$l)KrF0Lab4qzz=snc>U+Ul>3B61-C?y_H4b(-Yj4X9RjVt91(3l<;(@MFj
z>4hG)CYGEoMe;SL>6>23M`?>EWSPs#hs`jWr$R0e`>{m*o?Uz^-S_O!@mSVMA5r{D
z70aK=`bhVNUEh}};*DC7-%c0j*M6Xc_Z<I9@4Vf-of?fgeuJ(UaXv?HjPRQ0f7E^W
zBkb@Btr*++O)3{5aZ)8bQ`97aJVgmnB_1iyYNI=%uDlIfrn3#szQ_?|i=ISxPbGL-
zZEKO7HBFWo8ptWf87YI<jUAGkw)*5A=rgL$KLd85Le@AN22KG(D(_nW^THPX%O{Z^
cFXU&ztIk@i7s;1}B+dKm$Ir|tr_KK8U;d-&V*mgE

diff --git a/tests/monster_test.fbs b/tests/monster_test.fbs
index 08e72d4a5..7ddaa582f 100755
--- a/tests/monster_test.fbs
+++ b/tests/monster_test.fbs
@@ -2,13 +2,17 @@
 
 include "include_test1.fbs";
 
+namespace MyGame.Example2;
+
+table Monster {}  // Test having same name as below, but in different namespace.
+
 namespace MyGame.Example;
 
 attribute "priority";
 
 enum Color:byte (bit_flags) { Red = 0, Green, Blue = 3, }
 
-union Any { Monster, TestSimpleTableWithEnum }  // TODO: add more elements
+union Any { Monster, TestSimpleTableWithEnum, MyGame.Example2.Monster }
 
 struct Test { a:short; b:byte; }
 
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index 60abbdecd..50fbc28ce 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -6,6 +6,12 @@
 #include "flatbuffers/flatbuffers.h"
 
 namespace MyGame {
+namespace Example2 {
+
+struct Monster;
+
+}  // namespace Example2
+
 namespace Example {
 
 struct Test;
@@ -37,12 +43,13 @@ enum Any {
   Any_NONE = 0,
   Any_Monster = 1,
   Any_TestSimpleTableWithEnum = 2,
+  Any_MyGame_Example2_Monster = 3,
   Any_MIN = Any_NONE,
-  Any_MAX = Any_TestSimpleTableWithEnum
+  Any_MAX = Any_MyGame_Example2_Monster
 };
 
 inline const char **EnumNamesAny() {
-  static const char *names[] = { "NONE", "Monster", "TestSimpleTableWithEnum", nullptr };
+  static const char *names[] = { "NONE", "Monster", "TestSimpleTableWithEnum", "MyGame_Example2_Monster", nullptr };
   return names;
 }
 
@@ -98,6 +105,37 @@ MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS {
 };
 STRUCT_END(Vec3, 32);
 
+}  // namespace Example
+
+namespace Example2 {
+
+struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  bool Verify(flatbuffers::Verifier &verifier) const {
+    return VerifyTableStart(verifier) &&
+           verifier.EndTable();
+  }
+};
+
+struct MonsterBuilder {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
+  MonsterBuilder &operator=(const MonsterBuilder &);
+  flatbuffers::Offset<Monster> Finish() {
+    auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 0));
+    return o;
+  }
+};
+
+inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder &_fbb) {
+  MonsterBuilder builder_(_fbb);
+  return builder_.Finish();
+}
+
+}  // namespace Example2
+
+namespace Example {
+
 struct TestSimpleTableWithEnum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum {
     VT_COLOR = 4
@@ -424,6 +462,7 @@ inline bool VerifyAny(flatbuffers::Verifier &verifier, const void *union_obj, An
     case Any_NONE: return true;
     case Any_Monster: return verifier.VerifyTable(reinterpret_cast<const Monster *>(union_obj));
     case Any_TestSimpleTableWithEnum: return verifier.VerifyTable(reinterpret_cast<const TestSimpleTableWithEnum *>(union_obj));
+    case Any_MyGame_Example2_Monster: return verifier.VerifyTable(reinterpret_cast<const MyGame::Example2::Monster *>(union_obj));
     default: return false;
   }
 }
diff --git a/tests/monster_test_generated.js b/tests/monster_test_generated.js
index f967b9d83..f67e84802 100644
--- a/tests/monster_test_generated.js
+++ b/tests/monster_test_generated.js
@@ -10,6 +10,11 @@ var MyGame = MyGame || {};
 */
 MyGame.Example = MyGame.Example || {};
 
+/**
+ * @const
+*/
+MyGame.Example2 = MyGame.Example2 || {};
+
 /**
  * @const
 */
@@ -30,7 +35,59 @@ MyGame.Example.Color = {
 MyGame.Example.Any = {
   NONE: 0,
   Monster: 1,
-  TestSimpleTableWithEnum: 2
+  TestSimpleTableWithEnum: 2,
+  MyGame_Example2_Monster: 3
+};
+
+/**
+ * @constructor
+ */
+MyGame.Example2.Monster = function() {
+  /**
+   * @type {flatbuffers.ByteBuffer}
+   */
+  this.bb = null;
+
+  /**
+   * @type {number}
+   */
+  this.bb_pos = 0;
+};
+
+/**
+ * @param {number} i
+ * @param {flatbuffers.ByteBuffer} bb
+ * @returns {MyGame.Example2.Monster}
+ */
+MyGame.Example2.Monster.prototype.__init = function(i, bb) {
+  this.bb_pos = i;
+  this.bb = bb;
+  return this;
+};
+
+/**
+ * @param {flatbuffers.ByteBuffer} bb
+ * @param {MyGame.Example2.Monster=} obj
+ * @returns {MyGame.Example2.Monster}
+ */
+MyGame.Example2.Monster.getRootAsMonster = function(bb, obj) {
+  return (obj || new MyGame.Example2.Monster).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ */
+MyGame.Example2.Monster.startMonster = function(builder) {
+  builder.startObject(0);
+};
+
+/**
+ * @param {flatbuffers.Builder} builder
+ * @returns {flatbuffers.Offset}
+ */
+MyGame.Example2.Monster.endMonster = function(builder) {
+  var offset = builder.endObject();
+  return offset;
 };
 
 /**
diff --git a/tests/namespace_test/NamespaceC/TableInC.cs b/tests/namespace_test/NamespaceC/TableInC.cs
new file mode 100644
index 000000000..0f75dfec9
--- /dev/null
+++ b/tests/namespace_test/NamespaceC/TableInC.cs
@@ -0,0 +1,38 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+namespace NamespaceC
+{
+
+using System;
+using FlatBuffers;
+
+public sealed class TableInC : Table {
+  public static TableInC GetRootAsTableInC(ByteBuffer _bb) { return GetRootAsTableInC(_bb, new TableInC()); }
+  public static TableInC GetRootAsTableInC(ByteBuffer _bb, TableInC obj) { return (obj.__init(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
+  public TableInC __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+  public NamespaceA.TableInFirstNS ReferToA1 { get { return GetReferToA1(new NamespaceA.TableInFirstNS()); } }
+  public NamespaceA.TableInFirstNS GetReferToA1(NamespaceA.TableInFirstNS obj) { int o = __offset(4); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
+  public SecondTableInA ReferToA2 { get { return GetReferToA2(new SecondTableInA()); } }
+  public SecondTableInA GetReferToA2(SecondTableInA obj) { int o = __offset(6); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
+
+  public static Offset<NamespaceC.TableInC> CreateTableInC(FlatBufferBuilder builder,
+      Offset<NamespaceA.TableInFirstNS> refer_to_a1Offset = default(Offset<NamespaceA.TableInFirstNS>),
+      Offset<SecondTableInA> refer_to_a2Offset = default(Offset<SecondTableInA>)) {
+    builder.StartObject(2);
+    TableInC.AddReferToA2(builder, refer_to_a2Offset);
+    TableInC.AddReferToA1(builder, refer_to_a1Offset);
+    return TableInC.EndTableInC(builder);
+  }
+
+  public static void StartTableInC(FlatBufferBuilder builder) { builder.StartObject(2); }
+  public static void AddReferToA1(FlatBufferBuilder builder, Offset<NamespaceA.TableInFirstNS> referToA1Offset) { builder.AddOffset(0, referToA1Offset.Value, 0); }
+  public static void AddReferToA2(FlatBufferBuilder builder, Offset<SecondTableInA> referToA2Offset) { builder.AddOffset(1, referToA2Offset.Value, 0); }
+  public static Offset<NamespaceC.TableInC> EndTableInC(FlatBufferBuilder builder) {
+    int o = builder.EndObject();
+    return new Offset<NamespaceC.TableInC>(o);
+  }
+};
+
+
+}
diff --git a/tests/namespace_test/NamespaceC/TableInC.go b/tests/namespace_test/NamespaceC/TableInC.go
new file mode 100644
index 000000000..dc75c45c2
--- /dev/null
+++ b/tests/namespace_test/NamespaceC/TableInC.go
@@ -0,0 +1,46 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package NamespaceC
+
+import (
+	flatbuffers "github.com/google/flatbuffers/go"
+)
+type TableInC struct {
+	_tab flatbuffers.Table
+}
+
+func (rcv *TableInC) Init(buf []byte, i flatbuffers.UOffsetT) {
+	rcv._tab.Bytes = buf
+	rcv._tab.Pos = i
+}
+
+func (rcv *TableInC) ReferToA1(obj *TableInFirstNS) *TableInFirstNS {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
+	if o != 0 {
+		x := rcv._tab.Indirect(o + rcv._tab.Pos)
+		if obj == nil {
+			obj = new(TableInFirstNS)
+		}
+		obj.Init(rcv._tab.Bytes, x)
+		return obj
+	}
+	return nil
+}
+
+func (rcv *TableInC) ReferToA2(obj *SecondTableInA) *SecondTableInA {
+	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
+	if o != 0 {
+		x := rcv._tab.Indirect(o + rcv._tab.Pos)
+		if obj == nil {
+			obj = new(SecondTableInA)
+		}
+		obj.Init(rcv._tab.Bytes, x)
+		return obj
+	}
+	return nil
+}
+
+func TableInCStart(builder *flatbuffers.Builder) { builder.StartObject(2) }
+func TableInCAddReferToA1(builder *flatbuffers.Builder, referToA1 flatbuffers.UOffsetT) { builder.PrependUOffsetTSlot(0, flatbuffers.UOffsetT(referToA1), 0) }
+func TableInCAddReferToA2(builder *flatbuffers.Builder, referToA2 flatbuffers.UOffsetT) { builder.PrependUOffsetTSlot(1, flatbuffers.UOffsetT(referToA2), 0) }
+func TableInCEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT { return builder.EndObject() }
diff --git a/tests/namespace_test/NamespaceC/TableInC.java b/tests/namespace_test/NamespaceC/TableInC.java
new file mode 100644
index 000000000..cf1bca18c
--- /dev/null
+++ b/tests/namespace_test/NamespaceC/TableInC.java
@@ -0,0 +1,38 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+package NamespaceC;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+@SuppressWarnings("unused")
+public final class TableInC extends Table {
+  public static TableInC getRootAsTableInC(ByteBuffer _bb) { return getRootAsTableInC(_bb, new TableInC()); }
+  public static TableInC getRootAsTableInC(ByteBuffer _bb, TableInC obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__init(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+  public TableInC __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+  public NamespaceA.TableInFirstNS referToA1() { return referToA1(new NamespaceA.TableInFirstNS()); }
+  public NamespaceA.TableInFirstNS referToA1(NamespaceA.TableInFirstNS obj) { int o = __offset(4); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
+  public SecondTableInA referToA2() { return referToA2(new SecondTableInA()); }
+  public SecondTableInA referToA2(SecondTableInA obj) { int o = __offset(6); return o != 0 ? obj.__init(__indirect(o + bb_pos), bb) : null; }
+
+  public static int createTableInC(FlatBufferBuilder builder,
+      int refer_to_a1Offset,
+      int refer_to_a2Offset) {
+    builder.startObject(2);
+    TableInC.addReferToA2(builder, refer_to_a2Offset);
+    TableInC.addReferToA1(builder, refer_to_a1Offset);
+    return TableInC.endTableInC(builder);
+  }
+
+  public static void startTableInC(FlatBufferBuilder builder) { builder.startObject(2); }
+  public static void addReferToA1(FlatBufferBuilder builder, int referToA1Offset) { builder.addOffset(0, referToA1Offset, 0); }
+  public static void addReferToA2(FlatBufferBuilder builder, int referToA2Offset) { builder.addOffset(1, referToA2Offset, 0); }
+  public static int endTableInC(FlatBufferBuilder builder) {
+    int o = builder.endObject();
+    return o;
+  }
+};
+
diff --git a/tests/namespace_test/NamespaceC/TableInC.php b/tests/namespace_test/NamespaceC/TableInC.php
new file mode 100644
index 000000000..116aea1f9
--- /dev/null
+++ b/tests/namespace_test/NamespaceC/TableInC.php
@@ -0,0 +1,100 @@
+<?php
+// automatically generated by the FlatBuffers compiler, do not modify
+
+namespace NamespaceC;
+
+use \Google\FlatBuffers\Struct;
+use \Google\FlatBuffers\Table;
+use \Google\FlatBuffers\ByteBuffer;
+use \Google\FlatBuffers\FlatBufferBuilder;
+
+class TableInC extends Table
+{
+    /**
+     * @param ByteBuffer $bb
+     * @return TableInC
+     */
+    public static function getRootAsTableInC(ByteBuffer $bb)
+    {
+        $obj = new TableInC();
+        return ($obj->init($bb->getInt($bb->getPosition()) + $bb->getPosition(), $bb));
+    }
+
+    /**
+     * @param int $_i offset
+     * @param ByteBuffer $_bb
+     * @return TableInC
+     **/
+    public function init($_i, ByteBuffer $_bb)
+    {
+        $this->bb_pos = $_i;
+        $this->bb = $_bb;
+        return $this;
+    }
+
+    public function getReferToA1()
+    {
+        $obj = new TableInFirstNS();
+        $o = $this->__offset(4);
+        return $o != 0 ? $obj->init($this->__indirect($o + $this->bb_pos), $this->bb) : 0;
+    }
+
+    public function getReferToA2()
+    {
+        $obj = new SecondTableInA();
+        $o = $this->__offset(6);
+        return $o != 0 ? $obj->init($this->__indirect($o + $this->bb_pos), $this->bb) : 0;
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return void
+     */
+    public static function startTableInC(FlatBufferBuilder $builder)
+    {
+        $builder->StartObject(2);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return TableInC
+     */
+    public static function createTableInC(FlatBufferBuilder $builder, $refer_to_a1, $refer_to_a2)
+    {
+        $builder->startObject(2);
+        self::addReferToA1($builder, $refer_to_a1);
+        self::addReferToA2($builder, $refer_to_a2);
+        $o = $builder->endObject();
+        return $o;
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param int
+     * @return void
+     */
+    public static function addReferToA1(FlatBufferBuilder $builder, $referToA1)
+    {
+        $builder->addOffsetX(0, $referToA1, 0);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @param int
+     * @return void
+     */
+    public static function addReferToA2(FlatBufferBuilder $builder, $referToA2)
+    {
+        $builder->addOffsetX(1, $referToA2, 0);
+    }
+
+    /**
+     * @param FlatBufferBuilder $builder
+     * @return int table offset
+     */
+    public static function endTableInC(FlatBufferBuilder $builder)
+    {
+        $o = $builder->endObject();
+        return $o;
+    }
+}
diff --git a/tests/namespace_test/NamespaceC/TableInC.py b/tests/namespace_test/NamespaceC/TableInC.py
new file mode 100644
index 000000000..5a4376ed8
--- /dev/null
+++ b/tests/namespace_test/NamespaceC/TableInC.py
@@ -0,0 +1,39 @@
+# automatically generated by the FlatBuffers compiler, do not modify
+
+# namespace: NamespaceC
+
+import flatbuffers
+
+class TableInC(object):
+    __slots__ = ['_tab']
+
+    # TableInC
+    def Init(self, buf, pos):
+        self._tab = flatbuffers.table.Table(buf, pos)
+
+    # TableInC
+    def ReferToA1(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
+        if o != 0:
+            x = self._tab.Indirect(o + self._tab.Pos)
+            from .TableInFirstNS import TableInFirstNS
+            obj = TableInFirstNS()
+            obj.Init(self._tab.Bytes, x)
+            return obj
+        return None
+
+    # TableInC
+    def ReferToA2(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
+        if o != 0:
+            x = self._tab.Indirect(o + self._tab.Pos)
+            from .SecondTableInA import SecondTableInA
+            obj = SecondTableInA()
+            obj.Init(self._tab.Bytes, x)
+            return obj
+        return None
+
+def TableInCStart(builder): builder.StartObject(2)
+def TableInCAddReferToA1(builder, referToA1): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(referToA1), 0)
+def TableInCAddReferToA2(builder, referToA2): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(referToA2), 0)
+def TableInCEnd(builder): return builder.EndObject()

From 9e6c5f9f2c543a5ca608e8c1c4c9205139a87dcd Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Mon, 20 Jun 2016 16:06:30 -0700
Subject: [PATCH 172/185] JSON Parser allows union type fields to come after
 unions.

This is useful because many JSON generators will sort the fields,
cause X_type to follow X.

Change-Id: I00ef3ac05418224fc05aee93e6b3b3597e73ffe3
Tested: on Linux.
Bug: 29221752
---
 include/flatbuffers/idl.h        | 28 +++++++++++------
 include/flatbuffers/reflection.h |  4 ++-
 src/idl_gen_cpp.cpp              | 12 ++++----
 src/idl_parser.cpp               | 53 ++++++++++++++++++++++++--------
 tests/test.cpp                   | 13 +++++++-
 5 files changed, 80 insertions(+), 30 deletions(-)

diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index dc385efa3..e3027259b 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -359,6 +359,19 @@ struct IDLOptions {
       lang(IDLOptions::kJava) {}
 };
 
+// This encapsulates where the parser is in the current source file.
+struct ParserState {
+  ParserState() : cursor_(nullptr), line_(1), token_(-1) {}
+
+ protected:
+  const char *cursor_;
+  int line_;  // the current line being parsed
+  int token_;
+
+  std::string attribute_;
+  std::vector<std::string> doc_comment_;
+};
+
 // A way to make error propagation less error prone by requiring values to be
 // checked.
 // Once you create a value of this type you must either:
@@ -400,14 +413,12 @@ class CheckedError {
 #define FLATBUFFERS_CHECKED_ERROR CheckedError
 #endif
 
-class Parser {
+class Parser : public ParserState {
  public:
   explicit Parser(const IDLOptions &options = IDLOptions())
     : root_struct_def_(nullptr),
       opts(options),
       source_(nullptr),
-      cursor_(nullptr),
-      line_(1),
       anonymous_counter(0) {
     // Just in case none are declared:
     namespaces_.push_back(new Namespace());
@@ -478,7 +489,8 @@ private:
                                      FieldDef **dest);
   FLATBUFFERS_CHECKED_ERROR ParseField(StructDef &struct_def);
   FLATBUFFERS_CHECKED_ERROR ParseAnyValue(Value &val, FieldDef *field,
-                                          size_t parent_fieldn);
+                                          size_t parent_fieldn,
+                                          const StructDef *parent_struct_def);
   FLATBUFFERS_CHECKED_ERROR ParseTable(const StructDef &struct_def,
                                        std::string *value, uoffset_t *ovalue);
   void SerializeStruct(const StructDef &struct_def, const Value &val);
@@ -538,13 +550,9 @@ private:
   IDLOptions opts;
 
  private:
-  const char *source_, *cursor_;
-  int line_;  // the current line being parsed
-  int token_;
-  std::string file_being_parsed_;
+  const char *source_;
 
-  std::string attribute_;
-  std::vector<std::string> doc_comment_;
+  std::string file_being_parsed_;
 
   std::vector<std::pair<Value, FieldDef *>> field_stack_;
 
diff --git a/include/flatbuffers/reflection.h b/include/flatbuffers/reflection.h
index ababe6ad4..87091438a 100644
--- a/include/flatbuffers/reflection.h
+++ b/include/flatbuffers/reflection.h
@@ -335,6 +335,8 @@ template<typename T, typename U> pointer_inside_vector<T, U> piv(T *ptr,
   return pointer_inside_vector<T, U>(ptr, vec);
 }
 
+inline const char *UnionTypeFieldSuffix() { return "_type"; }
+
 // Helper to figure out the actual table type a union refers to.
 inline const reflection::Object &GetUnionType(
     const reflection::Schema &schema, const reflection::Object &parent,
@@ -342,7 +344,7 @@ inline const reflection::Object &GetUnionType(
   auto enumdef = schema.enums()->Get(unionfield.type()->index());
   // TODO: this is clumsy and slow, but no other way to find it?
   auto type_field = parent.fields()->LookupByKey(
-            (unionfield.name()->str() + "_type").c_str());
+            (unionfield.name()->str() + UnionTypeFieldSuffix()).c_str());
   assert(type_field);
   auto union_type = GetFieldI<uint8_t>(table, *type_field);
   auto enumval = enumdef->values()->LookupByKey(union_type);
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index b1402d8e6..6c7981417 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -604,8 +604,8 @@ class CppGenerator : public BaseGenerator {
         switch (field.value.type.base_type) {
           case BASE_TYPE_UNION:
             code += prefix + "Verify" + field.value.type.enum_def->name;
-            code +=
-                "(verifier, " + field.name + "(), " + field.name + "_type())";
+            code += "(verifier, " + field.name + "(), " + field.name +
+                    UnionTypeFieldSuffix() + "())";
             break;
           case BASE_TYPE_STRUCT:
             if (!field.value.type.struct_def->fixed) {
@@ -868,8 +868,8 @@ class CppGenerator : public BaseGenerator {
   // so that namespaces are properly opened and closed
   void SetNameSpace(const Namespace *ns, std::string *code_ptr) {
     if (cur_name_space_ == ns) return;
-    // compute the size of the longest common namespace prefix.  
-    // if cur_name_space is A::B::C::D and ns is A::B::E::F::G, 
+    // compute the size of the longest common namespace prefix.
+    // if cur_name_space is A::B::C::D and ns is A::B::E::F::G,
     // the common prefix is A::B:: and we have old_size = 4, new_size = 5
     // and common_prefix_size = 2
     auto old_size =
@@ -881,13 +881,13 @@ class CppGenerator : public BaseGenerator {
                cur_name_space_->components[common_prefix_size])
       common_prefix_size++;
     // close cur_name_space in reverse order to reach the common prefix
-    // in the previous example, D then C are closed  
+    // in the previous example, D then C are closed
     for (auto j = old_size; j > common_prefix_size; --j)
       *code_ptr +=
           "}  // namespace " + cur_name_space_->components[j - 1] + "\n";
     if (old_size != common_prefix_size) *code_ptr += "\n";
     // open namespace parts to reach the ns namespace
-    // in the previous example, E, then F, then G are opened  
+    // in the previous example, E, then F, then G are opened
     for (auto j = common_prefix_size; j != new_size; ++j)
       *code_ptr += "namespace " + ns->components[j] + " {\n";
     if (new_size != common_prefix_size) *code_ptr += "\n";
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 518283de5..8fddb3c66 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -583,9 +583,9 @@ CheckedError Parser::ParseField(StructDef &struct_def) {
   FieldDef *typefield = nullptr;
   if (type.base_type == BASE_TYPE_UNION) {
     // For union fields, add a second auto-generated field to hold the type,
-    // with _type appended as the name.
-    ECHECK(AddField(struct_def, name + "_type", type.enum_def->underlying_type,
-                    &typefield));
+    // with a special suffix.
+    ECHECK(AddField(struct_def, name + UnionTypeFieldSuffix(),
+                    type.enum_def->underlying_type, &typefield));
   }
 
   FieldDef *field;
@@ -686,17 +686,45 @@ CheckedError Parser::ParseField(StructDef &struct_def) {
 }
 
 CheckedError Parser::ParseAnyValue(Value &val, FieldDef *field,
-                                   size_t parent_fieldn) {
+                                   size_t parent_fieldn,
+                                   const StructDef *parent_struct_def) {
   switch (val.type.base_type) {
     case BASE_TYPE_UNION: {
       assert(field);
+      std::string constant;
       if (!parent_fieldn ||
-          field_stack_.back().second->value.type.base_type != BASE_TYPE_UTYPE)
-        return Error("missing type field before this union value: " +
-                     field->name);
+          field_stack_.back().second->value.type.base_type != BASE_TYPE_UTYPE) {
+        // We haven't seen the type field yet. Sadly a lot of JSON writers
+        // output these in alphabetical order, meaning it comes after this
+        // value. So we scan past the value to find it, then come back here.
+        auto type_name = field->name + UnionTypeFieldSuffix();
+        assert(parent_struct_def);
+        auto type_field = parent_struct_def->fields.Lookup(type_name);
+        assert(type_field);  // Guaranteed by ParseField().
+        // Remember where we are in the source file, so we can come back here.
+        auto backup = *static_cast<ParserState *>(this);
+        ECHECK(SkipAnyJsonValue());  // The table.
+        EXPECT(',');
+        auto next_name = attribute_;
+        if (Is(kTokenStringConstant)) {
+          NEXT();
+        } else {
+          EXPECT(kTokenIdentifier);
+        }
+        if (next_name != type_name)
+          return Error("missing type field after this union value: " +
+                       type_name);
+        EXPECT(':');
+        Value type_val = type_field->value;
+        ECHECK(ParseAnyValue(type_val, type_field, 0, nullptr));
+        constant = type_val.constant;
+        // Got the information we needed, now rewind:
+        *static_cast<ParserState *>(this) = backup;
+      } else {
+        constant = field_stack_.back().first.constant;
+      }
       uint8_t enum_idx;
-      ECHECK(atot(field_stack_.back().first.constant.c_str(), *this,
-                  &enum_idx));
+      ECHECK(atot(constant.c_str(), *this, &enum_idx));
       auto enum_val = val.type.enum_def->ReverseLookup(enum_idx);
       if (!enum_val) return Error("illegal type id for: " + field->name);
       ECHECK(ParseTable(*enum_val->struct_def, &val.constant, nullptr));
@@ -771,7 +799,7 @@ CheckedError Parser::ParseTable(const StructDef &struct_def, std::string *value,
         NEXT(); // Ignore this field.
       } else {
         Value val = field->value;
-        ECHECK(ParseAnyValue(val, field, fieldn));
+        ECHECK(ParseAnyValue(val, field, fieldn, &struct_def));
         size_t i = field_stack_.size();
         // Hardcoded insertion-sort with error-check.
         // If fields are specified in order, then this loop exits immediately.
@@ -870,7 +898,7 @@ CheckedError Parser::ParseVector(const Type &type, uoffset_t *ovalue) {
     if ((!opts.strict_json || !count) && Is(']')) { NEXT(); break; }
     Value val;
     val.type = type;
-    ECHECK(ParseAnyValue(val, nullptr, 0));
+    ECHECK(ParseAnyValue(val, nullptr, 0, nullptr));
     field_stack_.push_back(std::make_pair(val, nullptr));
     count++;
     if (Is(']')) { NEXT(); break; }
@@ -1324,7 +1352,8 @@ CheckedError Parser::ParseDecl() {
     }
   }
 
-  ECHECK(CheckClash(fields, struct_def, "_type", BASE_TYPE_UNION));
+  ECHECK(CheckClash(fields, struct_def, UnionTypeFieldSuffix(),
+                    BASE_TYPE_UNION));
   ECHECK(CheckClash(fields, struct_def, "Type", BASE_TYPE_UNION));
   ECHECK(CheckClash(fields, struct_def, "_length", BASE_TYPE_VECTOR));
   ECHECK(CheckClash(fields, struct_def, "Length", BASE_TYPE_VECTOR));
diff --git a/tests/test.cpp b/tests/test.cpp
index 73e009c20..6f3b06299 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -783,7 +783,7 @@ void ErrorTest() {
   TestError("table X { Y:int; Y:int; }", "field already");
   TestError("struct X { Y:string; }", "only scalar");
   TestError("struct X { Y:int (deprecated); }", "deprecate");
-  TestError("union Z { X } table X { Y:Z; } root_type X; { Y: {",
+  TestError("union Z { X } table X { Y:Z; } root_type X; { Y: {}, A:1 }",
             "missing type field");
   TestError("union Z { X } table X { Y:Z; } root_type X; { Y_type: 99, Y: {",
             "type id");
@@ -951,6 +951,16 @@ void UnknownFieldsTest() {
   TEST_EQ(jsongen == "{str: \"test\",i: 10}", true);
 }
 
+void ParseUnionTest() {
+  // Unions must be parseable with the type field following the object.
+  flatbuffers::Parser parser;
+  TEST_EQ(parser.Parse("table T { A:int; }"
+                       "union U { T }"
+                       "table V { X:U; }"
+                       "root_type V;"
+                       "{ X:{ A:1 }, X_type: T }"), true);
+}
+
 int main(int /*argc*/, const char * /*argv*/[]) {
   // Run our various test suites:
 
@@ -979,6 +989,7 @@ int main(int /*argc*/, const char * /*argv*/[]) {
   UnicodeSurrogatesTest();
   UnicodeInvalidSurrogatesTest();
   UnknownFieldsTest();
+  ParseUnionTest();
 
   if (!testing_fails) {
     TEST_OUTPUT_LINE("ALL TESTS PASSED");

From 07d406684770f4b3cda6969b9cdd8724c4382a11 Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Tue, 14 Jun 2016 14:02:26 +0200
Subject: [PATCH 173/185] general: moved methods into the class

---
 src/idl_gen_general.cpp | 136 ++++++++++++++++++++--------------------
 1 file changed, 67 insertions(+), 69 deletions(-)

diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index 36dbd64ba..97006a199 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -188,6 +188,72 @@ static_assert(sizeof(language_parameters) / sizeof(LanguageParameters) ==
               IDLOptions::kMAX,
               "Please add extra elements to the arrays above.");
 
+namespace general {
+class GeneralGenerator : public BaseGenerator {
+ public:
+  GeneralGenerator(const Parser &parser, const std::string &path,
+                   const std::string &file_name)
+      : BaseGenerator(parser, path, file_name){};
+  bool generate() {
+    assert(parser_.opts.lang <= IDLOptions::kMAX);
+    auto lang = language_parameters[parser_.opts.lang];
+    std::string one_file_code;
+
+    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
+         ++it) {
+      std::string enumcode;
+      auto &enum_def = **it;
+      GenEnum(lang, parser_, enum_def, &enumcode);
+      if (parser_.opts.one_file) {
+        one_file_code += enumcode;
+      } else {
+        if (!SaveType(lang, enum_def.name, *enum_def.defined_namespace,
+                      enumcode, false)) return false;
+      }
+    }
+
+    for (auto it = parser_.structs_.vec.begin();
+         it != parser_.structs_.vec.end(); ++it) {
+      std::string declcode;
+      auto &struct_def = **it;
+      GenStruct(lang, parser_, struct_def, &declcode);
+      if (parser_.opts.one_file) {
+        one_file_code += declcode;
+      } else {
+        if (!SaveType(lang, struct_def.name, *struct_def.defined_namespace,
+                      declcode, true)) return false;
+      }
+    }
+
+    if (parser_.opts.one_file) {
+      return SaveType(lang, file_name_, *parser_.namespaces_.back(),
+                      one_file_code, true);
+    }
+    return true;
+  }
+
+  // Save out the generated code for a single class while adding
+  // declaration boilerplate.
+  bool SaveType(const LanguageParameters &lang, const std::string &defname,
+                const Namespace &ns, const std::string &classcode,
+                bool needs_includes) {
+    if (!classcode.length()) return true;
+
+    std::string code;
+    code = code + "// " + FlatBuffersGeneratedWarning();
+    std::string namespace_name = FullNamespace(".", ns);
+    if (!namespace_name.empty()) {
+      code += lang.namespace_ident + namespace_name + lang.namespace_begin;
+      code += "\n\n";
+    }
+    if (needs_includes) code += lang.includes;
+    code += classcode;
+    if (!namespace_name.empty()) code += lang.namespace_end;
+    auto filename = NamespaceDir(ns) + defname + lang.file_extension;
+    return SaveFile(filename.c_str(), code, false);
+  }
+  
+
 static std::string FunctionStart(const LanguageParameters &lang, char upper) {
   return std::string() +
       (lang.language == IDLOptions::kJava
@@ -247,9 +313,6 @@ static std::string GenTypeBasic(const LanguageParameters &lang, const Parser &pa
   return GenTypeBasic(lang, parser, type, true);
 }
 
-static std::string GenTypeGet(const LanguageParameters &lang, const Parser &parser,
-                              const Type &type);
-
 static std::string GenTypePointer(const LanguageParameters &lang, const Parser &parser,
                                   const Type &type) {
   switch (type.base_type) {
@@ -1113,72 +1176,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
     }
   }
   code += "};\n\n";
-}
-
-namespace general {
-class GeneralGenerator : public BaseGenerator {
- public:
-  GeneralGenerator(const Parser &parser, const std::string &path,
-                   const std::string &file_name)
-      : BaseGenerator(parser, path, file_name){};
-  bool generate() {
-    assert(parser_.opts.lang <= IDLOptions::kMAX);
-    auto lang = language_parameters[parser_.opts.lang];
-    std::string one_file_code;
-
-    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
-         ++it) {
-      std::string enumcode;
-      auto &enum_def = **it;
-      GenEnum(lang, parser_, enum_def, &enumcode);
-      if (parser_.opts.one_file) {
-        one_file_code += enumcode;
-      } else {
-        if (!SaveType(lang, enum_def.name, *enum_def.defined_namespace,
-                      enumcode, false)) return false;
-      }
-    }
-
-    for (auto it = parser_.structs_.vec.begin();
-         it != parser_.structs_.vec.end(); ++it) {
-      std::string declcode;
-      auto &struct_def = **it;
-      GenStruct(lang, parser_, struct_def, &declcode);
-      if (parser_.opts.one_file) {
-        one_file_code += declcode;
-      } else {
-        if (!SaveType(lang, struct_def.name, *struct_def.defined_namespace,
-                      declcode, true)) return false;
-      }
-    }
-
-    if (parser_.opts.one_file) {
-      return SaveType(lang, file_name_, *parser_.namespaces_.back(),
-                      one_file_code, true);
-    }
-    return true;
-  }
-
-  // Save out the generated code for a single class while adding
-  // declaration boilerplate.
-  bool SaveType(const LanguageParameters &lang, const std::string &defname,
-                const Namespace &ns, const std::string &classcode,
-                bool needs_includes) {
-    if (!classcode.length()) return true;
-
-    std::string code;
-    code = code + "// " + FlatBuffersGeneratedWarning();
-    std::string namespace_name = FullNamespace(".", ns);
-    if (!namespace_name.empty()) {
-      code += lang.namespace_ident + namespace_name + lang.namespace_begin;
-      code += "\n\n";
-    }
-    if (needs_includes) code += lang.includes;
-    code += classcode;
-    if (!namespace_name.empty()) code += lang.namespace_end;
-    auto filename = NamespaceDir(ns) + defname + lang.file_extension;
-    return SaveFile(filename.c_str(), code, false);
-  }
+}  
 };
 }  // namespace general
 

From f0695e0edf7806e073e0af1a863af48f658a64eb Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Tue, 14 Jun 2016 14:17:58 +0200
Subject: [PATCH 174/185] removed parser & static from method signatures

---
 src/idl_gen_general.cpp | 229 ++++++++++++++++++----------------------
 1 file changed, 104 insertions(+), 125 deletions(-)

diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index 97006a199..46f2c4608 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -203,7 +203,7 @@ class GeneralGenerator : public BaseGenerator {
          ++it) {
       std::string enumcode;
       auto &enum_def = **it;
-      GenEnum(lang, parser_, enum_def, &enumcode);
+      GenEnum(lang, enum_def, &enumcode);
       if (parser_.opts.one_file) {
         one_file_code += enumcode;
       } else {
@@ -216,7 +216,7 @@ class GeneralGenerator : public BaseGenerator {
          it != parser_.structs_.vec.end(); ++it) {
       std::string declcode;
       auto &struct_def = **it;
-      GenStruct(lang, parser_, struct_def, &declcode);
+      GenStruct(lang, struct_def, &declcode);
       if (parser_.opts.one_file) {
         one_file_code += declcode;
       } else {
@@ -267,9 +267,8 @@ static bool IsEnum(const Type& type) {
 
 // Ensure that a type is prefixed with its namespace whenever it is used
 // outside of its namespace.
-static std::string WrapInNameSpace(const Parser &parser, const Namespace *ns,
-    const std::string &name) {
-        if (parser.namespaces_.back() != ns) {
+std::string WrapInNameSpace(const Namespace *ns, const std::string &name) {
+        if (parser_.namespaces_.back() != ns) {
             std::string qualified_name;
             for (auto it = ns->components.begin();
                 it != ns->components.end(); ++it) {
@@ -281,13 +280,11 @@ static std::string WrapInNameSpace(const Parser &parser, const Namespace *ns,
         }
 }
 
-static std::string WrapInNameSpace(const Parser &parser,
-    const Definition &def) {
-        return WrapInNameSpace(parser, def.defined_namespace, def.name);
+std::string WrapInNameSpace(const Definition &def) {
+        return WrapInNameSpace(def.defined_namespace, def.name);
 }
 
-static std::string GenTypeBasic(const LanguageParameters &lang, const Parser &parser,
-                                const Type &type,
+std::string GenTypeBasic(const LanguageParameters &lang, const Type &type,
                                 bool enableLangOverrides) {
   static const char *gtypename[] = {
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
@@ -298,9 +295,9 @@ static std::string GenTypeBasic(const LanguageParameters &lang, const Parser &pa
 
   if (enableLangOverrides) {
     if (lang.language == IDLOptions::kCSharp) {
-      if (IsEnum(type)) return WrapInNameSpace(parser, *type.enum_def);
+      if (IsEnum(type)) return WrapInNameSpace(*type.enum_def);
       if (type.base_type == BASE_TYPE_STRUCT) {
-          return "Offset<" + WrapInNameSpace(parser, *type.struct_def) + ">";
+          return "Offset<" + WrapInNameSpace(*type.struct_def) + ">";
       }
     }
   }
@@ -308,20 +305,18 @@ static std::string GenTypeBasic(const LanguageParameters &lang, const Parser &pa
   return gtypename[type.base_type * IDLOptions::kMAX + lang.language];
 }
 
-static std::string GenTypeBasic(const LanguageParameters &lang, const Parser &parser,
-                                const Type &type) {
-  return GenTypeBasic(lang, parser, type, true);
+std::string GenTypeBasic(const LanguageParameters &lang, const Type &type) {
+  return GenTypeBasic(lang, type, true);
 }
 
-static std::string GenTypePointer(const LanguageParameters &lang, const Parser &parser,
-                                  const Type &type) {
+std::string GenTypePointer(const LanguageParameters &lang, const Type &type) {
   switch (type.base_type) {
     case BASE_TYPE_STRING:
       return lang.string_type;
     case BASE_TYPE_VECTOR:
-      return GenTypeGet(lang, parser, type.VectorType());
+      return GenTypeGet(lang, type.VectorType());
     case BASE_TYPE_STRUCT:
-      return WrapInNameSpace(parser, *type.struct_def);
+      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";
@@ -331,16 +326,15 @@ static std::string GenTypePointer(const LanguageParameters &lang, const Parser &
   }
 }
 
-static std::string GenTypeGet(const LanguageParameters &lang, const Parser &parser,
-                              const Type &type) {
+std::string GenTypeGet(const LanguageParameters &lang, const Type &type) {
   return IsScalar(type.base_type)
-    ? GenTypeBasic(lang, parser, type)
-    : GenTypePointer(lang, parser, type);
+    ? GenTypeBasic(lang, type)
+    : GenTypePointer(lang, type);
 }
 
 // Find the destination type the user wants to receive the value in (e.g.
 // one size higher signed types for unsigned serialized values in Java).
-static Type DestinationType(const LanguageParameters &lang, const Parser &parser, const Type &type,
+Type DestinationType(const LanguageParameters &lang, const Type &type,
                             bool vectorelem) {
   if (lang.language != IDLOptions::kJava) return type;
   switch (type.base_type) {
@@ -351,27 +345,26 @@ static Type DestinationType(const LanguageParameters &lang, const Parser &parser
     case BASE_TYPE_UINT:   return Type(BASE_TYPE_LONG);
     case BASE_TYPE_VECTOR:
       if (vectorelem)
-        return DestinationType(lang, parser, type.VectorType(), vectorelem);
+        return DestinationType(lang, type.VectorType(), vectorelem);
       // else fall thru:
     default: return type;
   }
 }
 
-static std::string GenOffsetType(const LanguageParameters &lang, const Parser &parser,
-                                 const StructDef &struct_def) {
+std::string GenOffsetType(const LanguageParameters &lang, const StructDef &struct_def) {
   if(lang.language == IDLOptions::kCSharp) {
-    return "Offset<" + WrapInNameSpace(parser, struct_def) + ">";
+    return "Offset<" + WrapInNameSpace(struct_def) + ">";
   } else {
     return "int";
   }
 }
 
-static std::string GenOffsetConstruct(const LanguageParameters &lang, const Parser &parser,
+std::string GenOffsetConstruct(const LanguageParameters &lang,
                                       const StructDef &struct_def,
                                       const std::string &variable_name)
 {
   if(lang.language == IDLOptions::kCSharp) {
-    return "new Offset<" + WrapInNameSpace(parser, struct_def) + ">(" + variable_name + ")";
+    return "new Offset<" + WrapInNameSpace(struct_def) + ">(" + variable_name + ")";
   }
   return variable_name;
 }
@@ -385,9 +378,9 @@ static std::string GenVectorOffsetType(const LanguageParameters &lang) {
 }
 
 // Generate destination type name
-static std::string GenTypeNameDest(const LanguageParameters &lang, const Parser &parser, const Type &type)
+std::string GenTypeNameDest(const LanguageParameters &lang, const Type &type)
 {
-  return GenTypeGet(lang, parser, DestinationType(lang, parser, type, true));
+  return GenTypeGet(lang, DestinationType(lang, type, true));
 }
 
 // Mask to turn serialized value into destination type value.
@@ -407,10 +400,10 @@ static std::string DestinationMask(const LanguageParameters &lang,
 }
 
 // Casts necessary to correctly read serialized data
-static std::string DestinationCast(const LanguageParameters &lang, const Parser &parser,
+std::string DestinationCast(const LanguageParameters &lang,
                                    const Type &type) {
   if (type.base_type == BASE_TYPE_VECTOR) {
-    return DestinationCast(lang, parser, type.VectorType());
+    return DestinationCast(lang, type.VectorType());
   } else {
     switch (lang.language) {
     case IDLOptions::kJava:
@@ -420,7 +413,7 @@ static std::string DestinationCast(const LanguageParameters &lang, const Parser
 
     case IDLOptions::kCSharp:
       // Cast from raw integral types to enum.
-      if (IsEnum(type)) return "(" + WrapInNameSpace(parser, *type.enum_def) + ")";
+      if (IsEnum(type)) return "(" + WrapInNameSpace(*type.enum_def) + ")";
       break;
 
     default:
@@ -434,11 +427,10 @@ static std::string DestinationCast(const LanguageParameters &lang, const Parser
 // In Java, parameters representing unsigned numbers need to be cast down to their respective type.
 // For example, a long holding an unsigned int value would be cast down to int before being put onto the buffer.
 // In C#, one cast directly cast an Enum to its underlying type, which is essential before putting it onto the buffer.
-static std::string SourceCast(const LanguageParameters &lang, const Parser &parser,
-                              const Type &type,
+std::string SourceCast(const LanguageParameters &lang, const Type &type,
                               bool castFromDest) {
   if (type.base_type == BASE_TYPE_VECTOR) {
-    return SourceCast(lang, parser, type.VectorType(), castFromDest);
+    return SourceCast(lang, type.VectorType(), castFromDest);
   } else {
     switch (lang.language) {
       case IDLOptions::kJava:
@@ -449,7 +441,7 @@ static std::string SourceCast(const LanguageParameters &lang, const Parser &pars
         }
         break;
       case IDLOptions::kCSharp:
-        if (IsEnum(type)) return "(" + GenTypeBasic(lang, parser, type, false) + ")";
+        if (IsEnum(type)) return "(" + GenTypeBasic(lang, type, false) + ")";
         break;
       default:
         break;
@@ -458,24 +450,21 @@ static std::string SourceCast(const LanguageParameters &lang, const Parser &pars
   return "";
 }
 
-static std::string SourceCast(const LanguageParameters &lang, const Parser &parser,
-                              const Type &type) {
-  return SourceCast(lang, parser, type, true);
+std::string SourceCast(const LanguageParameters &lang, const Type &type) {
+  return SourceCast(lang, type, true);
 }
 
-static std::string SourceCastBasic(const LanguageParameters &lang, const Parser &parser,
-                                   const Type &type,
+std::string SourceCastBasic(const LanguageParameters &lang, const Type &type,
                                    bool castFromDest) {
-  return IsScalar(type.base_type) ? SourceCast(lang, parser, type, castFromDest) : "";
+  return IsScalar(type.base_type) ? SourceCast(lang, type, castFromDest) : "";
 }
 
-static std::string SourceCastBasic(const LanguageParameters &lang, const Parser &parser,
-                                   const Type &type) {
-  return SourceCastBasic(lang, parser, type, true);
+std::string SourceCastBasic(const LanguageParameters &lang, const Type &type) {
+  return SourceCastBasic(lang, type, true);
 }
 
 
-static std::string GenEnumDefaultValue(const Parser &parser, 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());
@@ -484,7 +473,7 @@ static std::string GenEnumDefaultValue(const Parser &parser, const Value &value)
   for (auto it = vec.begin(); it != vec.end(); ++it) {
     auto enum_val = **it;
     if (enum_val.value == default_value) {
-      result = WrapInNameSpace(parser, *enum_def) + "." + enum_val.name;
+      result = WrapInNameSpace(*enum_def) + "." + enum_val.name;
       break;
     }
   }
@@ -492,14 +481,13 @@ static std::string GenEnumDefaultValue(const Parser &parser, const Value &value)
   return result;
 }
 
-static std::string GenDefaultValue(const LanguageParameters &lang, const Parser &parser,
-                                   const Value &value, bool enableLangOverrides) {
+std::string GenDefaultValue(const LanguageParameters &lang, const Value &value, bool enableLangOverrides) {
   if (enableLangOverrides) {
     // handles both enum case and vector of enum case
     if (lang.language == IDLOptions::kCSharp &&
         value.type.enum_def != nullptr &&
         value.type.base_type != BASE_TYPE_UNION) {
-      return GenEnumDefaultValue(parser, value);
+      return GenEnumDefaultValue(value);
     }
   }
   switch (value.type.base_type) {
@@ -509,13 +497,11 @@ static std::string GenDefaultValue(const LanguageParameters &lang, const Parser
   }
 }
 
-static std::string GenDefaultValue(const LanguageParameters &lang, const Parser &parser,
-                                   const Value &value) {
-  return GenDefaultValue(lang, parser, value, true);
+std::string GenDefaultValue(const LanguageParameters &lang, const Value &value) {
+  return GenDefaultValue(lang, value, true);
 }
 
-static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Parser &parser,
-                                        const Value &value, bool enableLangOverrides) {
+std::string GenDefaultValueBasic(const LanguageParameters &lang, const Value &value, bool enableLangOverrides) {
   if (!IsScalar(value.type.base_type)) {
     if (enableLangOverrides) {
       if (lang.language == IDLOptions::kCSharp) {
@@ -523,7 +509,7 @@ static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Pa
         case BASE_TYPE_STRING:
           return "default(StringOffset)";
         case BASE_TYPE_STRUCT:
-          return "default(Offset<" + WrapInNameSpace(parser, *value.type.struct_def) + ">)";
+          return "default(Offset<" + WrapInNameSpace(*value.type.struct_def) + ">)";
         case BASE_TYPE_VECTOR:
           return "default(VectorOffset)";
         default:
@@ -533,16 +519,14 @@ static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Pa
     }
     return "0";
   }
-  return GenDefaultValue(lang, parser, value, enableLangOverrides);
+  return GenDefaultValue(lang, value, enableLangOverrides);
 }
 
-static std::string GenDefaultValueBasic(const LanguageParameters &lang, const Parser &parser,
-                                        const Value &value) {
-  return GenDefaultValueBasic(lang, parser, value, true);
+std::string GenDefaultValueBasic(const LanguageParameters &lang, const Value &value) {
+  return GenDefaultValueBasic(lang, value, true);
 }
 
-static void GenEnum(const LanguageParameters &lang, const Parser &parser, EnumDef &enum_def,
-                    std::string *code_ptr) {
+void GenEnum(const LanguageParameters &lang, EnumDef &enum_def, std::string *code_ptr) {
   std::string &code = *code_ptr;
   if (enum_def.generated) return;
 
@@ -554,7 +538,7 @@ static void GenEnum(const LanguageParameters &lang, const Parser &parser, EnumDe
   GenComment(enum_def.doc_comment, code_ptr, &lang.comment_config);
   code += std::string("public ") + lang.enum_decl + enum_def.name;
   if (lang.language == IDLOptions::kCSharp) {
-    code += lang.inheritance_marker + GenTypeBasic(lang, parser, enum_def.underlying_type, false);
+    code += lang.inheritance_marker + GenTypeBasic(lang, enum_def.underlying_type, false);
   }
   code += lang.open_curly;
   if (lang.language == IDLOptions::kJava) {
@@ -568,7 +552,7 @@ static void GenEnum(const LanguageParameters &lang, const Parser &parser, EnumDe
     if (lang.language != IDLOptions::kCSharp) {
       code += "  public static";
       code += lang.const_decl;
-      code += GenTypeBasic(lang, parser, enum_def.underlying_type, false);
+      code += GenTypeBasic(lang, enum_def.underlying_type, false);
     }
     code += " " + ev.name + " = ";
     code += NumToString(ev.value);
@@ -614,19 +598,18 @@ static void GenEnum(const LanguageParameters &lang, const Parser &parser, EnumDe
 }
 
 // Returns the function name that is able to read a value of the given type.
-static std::string GenGetter(const LanguageParameters &lang, const Parser &parser,
-                             const Type &type) {
+std::string GenGetter(const LanguageParameters &lang, const Type &type) {
   switch (type.base_type) {
     case BASE_TYPE_STRING: return "__string";
     case BASE_TYPE_STRUCT: return "__struct";
     case BASE_TYPE_UNION:  return "__union";
-    case BASE_TYPE_VECTOR: return GenGetter(lang, parser, type.VectorType());
+    case BASE_TYPE_VECTOR: return GenGetter(lang, type.VectorType());
     default: {
       std::string getter = "bb." + FunctionStart(lang, 'G') + "et";
       if (type.base_type == BASE_TYPE_BOOL) {
         getter = "0!=" + getter;
-      } else if (GenTypeBasic(lang, parser, type, false) != "byte") {
-        getter += MakeCamel(GenTypeBasic(lang, parser, type, false));
+      } else if (GenTypeBasic(lang, type, false) != "byte") {
+        getter += MakeCamel(GenTypeBasic(lang, type, false));
       }
       return getter;
     }
@@ -635,13 +618,12 @@ static std::string GenGetter(const LanguageParameters &lang, const Parser &parse
 
 // Direct mutation is only allowed for scalar fields.
 // Hence a setter method will only be generated for such fields.
-static std::string GenSetter(const LanguageParameters &lang, const Parser &parser,
-                             const Type &type) {
+std::string GenSetter(const LanguageParameters &lang, const Type &type) {
   if (IsScalar(type.base_type)) {
     std::string setter = "bb." + FunctionStart(lang, 'P') + "ut";
-    if (GenTypeBasic(lang, parser, type, false) != "byte" &&
+    if (GenTypeBasic(lang, type, false) != "byte" &&
         type.base_type != BASE_TYPE_BOOL) {
-      setter += MakeCamel(GenTypeBasic(lang, parser, type, false));
+      setter += MakeCamel(GenTypeBasic(lang, type, false));
     }
     return setter;
   } else {
@@ -650,16 +632,15 @@ static std::string GenSetter(const LanguageParameters &lang, const Parser &parse
 }
 
 // Returns the method name for use with add/put calls.
-static std::string GenMethod(const LanguageParameters &lang, const Parser &parser, const Type &type) {
+std::string GenMethod(const LanguageParameters &lang, const Type &type) {
   return IsScalar(type.base_type)
-    ? MakeCamel(GenTypeBasic(lang, parser, type, false))
+    ? MakeCamel(GenTypeBasic(lang, type, false))
     : (IsStruct(type) ? "Struct" : "Offset");
 }
 
 // Recursively generate arguments for a constructor, to deal with nested
 // structs.
-static void GenStructArgs(const LanguageParameters &lang, const Parser &parser,
-                          const StructDef &struct_def,
+void GenStructArgs(const LanguageParameters &lang, const StructDef &struct_def,
                           std::string *code_ptr, const char *nameprefix) {
   std::string &code = *code_ptr;
   for (auto it = struct_def.fields.vec.begin();
@@ -670,11 +651,11 @@ static void GenStructArgs(const LanguageParameters &lang, const Parser &parser,
       // Generate arguments for a struct inside a struct. To ensure names
       // don't clash, and to make it obvious these arguments are constructing
       // a nested struct, prefix the name with the field name.
-      GenStructArgs(lang, parser, *field.value.type.struct_def, code_ptr,
+      GenStructArgs(lang, *field.value.type.struct_def, code_ptr,
                     (nameprefix + (field.name + "_")).c_str());
     } else {
       code += ", ";
-      code += GenTypeBasic(lang, parser, DestinationType(lang, parser, field.value.type, false));
+      code += GenTypeBasic(lang, DestinationType(lang, field.value.type, false));
       code += " ";
       code += nameprefix;
       code += MakeCamel(field.name, lang.first_camel_upper);
@@ -685,8 +666,7 @@ static void GenStructArgs(const LanguageParameters &lang, const Parser &parser,
 // Recusively generate struct construction statements of the form:
 // builder.putType(name);
 // and insert manual padding.
-static void GenStructBody(const LanguageParameters &lang, const Parser &parser,
-                          const StructDef &struct_def,
+void GenStructBody(const LanguageParameters &lang, const StructDef &struct_def,
                           std::string *code_ptr, const char *nameprefix) {
   std::string &code = *code_ptr;
   code += "    builder." + FunctionStart(lang, 'P') + "rep(";
@@ -700,12 +680,12 @@ static void GenStructBody(const LanguageParameters &lang, const Parser &parser,
       code += NumToString(field.padding) + ");\n";
     }
     if (IsStruct(field.value.type)) {
-      GenStructBody(lang, parser, *field.value.type.struct_def, code_ptr,
+      GenStructBody(lang, *field.value.type.struct_def, code_ptr,
                     (nameprefix + (field.name + "_")).c_str());
     } else {
       code += "    builder." + FunctionStart(lang, 'P') + "ut";
-      code += GenMethod(lang, parser, field.value.type) + "(";
-      code += SourceCast(lang, parser, field.value.type);
+      code += GenMethod(lang, field.value.type) + "(";
+      code += SourceCast(lang, field.value.type);
       auto argname = nameprefix + MakeCamel(field.name, lang.first_camel_upper);
       code += argname;
       code += ");\n";
@@ -713,8 +693,7 @@ static void GenStructBody(const LanguageParameters &lang, const Parser &parser,
   }
 }
 
-static void GenStruct(const LanguageParameters &lang, const Parser &parser,
-                      StructDef &struct_def, std::string *code_ptr) {
+void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::string *code_ptr) {
   if (struct_def.generated) return;
   std::string &code = *code_ptr;
 
@@ -756,13 +735,13 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
     code += ") + _bb.";
     code += lang.get_bb_position;
     code += ", _bb)); }\n";
-    if (parser.root_struct_def_ == &struct_def) {
-      if (parser.file_identifier_.length()) {
+    if (parser_.root_struct_def_ == &struct_def) {
+      if (parser_.file_identifier_.length()) {
         // Check if a buffer has the identifier.
         code += "  public static ";
         code += lang.bool_type + struct_def.name;
         code += "BufferHasIdentifier(ByteBuffer _bb) { return ";
-        code += "__has_identifier(_bb, \"" + parser.file_identifier_;
+        code += "__has_identifier(_bb, \"" + parser_.file_identifier_;
         code += "\"); }\n";
       }
     }
@@ -778,11 +757,11 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
     auto &field = **it;
     if (field.deprecated) continue;
     GenComment(field.doc_comment, code_ptr, &lang.comment_config, "  ");
-    std::string type_name = GenTypeGet(lang, parser, field.value.type);
-    std::string type_name_dest = GenTypeNameDest(lang, parser, field.value.type);
+    std::string type_name = GenTypeGet(lang, field.value.type);
+    std::string type_name_dest = GenTypeNameDest(lang, field.value.type);
     std::string dest_mask = DestinationMask(lang, field.value.type, true);
-    std::string dest_cast = DestinationCast(lang, parser, field.value.type);
-    std::string src_cast = SourceCast(lang, parser, field.value.type);
+    std::string dest_cast = DestinationCast(lang, field.value.type);
+    std::string src_cast = SourceCast(lang, field.value.type);
     std::string method_start = "  public " + type_name_dest + " " +
                                MakeCamel(field.name, lang.first_camel_upper);
 
@@ -832,7 +811,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
         type_name = type_name_dest;
       }
     }
-    std::string getter = dest_cast + GenGetter(lang, parser, field.value.type);
+    std::string getter = dest_cast + GenGetter(lang, field.value.type);
     code += method_start;
     std::string default_cast = "";
     // only create default casts for c# scalars or vectors of scalars
@@ -857,7 +836,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
       } else {
         code += offset_prefix + getter;
         code += "(o + bb_pos)" + dest_mask + " : " + default_cast;
-        code += GenDefaultValue(lang, parser, field.value);
+        code += GenDefaultValue(lang, field.value);
       }
     } else {
       switch (field.value.type.base_type) {
@@ -954,9 +933,9 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
   auto nested = field.attributes.Lookup("nested_flatbuffer");
   if (nested) {
     auto nested_qualified_name =
-      parser.namespaces_.back()->GetFullyQualifiedName(nested->constant);
-    auto nested_type = parser.structs_.Lookup(nested_qualified_name);
-    auto nested_type_name = WrapInNameSpace(parser, *nested_type);
+      parser_.namespaces_.back()->GetFullyQualifiedName(nested->constant);
+    auto nested_type = parser_.structs_.Lookup(nested_qualified_name);
+    auto nested_type_name = WrapInNameSpace(*nested_type);
     auto nestedMethodName = MakeCamel(field.name, lang.first_camel_upper)
       + "As" + nested_type_name;
     auto getNestedMethodName = nestedMethodName;
@@ -972,7 +951,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
     code += "return o != 0 ? obj.__init(__indirect(__vector(o)), bb) : null; }\n";
   }
     // generate mutators for scalar fields or vectors of scalars
-    if (parser.opts.mutable_buffer) {
+    if (parser_.opts.mutable_buffer) {
       auto underlying_type = field.value.type.base_type == BASE_TYPE_VECTOR
                     ? field.value.type.VectorType()
                     : field.value.type;
@@ -981,7 +960,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
       auto mutator_prefix = MakeCamel("mutate", lang.first_camel_upper);
       //a vector mutator also needs the index of the vector element it should mutate
       auto mutator_params = (field.value.type.base_type == BASE_TYPE_VECTOR ? "(int j, " : "(") +
-                            GenTypeNameDest(lang, parser, underlying_type) + " " +
+                            GenTypeNameDest(lang, underlying_type) + " " +
                             field.name + ") { ";
       auto setter_index = field.value.type.base_type == BASE_TYPE_VECTOR
                     ? "__vector(o) + j * " + NumToString(InlineSize(underlying_type))
@@ -994,11 +973,11 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
         code += mutator_prefix + MakeCamel(field.name, true);
         code += mutator_params;
         if (struct_def.fixed) {
-          code += GenSetter(lang, parser, underlying_type) + "(" + setter_index + ", ";
+          code += GenSetter(lang, underlying_type) + "(" + setter_index + ", ";
           code += src_cast + setter_parameter + "); }\n";
         } else {
           code += "int o = __offset(" + NumToString(field.value.offset) + ");";
-          code += " if (o != 0) { " + GenSetter(lang, parser, underlying_type);
+          code += " if (o != 0) { " + GenSetter(lang, underlying_type);
           code += "(" + setter_index + ", " + src_cast + setter_parameter + "); return true; } else { return false; } }\n";
         }
       }
@@ -1007,14 +986,14 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
   code += "\n";
   if (struct_def.fixed) {
     // create a struct constructor function
-    code += "  public static " + GenOffsetType(lang, parser, struct_def) + " ";
+    code += "  public static " + GenOffsetType(lang, struct_def) + " ";
     code += FunctionStart(lang, 'C') + "reate";
     code += struct_def.name + "(FlatBufferBuilder builder";
-    GenStructArgs(lang, parser, struct_def, code_ptr, "");
+    GenStructArgs(lang, struct_def, code_ptr, "");
     code += ") {\n";
-    GenStructBody(lang, parser, struct_def, code_ptr, "");
+    GenStructBody(lang, struct_def, code_ptr, "");
     code += "    return ";
-    code += GenOffsetConstruct(lang, parser, struct_def, "builder." + std::string(lang.get_fbb_offset));
+    code += GenOffsetConstruct(lang, 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
@@ -1035,7 +1014,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
     if (has_no_struct_fields && num_fields) {
       // Generate a table constructor of the form:
       // public static int createName(FlatBufferBuilder builder, args...)
-      code += "  public static " + GenOffsetType(lang, parser, struct_def) + " ";
+      code += "  public static " + GenOffsetType(lang, struct_def) + " ";
       code += FunctionStart(lang, 'C') + "reate" + struct_def.name;
       code += "(FlatBufferBuilder builder";
       for (auto it = struct_def.fields.vec.begin();
@@ -1043,7 +1022,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
         auto &field = **it;
         if (field.deprecated) continue;
         code += ",\n      ";
-        code += GenTypeBasic(lang, parser, DestinationType(lang, parser, field.value.type, false));
+        code += GenTypeBasic(lang, DestinationType(lang, field.value.type, false));
         code += " ";
         code += field.name;
         if (!IsScalar(field.value.type.base_type)) code += "Offset";
@@ -1052,7 +1031,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
         // supply all arguments, and thus won't compile when fields are added.
         if (lang.language != IDLOptions::kJava) {
           code += " = ";
-          code += GenDefaultValueBasic(lang, parser, field.value);
+          code += GenDefaultValueBasic(lang, field.value);
         }
       }
       code += ") {\n    builder.";
@@ -1096,18 +1075,18 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
       code += "  public static void " + FunctionStart(lang, 'A') + "dd";
       code += MakeCamel(field.name);
       code += "(FlatBufferBuilder builder, ";
-      code += GenTypeBasic(lang, parser, DestinationType(lang, parser, field.value.type, false));
+      code += GenTypeBasic(lang, DestinationType(lang, field.value.type, false));
       auto argname = MakeCamel(field.name, false);
       if (!IsScalar(field.value.type.base_type)) argname += "Offset";
       code += " " + argname + ") { builder." + FunctionStart(lang, 'A') + "dd";
-      code += GenMethod(lang, parser, field.value.type) + "(";
+      code += GenMethod(lang, field.value.type) + "(";
       code += NumToString(it - struct_def.fields.vec.begin()) + ", ";
-      code += SourceCastBasic(lang, parser, field.value.type);
+      code += SourceCastBasic(lang, field.value.type);
       code += argname;
       if(!IsScalar(field.value.type.base_type) && field.value.type.base_type != BASE_TYPE_UNION && lang.language == IDLOptions::kCSharp) {
         code += ".Value";
       }
-      code += ", " + GenDefaultValue(lang, parser, field.value, false);
+      code += ", " + GenDefaultValue(lang, field.value, false);
       code += "); }\n";
       if (field.value.type.base_type == BASE_TYPE_VECTOR) {
         auto vector_type = field.value.type.VectorType();
@@ -1118,7 +1097,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
           code += "  public static " + GenVectorOffsetType(lang) + " " + FunctionStart(lang, 'C') + "reate";
           code += MakeCamel(field.name);
           code += "Vector(FlatBufferBuilder builder, ";
-          code += GenTypeBasic(lang, parser, vector_type) + "[] data) ";
+          code += GenTypeBasic(lang, vector_type) + "[] data) ";
           code += "{ builder." + FunctionStart(lang, 'S') + "tartVector(";
           code += NumToString(elem_size);
           code += ", data." + FunctionStart(lang, 'L') + "ength, ";
@@ -1126,9 +1105,9 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
           code += "); for (int i = data.";
           code += FunctionStart(lang, 'L') + "ength - 1; i >= 0; i--) builder.";
           code += FunctionStart(lang, 'A') + "dd";
-          code += GenMethod(lang, parser, vector_type);
+          code += GenMethod(lang, vector_type);
           code += "(";
-          code += SourceCastBasic(lang, parser, vector_type, false);
+          code += SourceCastBasic(lang, vector_type, false);
           code += "data[i]";
           if (lang.language == IDLOptions::kCSharp &&
             (vector_type.base_type == BASE_TYPE_STRUCT || vector_type.base_type == BASE_TYPE_STRING))
@@ -1146,7 +1125,7 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
         code += "); }\n";
       }
     }
-    code += "  public static " + GenOffsetType(lang, parser, struct_def) + " ";
+    code += "  public static " + GenOffsetType(lang, struct_def) + " ";
     code += FunctionStart(lang, 'E') + "nd" + struct_def.name;
     code += "(FlatBufferBuilder builder) {\n    int o = builder.";
     code += FunctionStart(lang, 'E') + "ndObject();\n";
@@ -1160,18 +1139,18 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
         code += ");  // " + field.name + "\n";
       }
     }
-    code += "    return " + GenOffsetConstruct(lang, parser, struct_def, "o") + ";\n  }\n";
-    if (parser.root_struct_def_ == &struct_def) {
+    code += "    return " + GenOffsetConstruct(lang, struct_def, "o") + ";\n  }\n";
+    if (parser_.root_struct_def_ == &struct_def) {
       code += "  public static void ";
       code += FunctionStart(lang, 'F') + "inish" + struct_def.name;
-      code += "Buffer(FlatBufferBuilder builder, " + GenOffsetType(lang, parser, struct_def) + " offset) {";
+      code += "Buffer(FlatBufferBuilder builder, " + GenOffsetType(lang, struct_def) + " offset) {";
       code += " builder." + FunctionStart(lang, 'F') + "inish(offset";
       if (lang.language == IDLOptions::kCSharp) {
         code += ".Value";
       }
 
-      if (parser.file_identifier_.length())
-        code += ", \"" + parser.file_identifier_ + "\"";
+      if (parser_.file_identifier_.length())
+        code += ", \"" + parser_.file_identifier_ + "\"";
       code += "); }\n";
     }
   }

From 4a249752ffeaeea9dc01760baac8a5e961bc8b09 Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Tue, 14 Jun 2016 17:13:58 +0200
Subject: [PATCH 175/185] removed lang  signature method

---
 src/idl_gen_general.cpp | 403 ++++++++++++++++++++--------------------
 1 file changed, 197 insertions(+), 206 deletions(-)

diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index 46f2c4608..7567bdcf4 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -193,21 +193,21 @@ class GeneralGenerator : public BaseGenerator {
  public:
   GeneralGenerator(const Parser &parser, const std::string &path,
                    const std::string &file_name)
-      : BaseGenerator(parser, path, file_name){};
+      : BaseGenerator(parser, path, file_name){
+      assert(parser_.opts.lang <= IDLOptions::kMAX);
+      };
   bool generate() {
-    assert(parser_.opts.lang <= IDLOptions::kMAX);
-    auto lang = language_parameters[parser_.opts.lang];
     std::string one_file_code;
 
     for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
          ++it) {
       std::string enumcode;
       auto &enum_def = **it;
-      GenEnum(lang, enum_def, &enumcode);
+      GenEnum(enum_def, &enumcode);
       if (parser_.opts.one_file) {
         one_file_code += enumcode;
       } else {
-        if (!SaveType(lang, enum_def.name, *enum_def.defined_namespace,
+        if (!SaveType(enum_def.name, *enum_def.defined_namespace,
                       enumcode, false)) return false;
       }
     }
@@ -216,17 +216,17 @@ class GeneralGenerator : public BaseGenerator {
          it != parser_.structs_.vec.end(); ++it) {
       std::string declcode;
       auto &struct_def = **it;
-      GenStruct(lang, struct_def, &declcode);
+      GenStruct(struct_def, &declcode);
       if (parser_.opts.one_file) {
         one_file_code += declcode;
       } else {
-        if (!SaveType(lang, struct_def.name, *struct_def.defined_namespace,
+        if (!SaveType(struct_def.name, *struct_def.defined_namespace,
                       declcode, true)) return false;
       }
     }
 
     if (parser_.opts.one_file) {
-      return SaveType(lang, file_name_, *parser_.namespaces_.back(),
+      return SaveType(file_name_, *parser_.namespaces_.back(),
                       one_file_code, true);
     }
     return true;
@@ -234,29 +234,28 @@ class GeneralGenerator : public BaseGenerator {
 
   // Save out the generated code for a single class while adding
   // declaration boilerplate.
-  bool SaveType(const LanguageParameters &lang, const std::string &defname,
-                const Namespace &ns, const std::string &classcode,
-                bool needs_includes) {
+  bool SaveType(const std::string &defname, const Namespace &ns, 
+  	  const std::string &classcode, bool needs_includes) {
     if (!classcode.length()) return true;
 
     std::string code;
     code = code + "// " + FlatBuffersGeneratedWarning();
     std::string namespace_name = FullNamespace(".", ns);
     if (!namespace_name.empty()) {
-      code += lang.namespace_ident + namespace_name + lang.namespace_begin;
+      code += lang_.namespace_ident + namespace_name + lang_.namespace_begin;
       code += "\n\n";
     }
-    if (needs_includes) code += lang.includes;
+    if (needs_includes) code += lang_.includes;
     code += classcode;
-    if (!namespace_name.empty()) code += lang.namespace_end;
-    auto filename = NamespaceDir(ns) + defname + lang.file_extension;
+    if (!namespace_name.empty()) code += lang_.namespace_end;
+    auto filename = NamespaceDir(ns) + defname + lang_.file_extension;
     return SaveFile(filename.c_str(), code, false);
   }
   
 
-static std::string FunctionStart(const LanguageParameters &lang, char upper) {
+std::string FunctionStart(char upper) {
   return std::string() +
-      (lang.language == IDLOptions::kJava
+      (lang_.language == IDLOptions::kJava
          ? static_cast<char>(tolower(upper))
          : upper);
 }
@@ -284,8 +283,7 @@ std::string WrapInNameSpace(const Definition &def) {
         return WrapInNameSpace(def.defined_namespace, def.name);
 }
 
-std::string GenTypeBasic(const LanguageParameters &lang, const Type &type,
-                                bool enableLangOverrides) {
+std::string GenTypeBasic(const Type &type, bool enableLangOverrides) {
   static const char *gtypename[] = {
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
         #JTYPE, #NTYPE, #GTYPE,
@@ -294,7 +292,7 @@ std::string GenTypeBasic(const LanguageParameters &lang, const Type &type,
   };
 
   if (enableLangOverrides) {
-    if (lang.language == IDLOptions::kCSharp) {
+    if (lang_.language == IDLOptions::kCSharp) {
       if (IsEnum(type)) return WrapInNameSpace(*type.enum_def);
       if (type.base_type == BASE_TYPE_STRUCT) {
           return "Offset<" + WrapInNameSpace(*type.struct_def) + ">";
@@ -302,41 +300,40 @@ std::string GenTypeBasic(const LanguageParameters &lang, const Type &type,
     }
   }
 
-  return gtypename[type.base_type * IDLOptions::kMAX + lang.language];
+  return gtypename[type.base_type * IDLOptions::kMAX + lang_.language];
 }
 
-std::string GenTypeBasic(const LanguageParameters &lang, const Type &type) {
-  return GenTypeBasic(lang, type, true);
+std::string GenTypeBasic(const Type &type) {
+  return GenTypeBasic(type, true);
 }
 
-std::string GenTypePointer(const LanguageParameters &lang, const Type &type) {
+std::string GenTypePointer(const Type &type) {
   switch (type.base_type) {
     case BASE_TYPE_STRING:
-      return lang.string_type;
+      return lang_.string_type;
     case BASE_TYPE_VECTOR:
-      return GenTypeGet(lang, type.VectorType());
+      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";
+      if (lang_.language == IDLOptions::kCSharp) return "TTable";
       // fall through
     default:
       return "Table";
   }
 }
 
-std::string GenTypeGet(const LanguageParameters &lang, const Type &type) {
+std::string GenTypeGet(const Type &type) {
   return IsScalar(type.base_type)
-    ? GenTypeBasic(lang, type)
-    : GenTypePointer(lang, type);
+    ? GenTypeBasic(type)
+    : GenTypePointer(type);
 }
 
 // Find the destination type the user wants to receive the value in (e.g.
 // one size higher signed types for unsigned serialized values in Java).
-Type DestinationType(const LanguageParameters &lang, const Type &type,
-                            bool vectorelem) {
-  if (lang.language != IDLOptions::kJava) return type;
+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
     // than using short for uchar.
@@ -345,32 +342,31 @@ Type DestinationType(const LanguageParameters &lang, const Type &type,
     case BASE_TYPE_UINT:   return Type(BASE_TYPE_LONG);
     case BASE_TYPE_VECTOR:
       if (vectorelem)
-        return DestinationType(lang, type.VectorType(), vectorelem);
+        return DestinationType(type.VectorType(), vectorelem);
       // else fall thru:
     default: return type;
   }
 }
 
-std::string GenOffsetType(const LanguageParameters &lang, const StructDef &struct_def) {
-  if(lang.language == IDLOptions::kCSharp) {
+std::string GenOffsetType(const StructDef &struct_def) {
+  if(lang_.language == IDLOptions::kCSharp) {
     return "Offset<" + WrapInNameSpace(struct_def) + ">";
   } else {
     return "int";
   }
 }
 
-std::string GenOffsetConstruct(const LanguageParameters &lang,
-                                      const StructDef &struct_def,
+std::string GenOffsetConstruct(const StructDef &struct_def,
                                       const std::string &variable_name)
 {
-  if(lang.language == IDLOptions::kCSharp) {
+  if(lang_.language == IDLOptions::kCSharp) {
     return "new Offset<" + WrapInNameSpace(struct_def) + ">(" + variable_name + ")";
   }
   return variable_name;
 }
 
-static std::string GenVectorOffsetType(const LanguageParameters &lang) {
-  if(lang.language == IDLOptions::kCSharp) {
+std::string GenVectorOffsetType() {
+  if(lang_.language == IDLOptions::kCSharp) {
     return "VectorOffset";
   } else {
     return "int";
@@ -378,34 +374,32 @@ static std::string GenVectorOffsetType(const LanguageParameters &lang) {
 }
 
 // Generate destination type name
-std::string GenTypeNameDest(const LanguageParameters &lang, const Type &type)
+std::string GenTypeNameDest(const Type &type)
 {
-  return GenTypeGet(lang, DestinationType(lang, type, true));
+  return GenTypeGet(DestinationType(type, true));
 }
 
 // Mask to turn serialized value into destination type value.
-static std::string DestinationMask(const LanguageParameters &lang,
-                                   const Type &type, bool vectorelem) {
-  if (lang.language != IDLOptions::kJava) return "";
+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)
-        return DestinationMask(lang, type.VectorType(), vectorelem);
+        return DestinationMask(type.VectorType(), vectorelem);
       // else fall thru:
     default: return "";
   }
 }
 
 // Casts necessary to correctly read serialized data
-std::string DestinationCast(const LanguageParameters &lang,
-                                   const Type &type) {
+std::string DestinationCast(const Type &type) {
   if (type.base_type == BASE_TYPE_VECTOR) {
-    return DestinationCast(lang, type.VectorType());
+    return DestinationCast(type.VectorType());
   } else {
-    switch (lang.language) {
+    switch (lang_.language) {
     case IDLOptions::kJava:
       // Cast necessary to correctly read serialized unsigned values.
       if (type.base_type == BASE_TYPE_UINT) return "(long)";
@@ -427,12 +421,11 @@ std::string DestinationCast(const LanguageParameters &lang,
 // In Java, parameters representing unsigned numbers need to be cast down to their respective type.
 // For example, a long holding an unsigned int value would be cast down to int before being put onto the buffer.
 // In C#, one cast directly cast an Enum to its underlying type, which is essential before putting it onto the buffer.
-std::string SourceCast(const LanguageParameters &lang, const Type &type,
-                              bool castFromDest) {
+std::string SourceCast(const Type &type, bool castFromDest) {
   if (type.base_type == BASE_TYPE_VECTOR) {
-    return SourceCast(lang, type.VectorType(), castFromDest);
+    return SourceCast(type.VectorType(), castFromDest);
   } else {
-    switch (lang.language) {
+    switch (lang_.language) {
       case IDLOptions::kJava:
         if (castFromDest) {
           if (type.base_type == BASE_TYPE_UINT) return "(int)";
@@ -441,7 +434,7 @@ std::string SourceCast(const LanguageParameters &lang, const Type &type,
         }
         break;
       case IDLOptions::kCSharp:
-        if (IsEnum(type)) return "(" + GenTypeBasic(lang, type, false) + ")";
+        if (IsEnum(type)) return "(" + GenTypeBasic(type, false) + ")";
         break;
       default:
         break;
@@ -450,17 +443,16 @@ std::string SourceCast(const LanguageParameters &lang, const Type &type,
   return "";
 }
 
-std::string SourceCast(const LanguageParameters &lang, const Type &type) {
-  return SourceCast(lang, type, true);
+std::string SourceCast(const Type &type) {
+  return SourceCast(type, true);
 }
 
-std::string SourceCastBasic(const LanguageParameters &lang, const Type &type,
-                                   bool castFromDest) {
-  return IsScalar(type.base_type) ? SourceCast(lang, type, castFromDest) : "";
+std::string SourceCastBasic(const Type &type, bool castFromDest) {
+  return IsScalar(type.base_type) ? SourceCast(type, castFromDest) : "";
 }
 
-std::string SourceCastBasic(const LanguageParameters &lang, const Type &type) {
-  return SourceCastBasic(lang, type, true);
+std::string SourceCastBasic(const Type &type) {
+  return SourceCastBasic(type, true);
 }
 
 
@@ -481,10 +473,10 @@ std::string GenEnumDefaultValue(const Value &value) {
   return result;
 }
 
-std::string GenDefaultValue(const LanguageParameters &lang, 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 &&
+    if (lang_.language == IDLOptions::kCSharp &&
         value.type.enum_def != nullptr &&
         value.type.base_type != BASE_TYPE_UNION) {
       return GenEnumDefaultValue(value);
@@ -497,14 +489,14 @@ std::string GenDefaultValue(const LanguageParameters &lang, const Value &value,
   }
 }
 
-std::string GenDefaultValue(const LanguageParameters &lang, const Value &value) {
-  return GenDefaultValue(lang, value, true);
+std::string GenDefaultValue(const Value &value) {
+  return GenDefaultValue(value, true);
 }
 
-std::string GenDefaultValueBasic(const LanguageParameters &lang, 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) {
+      if (lang_.language == IDLOptions::kCSharp) {
         switch (value.type.base_type) {
         case BASE_TYPE_STRING:
           return "default(StringOffset)";
@@ -519,14 +511,14 @@ std::string GenDefaultValueBasic(const LanguageParameters &lang, const Value &va
     }
     return "0";
   }
-  return GenDefaultValue(lang, value, enableLangOverrides);
+  return GenDefaultValue(value, enableLangOverrides);
 }
 
-std::string GenDefaultValueBasic(const LanguageParameters &lang, const Value &value) {
-  return GenDefaultValueBasic(lang, value, true);
+std::string GenDefaultValueBasic(const Value &value) {
+  return GenDefaultValueBasic(value, true);
 }
 
-void GenEnum(const LanguageParameters &lang, 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;
 
@@ -535,33 +527,33 @@ void GenEnum(const LanguageParameters &lang, EnumDef &enum_def, std::string *cod
   // In Java, we use ints rather than the Enum feature, because we want them
   // to map directly to how they're used in C/C++ and file formats.
   // That, and Java Enums are expensive, and not universally liked.
-  GenComment(enum_def.doc_comment, code_ptr, &lang.comment_config);
-  code += std::string("public ") + lang.enum_decl + enum_def.name;
-  if (lang.language == IDLOptions::kCSharp) {
-    code += lang.inheritance_marker + GenTypeBasic(lang, enum_def.underlying_type, false);
+  GenComment(enum_def.doc_comment, code_ptr, &lang_.comment_config);
+  code += std::string("public ") + lang_.enum_decl + enum_def.name;
+  if (lang_.language == IDLOptions::kCSharp) {
+    code += lang_.inheritance_marker + GenTypeBasic(enum_def.underlying_type, false);
   }
-  code += lang.open_curly;
-  if (lang.language == IDLOptions::kJava) {
+  code += lang_.open_curly;
+  if (lang_.language == IDLOptions::kJava) {
     code += "  private " + enum_def.name + "() { }\n";
   }
   for (auto it = enum_def.vals.vec.begin();
        it != enum_def.vals.vec.end();
        ++it) {
     auto &ev = **it;
-    GenComment(ev.doc_comment, code_ptr, &lang.comment_config, "  ");
-    if (lang.language != IDLOptions::kCSharp) {
+    GenComment(ev.doc_comment, code_ptr, &lang_.comment_config, "  ");
+    if (lang_.language != IDLOptions::kCSharp) {
       code += "  public static";
-      code += lang.const_decl;
-      code += GenTypeBasic(lang, enum_def.underlying_type, false);
+      code += lang_.const_decl;
+      code += GenTypeBasic(enum_def.underlying_type, false);
     }
     code += " " + ev.name + " = ";
     code += NumToString(ev.value);
-    code += lang.enum_separator;
+    code += lang_.enum_separator;
   }
 
   // Generate a generate string table for enum values.
   // We do not do that for C# where this functionality is native.
-  if (lang.language != IDLOptions::kCSharp) {
+  if (lang_.language != IDLOptions::kCSharp) {
     // Problem is, if values are very sparse that could generate really big
     // tables. Ideally in that case we generate a map lookup instead, but for
     // the moment we simply don't output a table at all.
@@ -572,8 +564,8 @@ void GenEnum(const LanguageParameters &lang, EnumDef &enum_def, std::string *cod
     static const int kMaxSparseness = 5;
     if (range / static_cast<int64_t>(enum_def.vals.vec.size()) < kMaxSparseness) {
       code += "\n  private static";
-      code += lang.const_decl;
-      code += lang.string_type;
+      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();
@@ -584,8 +576,8 @@ void GenEnum(const LanguageParameters &lang, EnumDef &enum_def, std::string *cod
       }
       code += "};\n\n";
       code += "  public static ";
-      code += lang.string_type;
-      code += " " + MakeCamel("name", lang.first_camel_upper);
+      code += lang_.string_type;
+      code += " " + MakeCamel("name", lang_.first_camel_upper);
       code += "(int e) { return names[e";
       if (enum_def.vals.vec.front()->value)
         code += " - " + enum_def.vals.vec.front()->name;
@@ -598,18 +590,18 @@ void GenEnum(const LanguageParameters &lang, EnumDef &enum_def, std::string *cod
 }
 
 // Returns the function name that is able to read a value of the given type.
-std::string GenGetter(const LanguageParameters &lang, const Type &type) {
+std::string GenGetter(const Type &type) {
   switch (type.base_type) {
     case BASE_TYPE_STRING: return "__string";
     case BASE_TYPE_STRUCT: return "__struct";
     case BASE_TYPE_UNION:  return "__union";
-    case BASE_TYPE_VECTOR: return GenGetter(lang, type.VectorType());
+    case BASE_TYPE_VECTOR: return GenGetter(type.VectorType());
     default: {
-      std::string getter = "bb." + FunctionStart(lang, 'G') + "et";
+      std::string getter = "bb." + FunctionStart('G') + "et";
       if (type.base_type == BASE_TYPE_BOOL) {
         getter = "0!=" + getter;
-      } else if (GenTypeBasic(lang, type, false) != "byte") {
-        getter += MakeCamel(GenTypeBasic(lang, type, false));
+      } else if (GenTypeBasic(type, false) != "byte") {
+        getter += MakeCamel(GenTypeBasic(type, false));
       }
       return getter;
     }
@@ -618,12 +610,12 @@ std::string GenGetter(const LanguageParameters &lang, const Type &type) {
 
 // Direct mutation is only allowed for scalar fields.
 // Hence a setter method will only be generated for such fields.
-std::string GenSetter(const LanguageParameters &lang, const Type &type) {
+std::string GenSetter(const Type &type) {
   if (IsScalar(type.base_type)) {
-    std::string setter = "bb." + FunctionStart(lang, 'P') + "ut";
-    if (GenTypeBasic(lang, type, false) != "byte" &&
+    std::string setter = "bb." + FunctionStart('P') + "ut";
+    if (GenTypeBasic(type, false) != "byte" &&
         type.base_type != BASE_TYPE_BOOL) {
-      setter += MakeCamel(GenTypeBasic(lang, type, false));
+      setter += MakeCamel(GenTypeBasic(type, false));
     }
     return setter;
   } else {
@@ -632,16 +624,15 @@ std::string GenSetter(const LanguageParameters &lang, const Type &type) {
 }
 
 // Returns the method name for use with add/put calls.
-std::string GenMethod(const LanguageParameters &lang, const Type &type) {
+std::string GenMethod(const Type &type) {
   return IsScalar(type.base_type)
-    ? MakeCamel(GenTypeBasic(lang, type, false))
+    ? MakeCamel(GenTypeBasic(type, false))
     : (IsStruct(type) ? "Struct" : "Offset");
 }
 
 // Recursively generate arguments for a constructor, to deal with nested
 // structs.
-void GenStructArgs(const LanguageParameters &lang, const StructDef &struct_def,
-                          std::string *code_ptr, const char *nameprefix) {
+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();
@@ -651,14 +642,14 @@ void GenStructArgs(const LanguageParameters &lang, const StructDef &struct_def,
       // Generate arguments for a struct inside a struct. To ensure names
       // don't clash, and to make it obvious these arguments are constructing
       // a nested struct, prefix the name with the field name.
-      GenStructArgs(lang, *field.value.type.struct_def, code_ptr,
+      GenStructArgs(*field.value.type.struct_def, code_ptr,
                     (nameprefix + (field.name + "_")).c_str());
     } else {
       code += ", ";
-      code += GenTypeBasic(lang, DestinationType(lang, field.value.type, false));
+      code += GenTypeBasic(DestinationType(field.value.type, false));
       code += " ";
       code += nameprefix;
-      code += MakeCamel(field.name, lang.first_camel_upper);
+      code += MakeCamel(field.name, lang_.first_camel_upper);
     }
   }
 }
@@ -666,34 +657,33 @@ void GenStructArgs(const LanguageParameters &lang, const StructDef &struct_def,
 // Recusively generate struct construction statements of the form:
 // builder.putType(name);
 // and insert manual padding.
-void GenStructBody(const LanguageParameters &lang, const StructDef &struct_def,
-                          std::string *code_ptr, const char *nameprefix) {
+void GenStructBody(const StructDef &struct_def, std::string *code_ptr, const char *nameprefix) {
   std::string &code = *code_ptr;
-  code += "    builder." + FunctionStart(lang, 'P') + "rep(";
+  code += "    builder." + FunctionStart('P') + "rep(";
   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) {
     auto &field = **it;
     if (field.padding) {
-      code += "    builder." + FunctionStart(lang, 'P') + "ad(";
+      code += "    builder." + FunctionStart('P') + "ad(";
       code += NumToString(field.padding) + ");\n";
     }
     if (IsStruct(field.value.type)) {
-      GenStructBody(lang, *field.value.type.struct_def, code_ptr,
+      GenStructBody(*field.value.type.struct_def, code_ptr,
                     (nameprefix + (field.name + "_")).c_str());
     } else {
-      code += "    builder." + FunctionStart(lang, 'P') + "ut";
-      code += GenMethod(lang, field.value.type) + "(";
-      code += SourceCast(lang, field.value.type);
-      auto argname = nameprefix + MakeCamel(field.name, lang.first_camel_upper);
+      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);
       code += argname;
       code += ");\n";
     }
   }
 }
 
-void GenStruct(const LanguageParameters &lang, 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;
 
@@ -703,23 +693,23 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
   // public type name() {
   //   int o = __offset(offset); return o != 0 ? bb.getType(o + i) : default;
   // }
-  GenComment(struct_def.doc_comment, code_ptr, &lang.comment_config);
+  GenComment(struct_def.doc_comment, code_ptr, &lang_.comment_config);
   code += "public ";
-  if (lang.language == IDLOptions::kCSharp &&
+  if (lang_.language == IDLOptions::kCSharp &&
       struct_def.attributes.Lookup("csharp_partial")) {
     // generate a partial class for this C# struct/table
     code += "partial ";
   }
   else {
-    code += lang.unsubclassable_decl;
+    code += lang_.unsubclassable_decl;
   }
-  code += "class " + struct_def.name + lang.inheritance_marker;
+  code += "class " + struct_def.name + lang_.inheritance_marker;
   code += struct_def.fixed ? "Struct" : "Table";
   code += " {\n";
   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(lang, 'G') + "etRootAs" + struct_def.name;
+    std::string method_name = FunctionStart('G') + "etRootAs" + struct_def.name;
     std::string method_signature = "  public static " + struct_def.name + " " + method_name;
 
     // create convenience method that doesn't require an existing object
@@ -728,18 +718,18 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
 
     // create method that allows object reuse
     code += method_signature + "(ByteBuffer _bb, " + struct_def.name + " obj) { ";
-    code += lang.set_bb_byteorder;
-    code += "return (obj.__init(_bb." + FunctionStart(lang, 'G');
+    code += lang_.set_bb_byteorder;
+    code += "return (obj.__init(_bb." + FunctionStart('G');
     code += "etInt(_bb.";
-    code += lang.get_bb_position;
+    code += lang_.get_bb_position;
     code += ") + _bb.";
-    code += lang.get_bb_position;
+    code += lang_.get_bb_position;
     code += ", _bb)); }\n";
     if (parser_.root_struct_def_ == &struct_def) {
       if (parser_.file_identifier_.length()) {
         // Check if a buffer has the identifier.
         code += "  public static ";
-        code += lang.bool_type + struct_def.name;
+        code += lang_.bool_type + struct_def.name;
         code += "BufferHasIdentifier(ByteBuffer _bb) { return ";
         code += "__has_identifier(_bb, \"" + parser_.file_identifier_;
         code += "\"); }\n";
@@ -756,14 +746,14 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
        ++it) {
     auto &field = **it;
     if (field.deprecated) continue;
-    GenComment(field.doc_comment, code_ptr, &lang.comment_config, "  ");
-    std::string type_name = GenTypeGet(lang, field.value.type);
-    std::string type_name_dest = GenTypeNameDest(lang, field.value.type);
-    std::string dest_mask = DestinationMask(lang, field.value.type, true);
-    std::string dest_cast = DestinationCast(lang, field.value.type);
-    std::string src_cast = SourceCast(lang, field.value.type);
+    GenComment(field.doc_comment, code_ptr, &lang_.comment_config, "  ");
+    std::string type_name = GenTypeGet(field.value.type);
+    std::string type_name_dest = GenTypeNameDest(field.value.type);
+    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 " + type_name_dest + " " +
-                               MakeCamel(field.name, lang.first_camel_upper);
+                               MakeCamel(field.name, lang_.first_camel_upper);
 
     // Most field accessors need to retrieve and test the field offset first,
     // this is the prefix code for that:
@@ -773,16 +763,16 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
     // Generate the accessors that don't do object reuse.
     if (field.value.type.base_type == BASE_TYPE_STRUCT) {
       // Calls the accessor that takes an accessor object with a new object.
-      if (lang.language == IDLOptions::kCSharp) {
+      if (lang_.language == IDLOptions::kCSharp) {
         code += method_start + " { get { return Get";
-        code += MakeCamel(field.name, lang.first_camel_upper);
+        code += MakeCamel(field.name, lang_.first_camel_upper);
         code += "(new ";
         code += type_name + "()); } }\n";
-        method_start = "  public " + type_name_dest + " Get" + MakeCamel(field.name, lang.first_camel_upper);
+        method_start = "  public " + type_name_dest + " Get" + MakeCamel(field.name, lang_.first_camel_upper);
       }
       else {
         code += method_start + "() { return ";
-        code += MakeCamel(field.name, lang.first_camel_upper);
+        code += MakeCamel(field.name, lang_.first_camel_upper);
         code += "(new ";
         code += type_name + "()); }\n";
       }
@@ -790,32 +780,32 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
                field.value.type.element == BASE_TYPE_STRUCT) {
       // Accessors for vectors of structs also take accessor objects, this
       // generates a variant without that argument.
-      if (lang.language == IDLOptions::kCSharp) {
-        method_start = "  public " + type_name_dest + " Get" + MakeCamel(field.name, lang.first_camel_upper);
+      if (lang_.language == IDLOptions::kCSharp) {
+        method_start = "  public " + type_name_dest + " Get" + MakeCamel(field.name, lang_.first_camel_upper);
         code += method_start + "(int j) { return Get";
       } else {
         code += method_start + "(int j) { return ";
       }
-      code += MakeCamel(field.name, lang.first_camel_upper);
+      code += MakeCamel(field.name, lang_.first_camel_upper);
       code += "(new ";
       code += type_name + "(), j); }\n";
     } else if (field.value.type.base_type == BASE_TYPE_VECTOR) {
-      if (lang.language == IDLOptions::kCSharp) {
-        method_start = "  public " + type_name_dest + " Get" + MakeCamel(field.name, lang.first_camel_upper);
+      if (lang_.language == IDLOptions::kCSharp) {
+        method_start = "  public " + type_name_dest + " Get" + MakeCamel(field.name, lang_.first_camel_upper);
       }
     } else if (field.value.type.base_type == BASE_TYPE_UNION) {
-      if (lang.language == IDLOptions::kCSharp) {
+      if (lang_.language == IDLOptions::kCSharp) {
         // union types in C# use generic Table-derived type for better type safety
-        method_start = "  public " + type_name_dest + " Get" + MakeCamel(field.name, lang.first_camel_upper) + "<TTable>";
+        method_start = "  public " + type_name_dest + " Get" + MakeCamel(field.name, lang_.first_camel_upper) + "<TTable>";
         offset_prefix = " where TTable : Table" + offset_prefix;
         type_name = type_name_dest;
       }
     }
-    std::string getter = dest_cast + GenGetter(lang, field.value.type);
+    std::string getter = dest_cast + GenGetter(field.value.type);
     code += method_start;
     std::string default_cast = "";
     // only create default casts for c# scalars or vectors of scalars
-    if (lang.language == IDLOptions::kCSharp &&
+    if (lang_.language == IDLOptions::kCSharp &&
         (IsScalar(field.value.type.base_type) ||
          (field.value.type.base_type == BASE_TYPE_VECTOR && IsScalar(field.value.type.element)))) {
       // For scalars, default value will be returned by GetDefaultValue(). If the scalar is an enum, GetDefaultValue()
@@ -827,8 +817,8 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
     }
     std::string member_suffix = "";
     if (IsScalar(field.value.type.base_type)) {
-      code += lang.getter_prefix;
-      member_suffix = lang.getter_suffix;
+      code += lang_.getter_prefix;
+      member_suffix = lang_.getter_suffix;
       if (struct_def.fixed) {
         code += " { return " + getter;
         code += "(bb_pos + " + NumToString(field.value.offset) + ")";
@@ -836,7 +826,7 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
       } else {
         code += offset_prefix + getter;
         code += "(o + bb_pos)" + dest_mask + " : " + default_cast;
-        code += GenDefaultValue(lang, field.value);
+        code += GenDefaultValue(field.value);
       }
     } else {
       switch (field.value.type.base_type) {
@@ -856,8 +846,8 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
           }
           break;
         case BASE_TYPE_STRING:
-          code += lang.getter_prefix;
-          member_suffix = lang.getter_suffix;
+          code += lang_.getter_prefix;
+          member_suffix = lang_.getter_suffix;
           code += offset_prefix + getter + "(o + bb_pos) : null";
           break;
         case BASE_TYPE_VECTOR: {
@@ -896,22 +886,22 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
     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 += lang_.getter_prefix;
       code += offset_prefix;
       code += "__vector_len(o) : 0; ";
-      code += lang.getter_suffix;
+      code += lang_.getter_suffix;
       code += "}\n";
     }
     // Generate a ByteBuffer accessor for strings & vectors of scalars.
     if ((field.value.type.base_type == BASE_TYPE_VECTOR &&
          IsScalar(field.value.type.VectorType().base_type)) ||
          field.value.type.base_type == BASE_TYPE_STRING) {
-      switch (lang.language) {
+      switch (lang_.language) {
         case IDLOptions::kJava:
           code += "  public ByteBuffer ";
-          code += MakeCamel(field.name, lang.first_camel_upper);
+          code += MakeCamel(field.name, lang_.first_camel_upper);
           code += "AsByteBuffer() { return __vector_as_bytebuffer(";
           code += NumToString(field.value.offset) + ", ";
           code += NumToString(field.value.type.base_type == BASE_TYPE_STRING ? 1 :
@@ -920,7 +910,7 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
           break;
         case IDLOptions::kCSharp:
           code += "  public ArraySegment<byte>? Get";
-          code += MakeCamel(field.name, lang.first_camel_upper);
+          code += MakeCamel(field.name, lang_.first_camel_upper);
           code += "Bytes() { return __vector_as_arraysegment(";
           code += NumToString(field.value.offset);
           code += "); }\n";
@@ -936,10 +926,10 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
       parser_.namespaces_.back()->GetFullyQualifiedName(nested->constant);
     auto nested_type = parser_.structs_.Lookup(nested_qualified_name);
     auto nested_type_name = WrapInNameSpace(*nested_type);
-    auto nestedMethodName = MakeCamel(field.name, lang.first_camel_upper)
+    auto nestedMethodName = MakeCamel(field.name, lang_.first_camel_upper)
       + "As" + nested_type_name;
     auto getNestedMethodName = nestedMethodName;
-    if (lang.language == IDLOptions::kCSharp) {
+    if (lang_.language == IDLOptions::kCSharp) {
       getNestedMethodName = "Get" + nestedMethodName;
     }
     code += "  public " + nested_type_name + " ";
@@ -957,10 +947,10 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
                     : field.value.type;
       // boolean parameters have to be explicitly converted to byte representation
       auto setter_parameter = underlying_type.base_type == BASE_TYPE_BOOL ? "(byte)(" + field.name + " ? 1 : 0)" : field.name;
-      auto mutator_prefix = MakeCamel("mutate", lang.first_camel_upper);
+      auto mutator_prefix = MakeCamel("mutate", lang_.first_camel_upper);
       //a vector mutator also needs the index of the vector element it should mutate
       auto mutator_params = (field.value.type.base_type == BASE_TYPE_VECTOR ? "(int j, " : "(") +
-                            GenTypeNameDest(lang, underlying_type) + " " +
+                            GenTypeNameDest(underlying_type) + " " +
                             field.name + ") { ";
       auto setter_index = field.value.type.base_type == BASE_TYPE_VECTOR
                     ? "__vector(o) + j * " + NumToString(InlineSize(underlying_type))
@@ -969,15 +959,15 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
           (field.value.type.base_type == BASE_TYPE_VECTOR &&
           IsScalar(field.value.type.VectorType().base_type))) {
         code += "  public ";
-        code += struct_def.fixed ? "void " : lang.bool_type;
+        code += struct_def.fixed ? "void " : lang_.bool_type;
         code += mutator_prefix + MakeCamel(field.name, true);
         code += mutator_params;
         if (struct_def.fixed) {
-          code += GenSetter(lang, underlying_type) + "(" + setter_index + ", ";
+          code += GenSetter(underlying_type) + "(" + setter_index + ", ";
           code += src_cast + setter_parameter + "); }\n";
         } else {
           code += "int o = __offset(" + NumToString(field.value.offset) + ");";
-          code += " if (o != 0) { " + GenSetter(lang, underlying_type);
+          code += " if (o != 0) { " + GenSetter(underlying_type);
           code += "(" + setter_index + ", " + src_cast + setter_parameter + "); return true; } else { return false; } }\n";
         }
       }
@@ -986,14 +976,14 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
   code += "\n";
   if (struct_def.fixed) {
     // create a struct constructor function
-    code += "  public static " + GenOffsetType(lang, struct_def) + " ";
-    code += FunctionStart(lang, 'C') + "reate";
+    code += "  public static " + GenOffsetType(struct_def) + " ";
+    code += FunctionStart('C') + "reate";
     code += struct_def.name + "(FlatBufferBuilder builder";
-    GenStructArgs(lang, struct_def, code_ptr, "");
+    GenStructArgs(struct_def, code_ptr, "");
     code += ") {\n";
-    GenStructBody(lang, struct_def, code_ptr, "");
+    GenStructBody(struct_def, code_ptr, "");
     code += "    return ";
-    code += GenOffsetConstruct(lang, struct_def, "builder." + std::string(lang.get_fbb_offset));
+    code += GenOffsetConstruct(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
@@ -1014,28 +1004,28 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
     if (has_no_struct_fields && num_fields) {
       // Generate a table constructor of the form:
       // public static int createName(FlatBufferBuilder builder, args...)
-      code += "  public static " + GenOffsetType(lang, struct_def) + " ";
-      code += FunctionStart(lang, 'C') + "reate" + struct_def.name;
+      code += "  public static " + GenOffsetType(struct_def) + " ";
+      code += FunctionStart('C') + "reate" + struct_def.name;
       code += "(FlatBufferBuilder builder";
       for (auto it = struct_def.fields.vec.begin();
            it != struct_def.fields.vec.end(); ++it) {
         auto &field = **it;
         if (field.deprecated) continue;
         code += ",\n      ";
-        code += GenTypeBasic(lang, DestinationType(lang, field.value.type, false));
+        code += GenTypeBasic(DestinationType(field.value.type, false));
         code += " ";
         code += field.name;
         if (!IsScalar(field.value.type.base_type)) code += "Offset";
 
         // Java doesn't have defaults, which means this method must always
         // supply all arguments, and thus won't compile when fields are added.
-        if (lang.language != IDLOptions::kJava) {
+        if (lang_.language != IDLOptions::kJava) {
           code += " = ";
-          code += GenDefaultValueBasic(lang, field.value);
+          code += GenDefaultValueBasic(field.value);
         }
       }
       code += ") {\n    builder.";
-      code += FunctionStart(lang, 'S') + "tartObject(";
+      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;
@@ -1047,7 +1037,7 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
               (!struct_def.sortbysize ||
                size == SizeOf(field.value.type.base_type))) {
             code += "    " + struct_def.name + ".";
-            code += FunctionStart(lang, 'A') + "dd";
+            code += FunctionStart('A') + "dd";
             code += MakeCamel(field.name) + "(builder, " + field.name;
             if (!IsScalar(field.value.type.base_type)) code += "Offset";
             code += ");\n";
@@ -1055,7 +1045,7 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
         }
       }
       code += "    return " + struct_def.name + ".";
-      code += FunctionStart(lang, 'E') + "nd" + struct_def.name;
+      code += FunctionStart('E') + "nd" + struct_def.name;
       code += "(builder);\n  }\n\n";
     }
     // Generate a set of static methods that allow table construction,
@@ -1063,30 +1053,30 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
     // public static void addName(FlatBufferBuilder builder, short name)
     // { builder.addShort(id, name, default); }
     // Unlike the Create function, these always work.
-    code += "  public static void " + FunctionStart(lang, 'S') + "tart";
+    code += "  public static void " + FunctionStart('S') + "tart";
     code += struct_def.name;
     code += "(FlatBufferBuilder builder) { builder.";
-    code += FunctionStart(lang, 'S') + "tartObject(";
+    code += FunctionStart('S') + "tartObject(";
     code += NumToString(struct_def.fields.vec.size()) + "); }\n";
     for (auto it = struct_def.fields.vec.begin();
          it != struct_def.fields.vec.end(); ++it) {
       auto &field = **it;
       if (field.deprecated) continue;
-      code += "  public static void " + FunctionStart(lang, 'A') + "dd";
+      code += "  public static void " + FunctionStart('A') + "dd";
       code += MakeCamel(field.name);
       code += "(FlatBufferBuilder builder, ";
-      code += GenTypeBasic(lang, DestinationType(lang, field.value.type, false));
+      code += GenTypeBasic(DestinationType(field.value.type, false));
       auto argname = MakeCamel(field.name, false);
       if (!IsScalar(field.value.type.base_type)) argname += "Offset";
-      code += " " + argname + ") { builder." + FunctionStart(lang, 'A') + "dd";
-      code += GenMethod(lang, field.value.type) + "(";
+      code += " " + argname + ") { builder." + FunctionStart('A') + "dd";
+      code += GenMethod(field.value.type) + "(";
       code += NumToString(it - struct_def.fields.vec.begin()) + ", ";
-      code += SourceCastBasic(lang, field.value.type);
+      code += SourceCastBasic(field.value.type);
       code += argname;
-      if(!IsScalar(field.value.type.base_type) && field.value.type.base_type != BASE_TYPE_UNION && lang.language == IDLOptions::kCSharp) {
+      if(!IsScalar(field.value.type.base_type) && field.value.type.base_type != BASE_TYPE_UNION && lang_.language == IDLOptions::kCSharp) {
         code += ".Value";
       }
-      code += ", " + GenDefaultValue(lang, field.value, false);
+      code += ", " + GenDefaultValue(field.value, false);
       code += "); }\n";
       if (field.value.type.base_type == BASE_TYPE_VECTOR) {
         auto vector_type = field.value.type.VectorType();
@@ -1094,58 +1084,58 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
         auto elem_size = InlineSize(vector_type);
         if (!IsStruct(vector_type)) {
           // Generate a method to create a vector from a Java array.
-          code += "  public static " + GenVectorOffsetType(lang) + " " + FunctionStart(lang, 'C') + "reate";
+          code += "  public static " + GenVectorOffsetType() + " " + FunctionStart('C') + "reate";
           code += MakeCamel(field.name);
           code += "Vector(FlatBufferBuilder builder, ";
-          code += GenTypeBasic(lang, vector_type) + "[] data) ";
-          code += "{ builder." + FunctionStart(lang, 'S') + "tartVector(";
+          code += GenTypeBasic(vector_type) + "[] data) ";
+          code += "{ builder." + FunctionStart('S') + "tartVector(";
           code += NumToString(elem_size);
-          code += ", data." + FunctionStart(lang, 'L') + "ength, ";
+          code += ", data." + FunctionStart('L') + "ength, ";
           code += NumToString(alignment);
           code += "); for (int i = data.";
-          code += FunctionStart(lang, 'L') + "ength - 1; i >= 0; i--) builder.";
-          code += FunctionStart(lang, 'A') + "dd";
-          code += GenMethod(lang, vector_type);
+          code += FunctionStart('L') + "ength - 1; i >= 0; i--) builder.";
+          code += FunctionStart('A') + "dd";
+          code += GenMethod(vector_type);
           code += "(";
-          code += SourceCastBasic(lang, vector_type, false);
+          code += SourceCastBasic(vector_type, false);
           code += "data[i]";
-          if (lang.language == IDLOptions::kCSharp &&
+          if (lang_.language == IDLOptions::kCSharp &&
             (vector_type.base_type == BASE_TYPE_STRUCT || vector_type.base_type == BASE_TYPE_STRING))
             code += ".Value";
           code += "); return ";
-          code += "builder." + FunctionStart(lang, 'E') + "ndVector(); }\n";
+          code += "builder." + FunctionStart('E') + "ndVector(); }\n";
         }
         // Generate a method to start a vector, data to be added manually after.
-        code += "  public static void " + FunctionStart(lang, 'S') + "tart";
+        code += "  public static void " + FunctionStart('S') + "tart";
         code += MakeCamel(field.name);
         code += "Vector(FlatBufferBuilder builder, int numElems) ";
-        code += "{ builder." + FunctionStart(lang, 'S') + "tartVector(";
+        code += "{ builder." + FunctionStart('S') + "tartVector(";
         code += NumToString(elem_size);
         code += ", numElems, " + NumToString(alignment);
         code += "); }\n";
       }
     }
-    code += "  public static " + GenOffsetType(lang, struct_def) + " ";
-    code += FunctionStart(lang, 'E') + "nd" + struct_def.name;
+    code += "  public static " + GenOffsetType(struct_def) + " ";
+    code += FunctionStart('E') + "nd" + struct_def.name;
     code += "(FlatBufferBuilder builder) {\n    int o = builder.";
-    code += FunctionStart(lang, 'E') + "ndObject();\n";
+    code += FunctionStart('E') + "ndObject();\n";
     for (auto it = struct_def.fields.vec.begin();
          it != struct_def.fields.vec.end();
          ++it) {
       auto &field = **it;
       if (!field.deprecated && field.required) {
-        code += "    builder." + FunctionStart(lang, 'R') + "equired(o, ";
+        code += "    builder." + FunctionStart('R') + "equired(o, ";
         code += NumToString(field.value.offset);
         code += ");  // " + field.name + "\n";
       }
     }
-    code += "    return " + GenOffsetConstruct(lang, struct_def, "o") + ";\n  }\n";
+    code += "    return " + GenOffsetConstruct(struct_def, "o") + ";\n  }\n";
     if (parser_.root_struct_def_ == &struct_def) {
       code += "  public static void ";
-      code += FunctionStart(lang, 'F') + "inish" + struct_def.name;
-      code += "Buffer(FlatBufferBuilder builder, " + GenOffsetType(lang, struct_def) + " offset) {";
-      code += " builder." + FunctionStart(lang, 'F') + "inish(offset";
-      if (lang.language == IDLOptions::kCSharp) {
+      code += FunctionStart('F') + "inish" + struct_def.name;
+      code += "Buffer(FlatBufferBuilder builder, " + GenOffsetType(struct_def) + " offset) {";
+      code += " builder." + FunctionStart('F') + "inish(offset";
+      if (lang_.language == IDLOptions::kCSharp) {
         code += ".Value";
       }
 
@@ -1156,6 +1146,7 @@ void GenStruct(const LanguageParameters &lang, StructDef &struct_def, std::strin
   }
   code += "};\n\n";
 }  
+    const LanguageParameters & lang_ = language_parameters[parser_.opts.lang];
 };
 }  // namespace general
 

From 66f2aac26fe28165cb0a2036249954ddbf122d87 Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Tue, 14 Jun 2016 19:19:55 +0200
Subject: [PATCH 176/185] php:pulled methods inside the generator

---
 src/idl_gen_php.cpp | 144 +++++++++++++++++++++-----------------------
 1 file changed, 68 insertions(+), 76 deletions(-)

diff --git a/src/idl_gen_php.cpp b/src/idl_gen_php.cpp
index 68ddc8171..31b05b505 100644
--- a/src/idl_gen_php.cpp
+++ b/src/idl_gen_php.cpp
@@ -25,14 +25,74 @@
 
 namespace flatbuffers {
 namespace php {
+    // Hardcode spaces per indentation.
+    const std::string Indent = "    ";
+    class PhpGenerator : public BaseGenerator {
+     public:
+      PhpGenerator(const Parser &parser, const std::string &path,
+                   const std::string &file_name)
+          : BaseGenerator(parser, path, file_name){};
+      bool generate() {
+        if (!generateEnums()) return false;
+        if (!generateStructs()) return false;
+        return true;
+      }
 
-    static std::string GenGetter(const Type &type);
-    static std::string GenDefaultValue(const Value &value);
-    static std::string GenMethod(const FieldDef &field);
-    static void GenStructBuilder(const StructDef &struct_def,
-      std::string *code_ptr);
-    static std::string GenTypeBasic(const Type &type);
-    static std::string GenTypeGet(const Type &type);
+     private:
+      bool generateEnums() {
+        for (auto it = parser_.enums_.vec.begin();
+             it != parser_.enums_.vec.end(); ++it) {
+          auto &enum_def = **it;
+          std::string enumcode;
+          GenEnum(enum_def, &enumcode);
+          if (!SaveType(enum_def, enumcode, false)) return false;
+        }
+        return true;
+      }
+
+      bool generateStructs() {
+        for (auto it = parser_.structs_.vec.begin();
+             it != parser_.structs_.vec.end(); ++it) {
+          auto &struct_def = **it;
+          std::string declcode;
+          GenStruct(parser_, struct_def, &declcode);
+          if (!SaveType(struct_def, declcode, true)) return false;
+        }
+        return true;
+      }
+
+      // Begin by declaring namespace and imports.
+      void BeginFile(const std::string name_space_name,
+                     const bool needs_imports, std::string *code_ptr) {
+        std::string &code = *code_ptr;
+        code += "<?php\n";
+        code = code + "// " + FlatBuffersGeneratedWarning();
+        code += "namespace " + name_space_name + ";\n\n";
+
+        if (needs_imports) {
+          code += "use \\Google\\FlatBuffers\\Struct;\n";
+          code += "use \\Google\\FlatBuffers\\Table;\n";
+          code += "use \\Google\\FlatBuffers\\ByteBuffer;\n";
+          code += "use \\Google\\FlatBuffers\\FlatBufferBuilder;\n";
+          code += "\n";
+        }
+      }
+
+      // Save out the generated code for a Php Table type.
+      bool SaveType(const Definition &def, const std::string &classcode,
+                    bool needs_imports) {
+        if (!classcode.length()) return true;
+
+        std::string code = "";
+        BeginFile(FullNamespace("\\", *def.defined_namespace),
+                  needs_imports, &code);
+        code += classcode;
+
+        std::string filename = NamespaceDir(*def.defined_namespace) +
+                               kPathSeparator + def.name + ".php";
+        return SaveFile(filename.c_str(), code, false);
+      }
+      
 
     // Ensure that a type is prefixed with its namespace whenever it is used
     // outside of its namespace.
@@ -51,9 +111,6 @@ namespace php {
     }
 
 
-    // Hardcode spaces per indentation.
-    const std::string Indent = "    ";
-
     // Begin a class declaration.
     static void BeginClass(const StructDef &struct_def, std::string *code_ptr) {
       std::string &code = *code_ptr;
@@ -927,72 +984,7 @@ namespace php {
       code += Indent + Indent + "return $builder->offset();\n";
       code += Indent + "}\n";
     }
-
-    class PhpGenerator : public BaseGenerator {
-     public:
-      PhpGenerator(const Parser &parser, const std::string &path,
-                   const std::string &file_name)
-          : BaseGenerator(parser, path, file_name){};
-      bool generate() {
-        if (!generateEnums()) return false;
-        if (!generateStructs()) return false;
-        return true;
-      }
-
-     private:
-      bool generateEnums() {
-        for (auto it = parser_.enums_.vec.begin();
-             it != parser_.enums_.vec.end(); ++it) {
-          auto &enum_def = **it;
-          std::string enumcode;
-          GenEnum(enum_def, &enumcode);
-          if (!SaveType(enum_def, enumcode, false)) return false;
-        }
-        return true;
-      }
-
-      bool generateStructs() {
-        for (auto it = parser_.structs_.vec.begin();
-             it != parser_.structs_.vec.end(); ++it) {
-          auto &struct_def = **it;
-          std::string declcode;
-          GenStruct(parser_, struct_def, &declcode);
-          if (!SaveType(struct_def, declcode, true)) return false;
-        }
-        return true;
-      }
-
-      // Begin by declaring namespace and imports.
-      void BeginFile(const std::string name_space_name,
-                     const bool needs_imports, std::string *code_ptr) {
-        std::string &code = *code_ptr;
-        code += "<?php\n";
-        code = code + "// " + FlatBuffersGeneratedWarning();
-        code += "namespace " + name_space_name + ";\n\n";
-
-        if (needs_imports) {
-          code += "use \\Google\\FlatBuffers\\Struct;\n";
-          code += "use \\Google\\FlatBuffers\\Table;\n";
-          code += "use \\Google\\FlatBuffers\\ByteBuffer;\n";
-          code += "use \\Google\\FlatBuffers\\FlatBufferBuilder;\n";
-          code += "\n";
-        }
-      }
-
-      // Save out the generated code for a Php Table type.
-      bool SaveType(const Definition &def, const std::string &classcode,
-                    bool needs_imports) {
-        if (!classcode.length()) return true;
-
-        std::string code = "";
-        BeginFile(FullNamespace("\\", *def.defined_namespace),
-                  needs_imports, &code);
-        code += classcode;
-
-        std::string filename = NamespaceDir(*def.defined_namespace) +
-                               kPathSeparator + def.name + ".php";
-        return SaveFile(filename.c_str(), code, false);
-      }
+      
     };
     }  // namespace php
 

From cb6cc3dfb6bac954d2bd29bdccccb9ed10bf30b9 Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Tue, 14 Jun 2016 19:26:08 +0200
Subject: [PATCH 177/185] php:removed parser from method signatures

---
 src/idl_gen_php.cpp | 62 ++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 37 deletions(-)

diff --git a/src/idl_gen_php.cpp b/src/idl_gen_php.cpp
index 31b05b505..11eb0fd1c 100644
--- a/src/idl_gen_php.cpp
+++ b/src/idl_gen_php.cpp
@@ -55,7 +55,7 @@ namespace php {
              it != parser_.structs_.vec.end(); ++it) {
           auto &struct_def = **it;
           std::string declcode;
-          GenStruct(parser_, struct_def, &declcode);
+          GenStruct(struct_def, &declcode);
           if (!SaveType(struct_def, declcode, true)) return false;
         }
         return true;
@@ -96,8 +96,7 @@ namespace php {
 
     // Ensure that a type is prefixed with its namespace whenever it is used
     // outside of its namespace.
-    static std::string WrapInNameSpace(const Namespace *ns,
-      const std::string &name) {
+    std::string WrapInNameSpace(const Namespace *ns, const std::string &name) {
       std::string qualified_name = "\\";
       for (auto it = ns->components.begin();
       it != ns->components.end(); ++it) {
@@ -106,7 +105,7 @@ namespace php {
       return qualified_name + name;
     }
 
-    static std::string WrapInNameSpace(const Definition &def) {
+    std::string WrapInNameSpace(const Definition &def) {
       return WrapInNameSpace(def.defined_namespace, def.name);
     }
 
@@ -246,8 +245,7 @@ namespace php {
     }
 
     // Get the value of a table's scalar.
-    static void GetScalarFieldOfTable(const FieldDef &field,
-      std::string *code_ptr) {
+    void GetScalarFieldOfTable(const FieldDef &field, std::string *code_ptr) {
       std::string &code = *code_ptr;
       std::string getter = GenGetter(field.value.type);
 
@@ -270,8 +268,7 @@ namespace php {
 
     // Get a struct by initializing an existing struct.
     // Specific to Struct.
-    static void GetStructFieldOfStruct(const FieldDef &field,
-      std::string *code_ptr) {
+    void GetStructFieldOfStruct(const FieldDef &field, std::string *code_ptr) {
       std::string &code = *code_ptr;
 
       code += Indent + "/**\n";
@@ -290,8 +287,7 @@ namespace php {
 
     // Get a struct by initializing an existing struct.
     // Specific to Table.
-    static void GetStructFieldOfTable(const FieldDef &field,
-      std::string *code_ptr) {
+    void GetStructFieldOfTable(const FieldDef &field, std::string *code_ptr) {
       std::string &code = *code_ptr;
 
       code += Indent + "public function get";
@@ -317,8 +313,7 @@ namespace php {
     }
 
     // Get the value of a string.
-    static void GetStringField(const FieldDef &field,
-      std::string *code_ptr) {
+    void GetStringField(const FieldDef &field, std::string *code_ptr) {
       std::string &code = *code_ptr;
       code += Indent + "public function get";
       code += MakeCamel(field.name);
@@ -335,8 +330,7 @@ namespace php {
     }
 
     // Get the value of a union from an object.
-    static void GetUnionField(const FieldDef &field,
-      std::string *code_ptr) {
+    void GetUnionField(const FieldDef &field, std::string *code_ptr) {
       std::string &code = *code_ptr;
 
       code += Indent + "/**\n";
@@ -355,9 +349,8 @@ namespace php {
     }
 
     // Get the value of a vector's struct member.
-    static void GetMemberOfVectorOfStruct(const StructDef &struct_def,
-      const FieldDef &field,
-      std::string *code_ptr) {
+    void GetMemberOfVectorOfStruct(const StructDef &struct_def,
+      const FieldDef &field, std::string *code_ptr) {
       std::string &code = *code_ptr;
       auto vectortype = field.value.type.VectorType();
 
@@ -419,7 +412,7 @@ namespace php {
 
     // Get the value of a vector's non-struct member. Uses a named return
     // argument to conveniently set the zero value for the result.
-    static void GetMemberOfVectorOfNonStruct(const FieldDef &field,
+    void GetMemberOfVectorOfNonStruct(const FieldDef &field,
       std::string *code_ptr) {
       std::string &code = *code_ptr;
       auto vectortype = field.value.type.VectorType();
@@ -660,9 +653,7 @@ namespace php {
     }
 
     // Get the offset of the end of a table.
-    static void GetEndOffsetOnTable(const Parser &parser,
-      const StructDef &struct_def,
-      std::string *code_ptr) {
+    void GetEndOffsetOnTable(const StructDef &struct_def, std::string *code_ptr) {
       std::string &code = *code_ptr;
 
 
@@ -689,7 +680,7 @@ namespace php {
       code += Indent + Indent + "return $o;\n";
       code += Indent + "}\n";
 
-      if (parser.root_struct_def_ == &struct_def) {
+      if (parser_.root_struct_def_ == &struct_def) {
         code += "\n";
         code += Indent + "public static function finish";
         code += struct_def.name;
@@ -697,16 +688,15 @@ namespace php {
         code += Indent + "{\n";
         code += Indent + Indent + "$builder->finish($offset";
 
-        if (parser.file_identifier_.length())
-          code += ", \"" + parser.file_identifier_ + "\"";
+        if (parser_.file_identifier_.length())
+          code += ", \"" + parser_.file_identifier_ + "\"";
         code += ");\n";
         code += Indent + "}\n";
       }
     }
 
   // Generate a struct field, conditioned on its child type(s).
-    static void GenStructAccessor(const StructDef &struct_def,
-      const FieldDef &field,
+    void GenStructAccessor(const StructDef &struct_def, const FieldDef &field,
       std::string *code_ptr) {
       GenComment(field.doc_comment, code_ptr, nullptr);
 
@@ -753,9 +743,7 @@ namespace php {
     }
 
     // Generate table constructors, conditioned on its members' types.
-    static void GenTableBuilders(const Parser &parser,
-      const StructDef &struct_def,
-      std::string *code_ptr) {
+    void GenTableBuilders(const StructDef &struct_def, std::string *code_ptr) {
       GetStartOfTable(struct_def, code_ptr);
 
       for (auto it = struct_def.fields.vec.begin();
@@ -782,11 +770,11 @@ namespace php {
         }
       }
 
-      GetEndOffsetOnTable(parser, struct_def, code_ptr);
+      GetEndOffsetOnTable(struct_def, code_ptr);
     }
 
     // Generate struct or table methods.
-    static void GenStruct(const Parser &parser, const StructDef &struct_def,
+    void GenStruct(const StructDef &struct_def,
       std::string *code_ptr) {
       if (struct_def.generated) return;
 
@@ -801,13 +789,13 @@ namespace php {
 
       std::string &code = *code_ptr;
       if (!struct_def.fixed) {
-        if (parser.file_identifier_.length()) {
+        if (parser_.file_identifier_.length()) {
           // Return the identifier
           code += Indent + "public static function " + struct_def.name;
           code += "Identifier()\n";
           code += Indent + "{\n";
           code += Indent + Indent + "return \"";
-          code += parser.file_identifier_ + "\";\n";
+          code += parser_.file_identifier_ + "\";\n";
           code += Indent + "}\n\n";
 
           // Check if a buffer has the identifier.
@@ -820,12 +808,12 @@ namespace php {
           code += Indent + "}\n\n";
         }
 
-        if (parser.file_extension_.length()) {
+        if (parser_.file_extension_.length()) {
           // Return the extension
           code += Indent + "public static function " + struct_def.name;
           code += "Extension()\n";
           code += Indent + "{\n";
-          code += Indent + Indent + "return \"" + parser.file_extension_;
+          code += Indent + Indent + "return \"" + parser_.file_extension_;
           code += "\";\n";
           code += Indent + "}\n\n";
         }
@@ -848,7 +836,7 @@ namespace php {
         GenStructBuilder(struct_def, code_ptr);
       } else {
         // Create a set of functions that allow table construction.
-        GenTableBuilders(parser, struct_def, code_ptr);
+        GenTableBuilders(struct_def, code_ptr);
       }
       EndClass(code_ptr);
     }
@@ -916,7 +904,7 @@ namespace php {
       return ctypename[type.base_type];
     }
 
-    static std::string GenDefaultValue(const Value &value) {
+    std::string GenDefaultValue(const Value &value) {
       if (value.type.enum_def) {
         if (auto val = value.type.enum_def->ReverseLookup(
           atoi(value.constant.c_str()), false)) {

From a9e21170bcd43878362dea64d87ab86a6758a049 Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Tue, 14 Jun 2016 21:41:11 +0200
Subject: [PATCH 178/185] js:pulled methods inside the class

---
 src/idl_gen_js.cpp | 124 ++++++++++++++++++++++-----------------------
 1 file changed, 60 insertions(+), 64 deletions(-)

diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp
index d724b80f4..bd593f17d 100644
--- a/src/idl_gen_js.cpp
+++ b/src/idl_gen_js.cpp
@@ -22,9 +22,67 @@
 #include "flatbuffers/code_generators.h"
 
 namespace flatbuffers {
-namespace js {
 
-static void GenNamespaces(const Parser &parser, std::string *code_ptr,
+static std::string GeneratedFileName(const std::string &path,
+                                     const std::string &file_name) {
+  return path + file_name + "_generated.js";
+}
+
+namespace js {
+// Iterate through all definitions we haven't generate code for (enums, structs,
+// and tables) and output them to a single file.
+class JsGenerator : public BaseGenerator {
+ public:
+  JsGenerator(const Parser &parser, const std::string &path,
+              const std::string &file_name)
+      : BaseGenerator(parser, path, file_name){};
+  // Iterate through all definitions we haven't generate code for (enums,
+  // structs, and tables) and output them to a single file.
+  bool generate() {
+    if (IsEverythingGenerated()) return true;
+
+    std::string enum_code, struct_code, exports_code, code;
+    generateEnums(&enum_code, &exports_code);
+    generateStructs(&struct_code, &exports_code);
+
+    code = code + "// " + FlatBuffersGeneratedWarning();
+
+    // Generate code for all the namespace declarations.
+    GenNamespaces(parser_, &code, &exports_code);
+
+    // Output the main declaration code from above.
+    code += enum_code;
+    code += struct_code;
+
+    if (!exports_code.empty() && !parser_.opts.skip_js_exports) {
+      code += "// Exports for Node.js and RequireJS\n";
+      code += exports_code;
+    }
+
+    return SaveFile(GeneratedFileName(path_, file_name_).c_str(), code, false);
+  }
+
+ private:
+  // Generate code for all enums.
+  void generateEnums(std::string *enum_code_ptr,
+                     std::string *exports_code_ptr) {
+    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
+         ++it) {
+      auto &enum_def = **it;
+      GenEnum(enum_def, enum_code_ptr, exports_code_ptr);
+    }
+  }
+
+  // Generate code for all structs.
+  void generateStructs(std::string *decl_code_ptr,
+                       std::string *exports_code_ptr) {
+    for (auto it = parser_.structs_.vec.begin();
+         it != parser_.structs_.vec.end(); ++it) {
+      auto &struct_def = **it;
+      GenStruct(parser_, struct_def, decl_code_ptr, exports_code_ptr);
+    }
+  }
+  static void GenNamespaces(const Parser &parser, std::string *code_ptr,
                           std::string *exports_ptr) {
   std::set<std::string> namespaces;
 
@@ -659,68 +717,6 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
     }
   }
 }
-
-}  // namespace js
-
-static std::string GeneratedFileName(const std::string &path,
-                                     const std::string &file_name) {
-  return path + file_name + "_generated.js";
-}
-
-namespace js {
-// Iterate through all definitions we haven't generate code for (enums, structs,
-// and tables) and output them to a single file.
-class JsGenerator : public BaseGenerator {
- public:
-  JsGenerator(const Parser &parser, const std::string &path,
-              const std::string &file_name)
-      : BaseGenerator(parser, path, file_name){};
-  // Iterate through all definitions we haven't generate code for (enums,
-  // structs, and tables) and output them to a single file.
-  bool generate() {
-    if (IsEverythingGenerated()) return true;
-
-    std::string enum_code, struct_code, exports_code, code;
-    generateEnums(&enum_code, &exports_code);
-    generateStructs(&struct_code, &exports_code);
-
-    code = code + "// " + FlatBuffersGeneratedWarning();
-
-    // Generate code for all the namespace declarations.
-    GenNamespaces(parser_, &code, &exports_code);
-
-    // Output the main declaration code from above.
-    code += enum_code;
-    code += struct_code;
-
-    if (!exports_code.empty() && !parser_.opts.skip_js_exports) {
-      code += "// Exports for Node.js and RequireJS\n";
-      code += exports_code;
-    }
-
-    return SaveFile(GeneratedFileName(path_, file_name_).c_str(), code, false);
-  }
-
- private:
-  // Generate code for all enums.
-  void generateEnums(std::string *enum_code_ptr,
-                     std::string *exports_code_ptr) {
-    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
-         ++it) {
-      auto &enum_def = **it;
-      GenEnum(enum_def, enum_code_ptr, exports_code_ptr);
-    }
-  }
-
-  // Generate code for all structs.
-  void generateStructs(std::string *decl_code_ptr,
-                       std::string *exports_code_ptr) {
-    for (auto it = parser_.structs_.vec.begin();
-         it != parser_.structs_.vec.end(); ++it) {
-      auto &struct_def = **it;
-      GenStruct(parser_, struct_def, decl_code_ptr, exports_code_ptr);
-    }
-  }
 };
 }  // namespace js
 

From 2f52618c4e05abffb72e368e134cf894689a0187 Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Tue, 14 Jun 2016 21:43:35 +0200
Subject: [PATCH 179/185] removed parser from the method signatures

---
 src/idl_gen_js.cpp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp
index bd593f17d..d152fa449 100644
--- a/src/idl_gen_js.cpp
+++ b/src/idl_gen_js.cpp
@@ -48,7 +48,7 @@ class JsGenerator : public BaseGenerator {
     code = code + "// " + FlatBuffersGeneratedWarning();
 
     // Generate code for all the namespace declarations.
-    GenNamespaces(parser_, &code, &exports_code);
+    GenNamespaces(&code, &exports_code);
 
     // Output the main declaration code from above.
     code += enum_code;
@@ -79,15 +79,14 @@ class JsGenerator : public BaseGenerator {
     for (auto it = parser_.structs_.vec.begin();
          it != parser_.structs_.vec.end(); ++it) {
       auto &struct_def = **it;
-      GenStruct(parser_, struct_def, decl_code_ptr, exports_code_ptr);
+      GenStruct(struct_def, decl_code_ptr, exports_code_ptr);
     }
   }
-  static void GenNamespaces(const Parser &parser, std::string *code_ptr,
-                          std::string *exports_ptr) {
+  void GenNamespaces(std::string *code_ptr, std::string *exports_ptr) {
   std::set<std::string> namespaces;
 
-  for (auto it = parser.namespaces_.begin();
-       it != parser.namespaces_.end(); ++it) {
+  for (auto it = parser_.namespaces_.begin();
+       it != parser_.namespaces_.end(); ++it) {
     std::string namespace_so_far;
 
     // Gather all parent namespaces for this namespace
@@ -378,8 +377,7 @@ static void GenStructBody(const StructDef &struct_def,
 }
 
 // Generate an accessor struct with constructor for a flatbuffers struct.
-static void GenStruct(const Parser &parser, StructDef &struct_def,
-                      std::string *code_ptr, std::string *exports_ptr) {
+void GenStruct(StructDef &struct_def, std::string *code_ptr, std::string *exports_ptr) {
   if (struct_def.generated) return;
   std::string &code = *code_ptr;
   std::string &exports = *exports_ptr;
@@ -433,13 +431,13 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
     code += "};\n\n";
 
     // Generate the identifier check method
-    if (parser.root_struct_def_ == &struct_def &&
-        !parser.file_identifier_.empty()) {
+    if (parser_.root_struct_def_ == &struct_def &&
+        !parser_.file_identifier_.empty()) {
       GenDocComment(code_ptr,
         "@param {flatbuffers.ByteBuffer} bb\n"
         "@returns {boolean}");
       code += object_name + ".bufferHasIdentifier = function(bb) {\n";
-      code += "  return bb.__has_identifier('" + parser.file_identifier_;
+      code += "  return bb.__has_identifier('" + parser_.file_identifier_;
       code += "');\n};\n\n";
     }
   }
@@ -702,15 +700,15 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
     code += "};\n\n";
 
     // Generate the method to complete buffer construction
-    if (parser.root_struct_def_ == &struct_def) {
+    if (parser_.root_struct_def_ == &struct_def) {
       GenDocComment(code_ptr,
         "@param {flatbuffers.Builder} builder\n"
         "@param {flatbuffers.Offset} offset");
       code += object_name + ".finish" + struct_def.name + "Buffer";
       code += " = function(builder, offset) {\n";
       code += "  builder.finish(offset";
-      if (!parser.file_identifier_.empty()) {
-        code += ", '" + parser.file_identifier_ + "'";
+      if (!parser_.file_identifier_.empty()) {
+        code += ", '" + parser_.file_identifier_ + "'";
       }
       code += ");\n";
       code += "};\n\n";

From 43fedfa8ba95e6ff3fc867ecd41bab89a3a1aa5e Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Tue, 14 Jun 2016 21:47:03 +0200
Subject: [PATCH 180/185] removed static from wrapInNamespace method

---
 src/idl_gen_js.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp
index d152fa449..a29337772 100644
--- a/src/idl_gen_js.cpp
+++ b/src/idl_gen_js.cpp
@@ -121,7 +121,7 @@ class JsGenerator : public BaseGenerator {
 
 // Ensure that a type is prefixed with its namespace whenever it is used
 // outside of its namespace.
-static std::string WrapInNameSpace(const Namespace *ns,
+std::string WrapInNameSpace(const Namespace *ns,
                                    const std::string &name) {
   std::string qualified_name;
   for (auto it = ns->components.begin();
@@ -131,7 +131,7 @@ static std::string WrapInNameSpace(const Namespace *ns,
   return qualified_name + name;
 }
 
-static std::string WrapInNameSpace(const Definition &def) {
+std::string WrapInNameSpace(const Definition &def) {
   return WrapInNameSpace(def.defined_namespace, def.name);
 }
 
@@ -180,7 +180,7 @@ static void GenDocComment(std::string *code_ptr,
 }
 
 // Generate an enum declaration and an enum string lookup table.
-static void GenEnum(EnumDef &enum_def, std::string *code_ptr,
+void GenEnum(EnumDef &enum_def, std::string *code_ptr,
                     std::string *exports_ptr) {
   if (enum_def.generated) return;
   std::string &code = *code_ptr;
@@ -227,7 +227,7 @@ static std::string GenType(const Type &type) {
   }
 }
 
-static 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 "this.bb.__string" + arguments;
     case BASE_TYPE_STRUCT: return "this.bb.__struct" + arguments;
@@ -247,7 +247,7 @@ static std::string GenGetter(const Type &type, const std::string &arguments) {
   }
 }
 
-static 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)) {
@@ -274,7 +274,7 @@ static std::string GenDefaultValue(const Value &value, const std::string &contex
   }
 }
 
-static std::string GenTypeName(const Type &type, bool input) {
+std::string GenTypeName(const Type &type, bool input) {
   if (!input) {
     if (type.base_type == BASE_TYPE_STRING) {
       return "string|Uint8Array";
@@ -326,7 +326,7 @@ static std::string MaybeScale(T value) {
   return value != 1 ? " * " + NumToString(value) : "";
 }
 
-static void GenStructArgs(const StructDef &struct_def,
+void GenStructArgs(const StructDef &struct_def,
                           std::string *annotations,
                           std::string *arguments,
                           const std::string &nameprefix) {

From 03ad8fa4d9574b7e613e10df3fe7fc4d9207a4bb Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Tue, 14 Jun 2016 23:17:43 +0200
Subject: [PATCH 181/185] sharing the WrapInNameSpace methods

---
 include/flatbuffers/code_generators.h | 32 +++++++++++++++++++++++---
 src/idl_gen_cpp.cpp                   | 20 ++--------------
 src/idl_gen_general.cpp               | 33 ++++++---------------------
 src/idl_gen_go.cpp                    |  3 ++-
 src/idl_gen_js.cpp                    | 18 +--------------
 src/idl_gen_php.cpp                   | 19 +--------------
 src/idl_gen_python.cpp                |  3 ++-
 7 files changed, 44 insertions(+), 84 deletions(-)

diff --git a/include/flatbuffers/code_generators.h b/include/flatbuffers/code_generators.h
index dc5f6bdd8..e7450a7a0 100644
--- a/include/flatbuffers/code_generators.h
+++ b/include/flatbuffers/code_generators.h
@@ -39,11 +39,15 @@ class BaseGenerator {
 
  protected:
   BaseGenerator(const Parser &parser, const std::string &path,
-                const std::string &file_name)
+                const std::string &file_name, 
+                const std::string qualifying_start, 
+                const std::string qualifying_separator)
       : parser_(parser),
         path_(path),
-        file_name_(file_name) {};
-  virtual ~BaseGenerator() {};
+        file_name_(file_name),
+        qualifying_start_(qualifying_start),
+        qualifying_separator_(qualifying_separator){};
+  virtual ~BaseGenerator(){};
 
   // No copy/assign.
   BaseGenerator &operator=(const BaseGenerator &);
@@ -85,9 +89,31 @@ class BaseGenerator {
     if (namespaces.size()) return *(namespaces.end() - 1); else return std::string("");
   }
 
+  // tracks the current namespace for early exit in WrapInNameSpace
+  // c++, java and csharp returns a different namespace from 
+  // the following default (no early exit, always fully qualify), 
+  // which works for js and php
+  virtual const Namespace *CurrentNameSpace() { return nullptr; }
+  
+  // Ensure that a type is prefixed with its namespace whenever it is used
+  // outside of its namespace.
+  std::string WrapInNameSpace(const Namespace *ns, const std::string &name) {
+    if (CurrentNameSpace() == ns) return name;
+    std::string qualified_name = qualifying_start_;
+    for (auto it = ns->components.begin(); it != ns->components.end(); ++it)
+      qualified_name += *it + qualifying_separator_;
+    return qualified_name + name;
+  }
+
+  std::string WrapInNameSpace(const Definition &def) {
+    return WrapInNameSpace(def.defined_namespace, def.name);
+  }
+
   const Parser &parser_;
   const std::string &path_;
   const std::string &file_name_;
+  const std::string qualifying_start_;
+  const std::string qualifying_separator_;
 };
 
 }  // namespace flatbuffers
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 6c7981417..3a4476fec 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -39,7 +39,7 @@ class CppGenerator : public BaseGenerator {
  public:
   CppGenerator(const Parser &parser, const std::string &path,
                const std::string &file_name)
-      : BaseGenerator(parser, path, file_name){};
+      : BaseGenerator(parser, path, file_name, "", "::"){};
   // Iterate through all definitions we haven't generate code for (enums,
   // structs,
   // and tables) and output them to a single file.
@@ -208,23 +208,7 @@ class CppGenerator : public BaseGenerator {
   // This tracks the current namespace so we can insert namespace declarations.
   const Namespace *cur_name_space_ = nullptr;
 
-  // Ensure that a type is prefixed with its namespace whenever it is used
-  // outside of its namespace.
-  std::string WrapInNameSpace(const Namespace *ns, const std::string &name) {
-    if (cur_name_space_ != ns) {
-      std::string qualified_name;
-      for (auto it = ns->components.begin(); it != ns->components.end(); ++it) {
-        qualified_name += *it + "::";
-      }
-      return qualified_name + name;
-    } else {
-      return name;
-    }
-  }
-
-  std::string WrapInNameSpace(const Definition &def) {
-    return WrapInNameSpace(def.defined_namespace, def.name);
-  }
+  const Namespace * CurrentNameSpace() {return cur_name_space_;}
 
   // Translates a qualified name in flatbuffer text format to the same name in
   // the equivalent C++ namespace.
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index 7567bdcf4..a96609c54 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -193,7 +193,7 @@ class GeneralGenerator : public BaseGenerator {
  public:
   GeneralGenerator(const Parser &parser, const std::string &path,
                    const std::string &file_name)
-      : BaseGenerator(parser, path, file_name){
+      : BaseGenerator(parser, path, file_name, "", "."){
       assert(parser_.opts.lang <= IDLOptions::kMAX);
       };
   bool generate() {
@@ -251,38 +251,19 @@ class GeneralGenerator : public BaseGenerator {
     auto filename = NamespaceDir(ns) + defname + lang_.file_extension;
     return SaveFile(filename.c_str(), code, false);
   }
-  
 
-std::string FunctionStart(char upper) {
-  return std::string() +
-      (lang_.language == IDLOptions::kJava
-         ? static_cast<char>(tolower(upper))
-         : upper);
+  const Namespace *CurrentNameSpace() { return parser_.namespaces_.back(); }
+
+  std::string FunctionStart(char upper) {
+    return std::string() + (lang_.language == IDLOptions::kJava
+                                ? static_cast<char>(tolower(upper))
+                                : upper);
 }
 
 static bool IsEnum(const Type& type) {
   return type.enum_def != nullptr && IsInteger(type.base_type);
 }
 
-// Ensure that a type is prefixed with its namespace whenever it is used
-// outside of its namespace.
-std::string WrapInNameSpace(const Namespace *ns, const std::string &name) {
-        if (parser_.namespaces_.back() != ns) {
-            std::string qualified_name;
-            for (auto it = ns->components.begin();
-                it != ns->components.end(); ++it) {
-                    qualified_name += *it + ".";
-            }
-            return qualified_name + name;
-        } else {
-            return name;
-        }
-}
-
-std::string WrapInNameSpace(const Definition &def) {
-        return WrapInNameSpace(def.defined_namespace, def.name);
-}
-
 std::string GenTypeBasic(const Type &type, bool enableLangOverrides) {
   static const char *gtypename[] = {
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp
index 5c60c1052..a04b6ba20 100644
--- a/src/idl_gen_go.cpp
+++ b/src/idl_gen_go.cpp
@@ -625,7 +625,8 @@ class GoGenerator : public BaseGenerator {
  public:
   GoGenerator(const Parser &parser, const std::string &path,
               const std::string &file_name)
-      : BaseGenerator(parser, path, file_name){};
+      : BaseGenerator(parser, path, file_name, "" /* not used*/,
+                      "" /* not used */){};
   bool generate() {
     for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
          ++it) {
diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp
index a29337772..32a06f1ef 100644
--- a/src/idl_gen_js.cpp
+++ b/src/idl_gen_js.cpp
@@ -35,7 +35,7 @@ class JsGenerator : public BaseGenerator {
  public:
   JsGenerator(const Parser &parser, const std::string &path,
               const std::string &file_name)
-      : BaseGenerator(parser, path, file_name){};
+      : BaseGenerator(parser, path, file_name, "", "."){};
   // Iterate through all definitions we haven't generate code for (enums,
   // structs, and tables) and output them to a single file.
   bool generate() {
@@ -119,22 +119,6 @@ class JsGenerator : public BaseGenerator {
   }
 }
 
-// Ensure that a type is prefixed with its namespace whenever it is used
-// outside of its namespace.
-std::string WrapInNameSpace(const Namespace *ns,
-                                   const std::string &name) {
-  std::string qualified_name;
-  for (auto it = ns->components.begin();
-           it != ns->components.end(); ++it) {
-    qualified_name += *it + ".";
-  }
-  return qualified_name + name;
-}
-
-std::string WrapInNameSpace(const Definition &def) {
-  return WrapInNameSpace(def.defined_namespace, def.name);
-}
-
 // Generate a documentation comment, if available.
 static void GenDocComment(const std::vector<std::string> &dc,
                           std::string *code_ptr,
diff --git a/src/idl_gen_php.cpp b/src/idl_gen_php.cpp
index 11eb0fd1c..af3b06d57 100644
--- a/src/idl_gen_php.cpp
+++ b/src/idl_gen_php.cpp
@@ -31,7 +31,7 @@ namespace php {
      public:
       PhpGenerator(const Parser &parser, const std::string &path,
                    const std::string &file_name)
-          : BaseGenerator(parser, path, file_name){};
+          : BaseGenerator(parser, path, file_name, "\\", "\\"){};
       bool generate() {
         if (!generateEnums()) return false;
         if (!generateStructs()) return false;
@@ -93,23 +93,6 @@ namespace php {
         return SaveFile(filename.c_str(), code, false);
       }
       
-
-    // Ensure that a type is prefixed with its namespace whenever it is used
-    // outside of its namespace.
-    std::string WrapInNameSpace(const Namespace *ns, const std::string &name) {
-      std::string qualified_name = "\\";
-      for (auto it = ns->components.begin();
-      it != ns->components.end(); ++it) {
-        qualified_name += *it + "\\";
-      }
-      return qualified_name + name;
-    }
-
-    std::string WrapInNameSpace(const Definition &def) {
-      return WrapInNameSpace(def.defined_namespace, def.name);
-    }
-
-
     // Begin a class declaration.
     static void BeginClass(const StructDef &struct_def, std::string *code_ptr) {
       std::string &code = *code_ptr;
diff --git a/src/idl_gen_python.cpp b/src/idl_gen_python.cpp
index 5f5c6be3b..7e8dc0ebd 100644
--- a/src/idl_gen_python.cpp
+++ b/src/idl_gen_python.cpp
@@ -596,7 +596,8 @@ class PythonGenerator : public BaseGenerator {
  public:
   PythonGenerator(const Parser &parser, const std::string &path,
                   const std::string &file_name)
-      : BaseGenerator(parser, path, file_name){};
+      : BaseGenerator(parser, path, file_name, "" /* not used */,
+                      "" /* not used */){};
   bool generate() {
     if (!generateEnums()) return false;
     if (!generateStructs()) return false;

From f794f97d883d1ce2702f086a8f88be693b834415 Mon Sep 17 00:00:00 2001
From: lakedaemon <olivier.binda@wanadoo.fr>
Date: Thu, 23 Jun 2016 00:23:11 +0200
Subject: [PATCH 182/185] fixing spaces

---
 src/idl_gen_cpp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 3a4476fec..c690240d6 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -208,7 +208,7 @@ class CppGenerator : public BaseGenerator {
   // This tracks the current namespace so we can insert namespace declarations.
   const Namespace *cur_name_space_ = nullptr;
 
-  const Namespace * CurrentNameSpace() {return cur_name_space_;}
+  const Namespace *CurrentNameSpace() { return cur_name_space_; }
 
   // Translates a qualified name in flatbuffer text format to the same name in
   // the equivalent C++ namespace.

From c97abb1eea0ae19bdc7a25adde6f9129a51627c6 Mon Sep 17 00:00:00 2001
From: Yury Bandarchuk <yury.upwork.bandarchuk@gmail.com>
Date: Thu, 23 Jun 2016 19:51:55 +0400
Subject: [PATCH 183/185] Added new constants

Add new constants in Constants.java

All single ints int FlatBufferBuilder.java were replaced by constants
from Constants.java
---
 java/com/google/flatbuffers/Constants.java    |  8 ++++++
 .../google/flatbuffers/FlatBufferBuilder.java | 28 +++++++++----------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/java/com/google/flatbuffers/Constants.java b/java/com/google/flatbuffers/Constants.java
index ac0593ae6..c3b98c5e8 100644
--- a/java/com/google/flatbuffers/Constants.java
+++ b/java/com/google/flatbuffers/Constants.java
@@ -23,10 +23,18 @@ package com.google.flatbuffers;
  */
 public class Constants {
     // Java doesn't seem to have these.
+    /** The number of bytes in an `byte`. */
+    static final int SIZEOF_BYTE = 1;
     /** The number of bytes in a `short`. */
     static final int SIZEOF_SHORT = 2;
     /** The number of bytes in an `int`. */
     static final int SIZEOF_INT = 4;
+    /** The number of bytes in an `float`. */
+    static final int SIZEOF_FLOAT = 4;
+    /** The number of bytes in an `long`. */
+    static final int SIZEOF_LONG = 8;
+    /** The number of bytes in an `double`. */
+    static final int SIZEOF_DOUBLE = 4;
     /** The number of bytes in a file identifier. */
     static final int FILE_IDENTIFIER_LENGTH = 4;
 }
diff --git a/java/com/google/flatbuffers/FlatBufferBuilder.java b/java/com/google/flatbuffers/FlatBufferBuilder.java
index fecb213f6..c2186fa7b 100644
--- a/java/com/google/flatbuffers/FlatBufferBuilder.java
+++ b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -188,7 +188,7 @@ public class FlatBufferBuilder {
      *
      * @param x A `boolean` to put into the buffer.
      */
-    public void putBoolean(boolean x) { bb.put      (space -= 1, (byte)(x ? 1 : 0)); }
+    public void putBoolean(boolean x) { bb.put      (space -= Constants.SIZEOF_BYTE, (byte)(x ? 1 : 0)); }
 
     /**
      * Add a `byte` to the buffer, backwards from the current location. Doesn't align nor
@@ -196,7 +196,7 @@ public class FlatBufferBuilder {
      *
      * @param x A `byte` to put into the buffer.
      */
-    public void putByte   (byte    x) { bb.put      (space -= 1, x); }
+    public void putByte   (byte    x) { bb.put      (space -= Constants.SIZEOF_BYTE, x); }
 
     /**
      * Add a `short` to the buffer, backwards from the current location. Doesn't align nor
@@ -204,7 +204,7 @@ public class FlatBufferBuilder {
      *
      * @param x A `short` to put into the buffer.
      */
-    public void putShort  (short   x) { bb.putShort (space -= 2, x); }
+    public void putShort  (short   x) { bb.putShort (space -= Constants.SIZEOF_SHORT, x); }
 
     /**
      * Add an `int` to the buffer, backwards from the current location. Doesn't align nor
@@ -212,7 +212,7 @@ public class FlatBufferBuilder {
      *
      * @param x An `int` to put into the buffer.
      */
-    public void putInt    (int     x) { bb.putInt   (space -= 4, x); }
+    public void putInt    (int     x) { bb.putInt   (space -= Constants.SIZEOF_INT, x); }
 
     /**
      * Add a `long` to the buffer, backwards from the current location. Doesn't align nor
@@ -220,7 +220,7 @@ public class FlatBufferBuilder {
      *
      * @param x A `long` to put into the buffer.
      */
-    public void putLong   (long    x) { bb.putLong  (space -= 8, x); }
+    public void putLong   (long    x) { bb.putLong  (space -= Constants.SIZEOF_LONG, x); }
 
     /**
      * Add a `float` to the buffer, backwards from the current location. Doesn't align nor
@@ -228,7 +228,7 @@ public class FlatBufferBuilder {
      *
      * @param x A `float` to put into the buffer.
      */
-    public void putFloat  (float   x) { bb.putFloat (space -= 4, x); }
+    public void putFloat  (float   x) { bb.putFloat (space -= Constants.SIZEOF_FLOAT, x); }
 
     /**
      * Add a `double` to the buffer, backwards from the current location. Doesn't align nor
@@ -236,7 +236,7 @@ public class FlatBufferBuilder {
      *
      * @param x A `double` to put into the buffer.
      */
-    public void putDouble (double  x) { bb.putDouble(space -= 8, x); }
+    public void putDouble (double  x) { bb.putDouble(space -= Constants.SIZEOF_DOUBLE, x); }
     /// @endcond
 
     /**
@@ -244,49 +244,49 @@ public class FlatBufferBuilder {
      *
      * @param x A `boolean` to put into the buffer.
      */
-    public void addBoolean(boolean x) { prep(1, 0); putBoolean(x); }
+    public void addBoolean(boolean x) { prep(Constants.SIZEOF_BYTE, 0); putBoolean(x); }
 
     /**
      * Add a `byte` to the buffer, properly aligned, and grows the buffer (if necessary).
      *
      * @param x A `byte` to put into the buffer.
      */
-    public void addByte   (byte    x) { prep(1, 0); putByte   (x); }
+    public void addByte   (byte    x) { prep(Constants.SIZEOF_BYTE, 0); putByte   (x); }
 
     /**
      * Add a `short` to the buffer, properly aligned, and grows the buffer (if necessary).
      *
      * @param x A `short` to put into the buffer.
      */
-    public void addShort  (short   x) { prep(2, 0); putShort  (x); }
+    public void addShort  (short   x) { prep(Constants.SIZEOF_SHORT, 0); putShort  (x); }
 
     /**
      * Add an `int` to the buffer, properly aligned, and grows the buffer (if necessary).
      *
      * @param x An `int` to put into the buffer.
      */
-    public void addInt    (int     x) { prep(4, 0); putInt    (x); }
+    public void addInt    (int     x) { prep(Constants.SIZEOF_INT, 0); putInt    (x); }
 
     /**
      * Add a `long` to the buffer, properly aligned, and grows the buffer (if necessary).
      *
      * @param x A `long` to put into the buffer.
      */
-    public void addLong   (long    x) { prep(8, 0); putLong   (x); }
+    public void addLong   (long    x) { prep(Constants.SIZEOF_LONG, 0); putLong   (x); }
 
     /**
      * Add a `float` to the buffer, properly aligned, and grows the buffer (if necessary).
      *
      * @param x A `float` to put into the buffer.
      */
-    public void addFloat  (float   x) { prep(4, 0); putFloat  (x); }
+    public void addFloat  (float   x) { prep(Constants.SIZEOF_FLOAT, 0); putFloat  (x); }
 
     /**
      * Add a `double` to the buffer, properly aligned, and grows the buffer (if necessary).
      *
      * @param x A `double` to put into the buffer.
      */
-    public void addDouble (double  x) { prep(8, 0); putDouble (x); }
+    public void addDouble (double  x) { prep(Constants.SIZEOF_DOUBLE, 0); putDouble (x); }
 
    /**
     * Adds on offset, relative to where it will be written.

From ec59dc026f5bf06b5b56f4d53928d5376281412f Mon Sep 17 00:00:00 2001
From: Yury Bandarchuk <YuryBandarchuk16@users.noreply.github.com>
Date: Thu, 23 Jun 2016 21:30:32 +0300
Subject: [PATCH 184/185] Update Constants.java

---
 java/com/google/flatbuffers/Constants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/com/google/flatbuffers/Constants.java b/java/com/google/flatbuffers/Constants.java
index c3b98c5e8..f59063145 100644
--- a/java/com/google/flatbuffers/Constants.java
+++ b/java/com/google/flatbuffers/Constants.java
@@ -34,7 +34,7 @@ public class Constants {
     /** The number of bytes in an `long`. */
     static final int SIZEOF_LONG = 8;
     /** The number of bytes in an `double`. */
-    static final int SIZEOF_DOUBLE = 4;
+    static final int SIZEOF_DOUBLE = 8;
     /** The number of bytes in a file identifier. */
     static final int FILE_IDENTIFIER_LENGTH = 4;
 }

From 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70 Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <wvo@google.com>
Date: Wed, 13 Apr 2016 18:16:05 -0700
Subject: [PATCH 185/185] Added GRPC code generator to flatc.

Also added simple (in-process) test.

Change-Id: I38580d554dd52f590e3396ec4846e07546dcf07d
Tested: on Linux.
---
 CMakeLists.txt                     |   23 +
 docs/source/Compiler.md            |    2 +
 docs/source/Schemas.md             |    3 +-
 grpc/README.md                     |   11 +
 grpc/src/compiler/cpp_generator.cc | 1202 ++++++++++++++++++++++++++++
 grpc/src/compiler/cpp_generator.h  |  147 ++++
 grpc/tests/grpctest.cpp            |  124 +++
 include/flatbuffers/flatbuffers.h  |   23 +
 include/flatbuffers/grpc.h         |   72 ++
 include/flatbuffers/idl.h          |    8 +-
 src/flatc.cpp                      |    6 +-
 src/idl_gen_grpc.cpp               |  216 +++++
 src/idl_parser.cpp                 |    4 +
 tests/generate_code.bat            |    2 +-
 tests/generate_code.sh             |    2 +-
 tests/monster_test.fbs             |    2 +-
 tests/monster_test.grpc.fb.cc      |   85 ++
 tests/monster_test.grpc.fb.h       |  155 ++++
 18 files changed, 2081 insertions(+), 6 deletions(-)
 create mode 100644 grpc/README.md
 create mode 100644 grpc/src/compiler/cpp_generator.cc
 create mode 100644 grpc/src/compiler/cpp_generator.h
 create mode 100644 grpc/tests/grpctest.cpp
 create mode 100644 include/flatbuffers/grpc.h
 create mode 100644 src/idl_gen_grpc.cpp
 create mode 100644 tests/monster_test.grpc.fb.cc
 create mode 100644 tests/monster_test.grpc.fb.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1e56d6b0..c2dd95085 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,7 @@ option(FLATBUFFERS_INSTALL "Enable the installation of targets." ON)
 option(FLATBUFFERS_BUILD_FLATLIB "Enable the build of the flatbuffers library" ON)
 option(FLATBUFFERS_BUILD_FLATC "Enable the build of the flatbuffers compiler" ON)
 option(FLATBUFFERS_BUILD_FLATHASH "Enable the build of flathash" ON)
+option(FLATBUFFERS_BUILD_GRPCTEST "Enable the build of grpctest" OFF)
 
 if(NOT FLATBUFFERS_BUILD_FLATC AND FLATBUFFERS_BUILD_TESTS)
     message(WARNING
@@ -39,7 +40,10 @@ set(FlatBuffers_Compiler_SRCS
   src/idl_gen_php.cpp
   src/idl_gen_python.cpp
   src/idl_gen_fbs.cpp
+  src/idl_gen_grpc.cpp
   src/flatc.cpp
+  grpc/src/compiler/cpp_generator.h
+  grpc/src/compiler/cpp_generator.cc
 )
 
 set(FlatHash_SRCS
@@ -76,6 +80,16 @@ set(FlatBuffers_Sample_Text_SRCS
   ${CMAKE_CURRENT_BINARY_DIR}/samples/monster_generated.h
 )
 
+set(FlatBuffers_GRPCTest_SRCS
+  include/flatbuffers/flatbuffers.h
+  include/flatbuffers/grpc.h
+  tests/monster_test.grpc.fb.h
+  tests/monster_test.grpc.fb.cc
+  grpc/tests/grpctest.cpp
+  # file generated by running compiler on samples/monster.fbs
+  ${CMAKE_CURRENT_BINARY_DIR}/samples/monster_generated.h
+)
+
 # source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS})
 # source_group(Tests FILES ${FlatBuffers_Tests_SRCS})
 
@@ -129,6 +143,7 @@ if(BIICODE)
 endif()
 
 include_directories(include)
+include_directories(grpc)
 
 if(FLATBUFFERS_BUILD_FLATLIB)
 add_library(flatbuffers STATIC ${FlatBuffers_Library_SRCS})
@@ -174,6 +189,14 @@ if(FLATBUFFERS_BUILD_TESTS)
   add_executable(flatsampletext ${FlatBuffers_Sample_Text_SRCS})
 endif()
 
+if(FLATBUFFERS_BUILD_GRPCTEST)
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
+  endif()
+  add_executable(grpctest ${FlatBuffers_GRPCTest_SRCS})
+  target_link_libraries(grpctest grpc++_unsecure grpc pthread dl)
+endif()
+
 if(FLATBUFFERS_INSTALL)
   install(DIRECTORY include/flatbuffers DESTINATION include)
   if(FLATBUFFERS_BUILD_FLATLIB)
diff --git a/docs/source/Compiler.md b/docs/source/Compiler.md
index 886fbd9b8..ad584c739 100755
--- a/docs/source/Compiler.md
+++ b/docs/source/Compiler.md
@@ -33,6 +33,8 @@ For any schema input files, one or more generators can be specified:
 
 -   `--php`: Generate PHP code.
 
+-   `--grpc`: Generate RPC stub code for GRPC.
+
 For any data input files:
 
 -   `--binary`, `-b` : If data is contained in this file, generate a
diff --git a/docs/source/Schemas.md b/docs/source/Schemas.md
index 14bd3bd0e..7dcce0711 100755
--- a/docs/source/Schemas.md
+++ b/docs/source/Schemas.md
@@ -237,7 +237,8 @@ as the response (both of which must be table types):
     }
 
 What code this produces and how it is used depends on language and RPC system
-used, FlatBuffers itself does not offer this functionality.
+used, there is preliminary support for GRPC through the `--grpc` code generator,
+see `grpc/tests` for an example.
 
 ### Comments & documentation
 
diff --git a/grpc/README.md b/grpc/README.md
new file mode 100644
index 000000000..13485198c
--- /dev/null
+++ b/grpc/README.md
@@ -0,0 +1,11 @@
+GRPC implementation and test
+============================
+
+NOTE: files in `src/` are shared with the GRPC project, and maintained there
+(any changes should be submitted to GRPC instead). These files are copied
+from GRPC, and work with both the Protobuf and FlatBuffers code generator.
+
+`tests/` contains a GRPC specific test, you need to have built and installed
+the GRPC libraries for this to compile. This test will build using the
+`FLATBUFFERS_BUILD_GRPCTEST` option to the main FlatBuffers CMake project.
+
diff --git a/grpc/src/compiler/cpp_generator.cc b/grpc/src/compiler/cpp_generator.cc
new file mode 100644
index 000000000..9319c4193
--- /dev/null
+++ b/grpc/src/compiler/cpp_generator.cc
@@ -0,0 +1,1202 @@
+/*
+ *
+ * Copyright 2015, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <map>
+
+#include "src/compiler/cpp_generator.h"
+
+#include <sstream>
+
+namespace grpc_cpp_generator {
+namespace {
+
+template <class T>
+grpc::string as_string(T x) {
+  std::ostringstream out;
+  out << x;
+  return out.str();
+}
+
+grpc::string FilenameIdentifier(const grpc::string &filename) {
+  grpc::string result;
+  for (unsigned i = 0; i < filename.size(); i++) {
+    char c = filename[i];
+    if (isalnum(c)) {
+      result.push_back(c);
+    } else {
+      static char hex[] = "0123456789abcdef";
+      result.push_back('_');
+      result.push_back(hex[(c >> 4) & 0xf]);
+      result.push_back(hex[c & 0xf]);
+    }
+  }
+  return result;
+}
+}  // namespace
+
+template<class T, size_t N>
+T *array_end(T (&array)[N]) { return array + N; }
+
+void PrintIncludes(Printer *printer, const std::vector<grpc::string>& headers, const Parameters &params) {
+  std::map<grpc::string, grpc::string> vars;
+
+  vars["l"] = params.use_system_headers ? '<' : '"';
+  vars["r"] = params.use_system_headers ? '>' : '"';
+
+  if (!params.grpc_search_path.empty()) {
+    vars["l"] += params.grpc_search_path;
+    if (params.grpc_search_path.back() != '/') {
+      vars["l"] += '/';
+    }
+  }
+
+  for (auto i = headers.begin(); i != headers.end(); i++) {
+    vars["h"] = *i;
+    printer->Print(vars, "#include $l$$h$$r$\n");
+  }
+}
+
+grpc::string GetHeaderPrologue(File *file, const Parameters & /*params*/) {
+  grpc::string output;
+  {
+    // Scope the output stream so it closes and finalizes output to the string.
+    auto printer = file->CreatePrinter(&output);
+    std::map<grpc::string, grpc::string> vars;
+
+    vars["filename"] = file->filename();
+    vars["filename_identifier"] = FilenameIdentifier(file->filename());
+    vars["filename_base"] = file->filename_without_ext();
+    vars["message_header_ext"] = file->message_header_ext();
+
+    printer->Print(vars, "// Generated by the gRPC protobuf plugin.\n");
+    printer->Print(vars,
+                  "// If you make any local change, they will be lost.\n");
+    printer->Print(vars, "// source: $filename$\n");
+    printer->Print(vars, "#ifndef GRPC_$filename_identifier$__INCLUDED\n");
+    printer->Print(vars, "#define GRPC_$filename_identifier$__INCLUDED\n");
+    printer->Print(vars, "\n");
+    printer->Print(vars, "#include \"$filename_base$$message_header_ext$\"\n");
+    printer->Print(vars, "\n");
+  }
+  return output;
+}
+
+grpc::string GetHeaderIncludes(File *file,
+                               const Parameters &params) {
+  grpc::string output;
+  {
+    // Scope the output stream so it closes and finalizes output to the string.
+    auto printer = file->CreatePrinter(&output);
+    std::map<grpc::string, grpc::string> vars;
+
+    static const char *headers_strs[] = {
+      "grpc++/impl/codegen/async_stream.h",
+      "grpc++/impl/codegen/async_unary_call.h",
+      "grpc++/impl/codegen/proto_utils.h",
+      "grpc++/impl/codegen/rpc_method.h",
+      "grpc++/impl/codegen/service_type.h",
+      "grpc++/impl/codegen/status.h",
+      "grpc++/impl/codegen/stub_options.h",
+      "grpc++/impl/codegen/sync_stream.h"
+    };
+    std::vector<grpc::string> headers(headers_strs, array_end(headers_strs));
+    PrintIncludes(printer.get(), headers, params);
+    printer->Print(vars, "\n");
+    printer->Print(vars, "namespace grpc {\n");
+    printer->Print(vars, "class CompletionQueue;\n");
+    printer->Print(vars, "class Channel;\n");
+    printer->Print(vars, "class RpcService;\n");
+    printer->Print(vars, "class ServerCompletionQueue;\n");
+    printer->Print(vars, "class ServerContext;\n");
+    printer->Print(vars, "}  // namespace grpc\n\n");
+
+    if (!file->package().empty()) {
+      std::vector<grpc::string> parts = file->package_parts();
+
+      for (auto part = parts.begin(); part != parts.end(); part++) {
+        vars["part"] = *part;
+        printer->Print(vars, "namespace $part$ {\n");
+      }
+      printer->Print(vars, "\n");
+    }
+  }
+  return output;
+}
+
+void PrintHeaderClientMethodInterfaces(
+    Printer *printer, const Method *method,
+    std::map<grpc::string, grpc::string> *vars, bool is_public) {
+  (*vars)["Method"] = method->name();
+  (*vars)["Request"] = method->input_type_name();
+  (*vars)["Response"] = method->output_type_name();
+
+  if (is_public) {
+    if (method->NoStreaming()) {
+      printer->Print(
+          *vars,
+          "virtual ::grpc::Status $Method$(::grpc::ClientContext* context, "
+          "const $Request$& request, $Response$* response) = 0;\n");
+      printer->Print(*vars,
+                     "std::unique_ptr< "
+                     "::grpc::ClientAsyncResponseReaderInterface< $Response$>> "
+                     "Async$Method$(::grpc::ClientContext* context, "
+                     "const $Request$& request, "
+                     "::grpc::CompletionQueue* cq) {\n");
+      printer->Indent();
+      printer->Print(*vars,
+                     "return std::unique_ptr< "
+                     "::grpc::ClientAsyncResponseReaderInterface< $Response$>>("
+                     "Async$Method$Raw(context, request, cq));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+    } else if (method->ClientOnlyStreaming()) {
+      printer->Print(
+          *vars,
+          "std::unique_ptr< ::grpc::ClientWriterInterface< $Request$>>"
+          " $Method$("
+          "::grpc::ClientContext* context, $Response$* response) {\n");
+      printer->Indent();
+      printer->Print(
+          *vars,
+          "return std::unique_ptr< ::grpc::ClientWriterInterface< $Request$>>"
+          "($Method$Raw(context, response));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+      printer->Print(
+          *vars,
+          "std::unique_ptr< ::grpc::ClientAsyncWriterInterface< $Request$>>"
+          " Async$Method$(::grpc::ClientContext* context, $Response$* "
+          "response, "
+          "::grpc::CompletionQueue* cq, void* tag) {\n");
+      printer->Indent();
+      printer->Print(*vars,
+                     "return std::unique_ptr< "
+                     "::grpc::ClientAsyncWriterInterface< $Request$>>("
+                     "Async$Method$Raw(context, response, cq, tag));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+    } else if (method->ServerOnlyStreaming()) {
+      printer->Print(
+          *vars,
+          "std::unique_ptr< ::grpc::ClientReaderInterface< $Response$>>"
+          " $Method$(::grpc::ClientContext* context, const $Request$& request)"
+          " {\n");
+      printer->Indent();
+      printer->Print(
+          *vars,
+          "return std::unique_ptr< ::grpc::ClientReaderInterface< $Response$>>"
+          "($Method$Raw(context, request));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+      printer->Print(
+          *vars,
+          "std::unique_ptr< ::grpc::ClientAsyncReaderInterface< $Response$>> "
+          "Async$Method$("
+          "::grpc::ClientContext* context, const $Request$& request, "
+          "::grpc::CompletionQueue* cq, void* tag) {\n");
+      printer->Indent();
+      printer->Print(*vars,
+                     "return std::unique_ptr< "
+                     "::grpc::ClientAsyncReaderInterface< $Response$>>("
+                     "Async$Method$Raw(context, request, cq, tag));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+    } else if (method->BidiStreaming()) {
+      printer->Print(*vars,
+                     "std::unique_ptr< ::grpc::ClientReaderWriterInterface< "
+                     "$Request$, $Response$>> "
+                     "$Method$(::grpc::ClientContext* context) {\n");
+      printer->Indent();
+      printer->Print(
+          *vars,
+          "return std::unique_ptr< "
+          "::grpc::ClientReaderWriterInterface< $Request$, $Response$>>("
+          "$Method$Raw(context));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+      printer->Print(
+          *vars,
+          "std::unique_ptr< "
+          "::grpc::ClientAsyncReaderWriterInterface< $Request$, $Response$>> "
+          "Async$Method$(::grpc::ClientContext* context, "
+          "::grpc::CompletionQueue* cq, void* tag) {\n");
+      printer->Indent();
+      printer->Print(
+          *vars,
+          "return std::unique_ptr< "
+          "::grpc::ClientAsyncReaderWriterInterface< $Request$, $Response$>>("
+          "Async$Method$Raw(context, cq, tag));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+    }
+  } else {
+    if (method->NoStreaming()) {
+      printer->Print(
+          *vars,
+          "virtual ::grpc::ClientAsyncResponseReaderInterface< $Response$>* "
+          "Async$Method$Raw(::grpc::ClientContext* context, "
+          "const $Request$& request, "
+          "::grpc::CompletionQueue* cq) = 0;\n");
+    } else if (method->ClientOnlyStreaming()) {
+      printer->Print(
+          *vars,
+          "virtual ::grpc::ClientWriterInterface< $Request$>*"
+          " $Method$Raw("
+          "::grpc::ClientContext* context, $Response$* response) = 0;\n");
+      printer->Print(*vars,
+                     "virtual ::grpc::ClientAsyncWriterInterface< $Request$>*"
+                     " Async$Method$Raw(::grpc::ClientContext* context, "
+                     "$Response$* response, "
+                     "::grpc::CompletionQueue* cq, void* tag) = 0;\n");
+    } else if (method->ServerOnlyStreaming()) {
+      printer->Print(
+          *vars,
+          "virtual ::grpc::ClientReaderInterface< $Response$>* $Method$Raw("
+          "::grpc::ClientContext* context, const $Request$& request) = 0;\n");
+      printer->Print(
+          *vars,
+          "virtual ::grpc::ClientAsyncReaderInterface< $Response$>* "
+          "Async$Method$Raw("
+          "::grpc::ClientContext* context, const $Request$& request, "
+          "::grpc::CompletionQueue* cq, void* tag) = 0;\n");
+    } else if (method->BidiStreaming()) {
+      printer->Print(*vars,
+                     "virtual ::grpc::ClientReaderWriterInterface< $Request$, "
+                     "$Response$>* "
+                     "$Method$Raw(::grpc::ClientContext* context) = 0;\n");
+      printer->Print(*vars,
+                     "virtual ::grpc::ClientAsyncReaderWriterInterface< "
+                     "$Request$, $Response$>* "
+                     "Async$Method$Raw(::grpc::ClientContext* context, "
+                     "::grpc::CompletionQueue* cq, void* tag) = 0;\n");
+    }
+  }
+}
+
+void PrintHeaderClientMethod(Printer *printer,
+                             const Method *method,
+                             std::map<grpc::string, grpc::string> *vars,
+                             bool is_public) {
+  (*vars)["Method"] = method->name();
+  (*vars)["Request"] = method->input_type_name();
+  (*vars)["Response"] = method->output_type_name();
+  if (is_public) {
+    if (method->NoStreaming()) {
+      printer->Print(
+          *vars,
+          "::grpc::Status $Method$(::grpc::ClientContext* context, "
+          "const $Request$& request, $Response$* response) GRPC_OVERRIDE;\n");
+      printer->Print(
+          *vars,
+          "std::unique_ptr< ::grpc::ClientAsyncResponseReader< $Response$>> "
+          "Async$Method$(::grpc::ClientContext* context, "
+          "const $Request$& request, "
+          "::grpc::CompletionQueue* cq) {\n");
+      printer->Indent();
+      printer->Print(*vars,
+                     "return std::unique_ptr< "
+                     "::grpc::ClientAsyncResponseReader< $Response$>>("
+                     "Async$Method$Raw(context, request, cq));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+    } else if (method->ClientOnlyStreaming()) {
+      printer->Print(
+          *vars,
+          "std::unique_ptr< ::grpc::ClientWriter< $Request$>>"
+          " $Method$("
+          "::grpc::ClientContext* context, $Response$* response) {\n");
+      printer->Indent();
+      printer->Print(*vars,
+                     "return std::unique_ptr< ::grpc::ClientWriter< $Request$>>"
+                     "($Method$Raw(context, response));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+      printer->Print(*vars,
+                     "std::unique_ptr< ::grpc::ClientAsyncWriter< $Request$>>"
+                     " Async$Method$(::grpc::ClientContext* context, "
+                     "$Response$* response, "
+                     "::grpc::CompletionQueue* cq, void* tag) {\n");
+      printer->Indent();
+      printer->Print(
+          *vars,
+          "return std::unique_ptr< ::grpc::ClientAsyncWriter< $Request$>>("
+          "Async$Method$Raw(context, response, cq, tag));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+    } else if (method->ServerOnlyStreaming()) {
+      printer->Print(
+          *vars,
+          "std::unique_ptr< ::grpc::ClientReader< $Response$>>"
+          " $Method$(::grpc::ClientContext* context, const $Request$& request)"
+          " {\n");
+      printer->Indent();
+      printer->Print(
+          *vars,
+          "return std::unique_ptr< ::grpc::ClientReader< $Response$>>"
+          "($Method$Raw(context, request));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+      printer->Print(
+          *vars,
+          "std::unique_ptr< ::grpc::ClientAsyncReader< $Response$>> "
+          "Async$Method$("
+          "::grpc::ClientContext* context, const $Request$& request, "
+          "::grpc::CompletionQueue* cq, void* tag) {\n");
+      printer->Indent();
+      printer->Print(
+          *vars,
+          "return std::unique_ptr< ::grpc::ClientAsyncReader< $Response$>>("
+          "Async$Method$Raw(context, request, cq, tag));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+    } else if (method->BidiStreaming()) {
+      printer->Print(
+          *vars,
+          "std::unique_ptr< ::grpc::ClientReaderWriter< $Request$, $Response$>>"
+          " $Method$(::grpc::ClientContext* context) {\n");
+      printer->Indent();
+      printer->Print(*vars,
+                     "return std::unique_ptr< "
+                     "::grpc::ClientReaderWriter< $Request$, $Response$>>("
+                     "$Method$Raw(context));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+      printer->Print(*vars,
+                     "std::unique_ptr<  ::grpc::ClientAsyncReaderWriter< "
+                     "$Request$, $Response$>> "
+                     "Async$Method$(::grpc::ClientContext* context, "
+                     "::grpc::CompletionQueue* cq, void* tag) {\n");
+      printer->Indent();
+      printer->Print(*vars,
+                     "return std::unique_ptr< "
+                     "::grpc::ClientAsyncReaderWriter< $Request$, $Response$>>("
+                     "Async$Method$Raw(context, cq, tag));\n");
+      printer->Outdent();
+      printer->Print("}\n");
+    }
+  } else {
+    if (method->NoStreaming()) {
+      printer->Print(*vars,
+                     "::grpc::ClientAsyncResponseReader< $Response$>* "
+                     "Async$Method$Raw(::grpc::ClientContext* context, "
+                     "const $Request$& request, "
+                     "::grpc::CompletionQueue* cq) GRPC_OVERRIDE;\n");
+    } else if (method->ClientOnlyStreaming()) {
+      printer->Print(*vars,
+                     "::grpc::ClientWriter< $Request$>* $Method$Raw("
+                     "::grpc::ClientContext* context, $Response$* response) "
+                     "GRPC_OVERRIDE;\n");
+      printer->Print(
+          *vars,
+          "::grpc::ClientAsyncWriter< $Request$>* Async$Method$Raw("
+          "::grpc::ClientContext* context, $Response$* response, "
+          "::grpc::CompletionQueue* cq, void* tag) GRPC_OVERRIDE;\n");
+    } else if (method->ServerOnlyStreaming()) {
+      printer->Print(*vars,
+                     "::grpc::ClientReader< $Response$>* $Method$Raw("
+                     "::grpc::ClientContext* context, const $Request$& request)"
+                     " GRPC_OVERRIDE;\n");
+      printer->Print(
+          *vars,
+          "::grpc::ClientAsyncReader< $Response$>* Async$Method$Raw("
+          "::grpc::ClientContext* context, const $Request$& request, "
+          "::grpc::CompletionQueue* cq, void* tag) GRPC_OVERRIDE;\n");
+    } else if (method->BidiStreaming()) {
+      printer->Print(
+          *vars,
+          "::grpc::ClientReaderWriter< $Request$, $Response$>* "
+          "$Method$Raw(::grpc::ClientContext* context) GRPC_OVERRIDE;\n");
+      printer->Print(
+          *vars,
+          "::grpc::ClientAsyncReaderWriter< $Request$, $Response$>* "
+          "Async$Method$Raw(::grpc::ClientContext* context, "
+          "::grpc::CompletionQueue* cq, void* tag) GRPC_OVERRIDE;\n");
+    }
+  }
+}
+
+void PrintHeaderClientMethodData(Printer *printer, const Method *method,
+                                 std::map<grpc::string, grpc::string> *vars) {
+  (*vars)["Method"] = method->name();
+  printer->Print(*vars, "const ::grpc::RpcMethod rpcmethod_$Method$_;\n");
+}
+
+void PrintHeaderServerMethodSync(Printer *printer, const Method *method,
+                                 std::map<grpc::string, grpc::string> *vars) {
+  (*vars)["Method"] = method->name();
+  (*vars)["Request"] = method->input_type_name();
+  (*vars)["Response"] = method->output_type_name();
+  if (method->NoStreaming()) {
+    printer->Print(*vars,
+                   "virtual ::grpc::Status $Method$("
+                   "::grpc::ServerContext* context, const $Request$* request, "
+                   "$Response$* response);\n");
+  } else if (method->ClientOnlyStreaming()) {
+    printer->Print(*vars,
+                   "virtual ::grpc::Status $Method$("
+                   "::grpc::ServerContext* context, "
+                   "::grpc::ServerReader< $Request$>* reader, "
+                   "$Response$* response);\n");
+  } else if (method->ServerOnlyStreaming()) {
+    printer->Print(*vars,
+                   "virtual ::grpc::Status $Method$("
+                   "::grpc::ServerContext* context, const $Request$* request, "
+                   "::grpc::ServerWriter< $Response$>* writer);\n");
+  } else if (method->BidiStreaming()) {
+    printer->Print(
+        *vars,
+        "virtual ::grpc::Status $Method$("
+        "::grpc::ServerContext* context, "
+        "::grpc::ServerReaderWriter< $Response$, $Request$>* stream);"
+        "\n");
+  }
+}
+
+void PrintHeaderServerMethodAsync(
+    Printer *printer,
+    const Method *method,
+    std::map<grpc::string, grpc::string> *vars) {
+  (*vars)["Method"] = method->name();
+  (*vars)["Request"] = method->input_type_name();
+  (*vars)["Response"] = method->output_type_name();
+  printer->Print(*vars, "template <class BaseClass>\n");
+  printer->Print(*vars,
+                 "class WithAsyncMethod_$Method$ : public BaseClass {\n");
+  printer->Print(
+      " private:\n"
+      "  void BaseClassMustBeDerivedFromService(const Service *service) {}\n");
+  printer->Print(" public:\n");
+  printer->Indent();
+  printer->Print(*vars,
+                 "WithAsyncMethod_$Method$() {\n"
+                 "  ::grpc::Service::MarkMethodAsync($Idx$);\n"
+                 "}\n");
+  printer->Print(*vars,
+                 "~WithAsyncMethod_$Method$() GRPC_OVERRIDE {\n"
+                 "  BaseClassMustBeDerivedFromService(this);\n"
+                 "}\n");
+  if (method->NoStreaming()) {
+    printer->Print(
+        *vars,
+        "// disable synchronous version of this method\n"
+        "::grpc::Status $Method$("
+        "::grpc::ServerContext* context, const $Request$* request, "
+        "$Response$* response) GRPC_FINAL GRPC_OVERRIDE {\n"
+        "  abort();\n"
+        "  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"
+        "}\n");
+    printer->Print(
+        *vars,
+        "void Request$Method$("
+        "::grpc::ServerContext* context, $Request$* request, "
+        "::grpc::ServerAsyncResponseWriter< $Response$>* response, "
+        "::grpc::CompletionQueue* new_call_cq, "
+        "::grpc::ServerCompletionQueue* notification_cq, void *tag) {\n");
+    printer->Print(*vars,
+                   "  ::grpc::Service::RequestAsyncUnary($Idx$, context, "
+                   "request, response, new_call_cq, notification_cq, tag);\n");
+    printer->Print("}\n");
+  } else if (method->ClientOnlyStreaming()) {
+    printer->Print(
+        *vars,
+        "// disable synchronous version of this method\n"
+        "::grpc::Status $Method$("
+        "::grpc::ServerContext* context, "
+        "::grpc::ServerReader< $Request$>* reader, "
+        "$Response$* response) GRPC_FINAL GRPC_OVERRIDE {\n"
+        "  abort();\n"
+        "  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"
+        "}\n");
+    printer->Print(
+        *vars,
+        "void Request$Method$("
+        "::grpc::ServerContext* context, "
+        "::grpc::ServerAsyncReader< $Response$, $Request$>* reader, "
+        "::grpc::CompletionQueue* new_call_cq, "
+        "::grpc::ServerCompletionQueue* notification_cq, void *tag) {\n");
+    printer->Print(*vars,
+                   "  ::grpc::Service::RequestAsyncClientStreaming($Idx$, "
+                   "context, reader, new_call_cq, notification_cq, tag);\n");
+    printer->Print("}\n");
+  } else if (method->ServerOnlyStreaming()) {
+    printer->Print(
+        *vars,
+        "// disable synchronous version of this method\n"
+        "::grpc::Status $Method$("
+        "::grpc::ServerContext* context, const $Request$* request, "
+        "::grpc::ServerWriter< $Response$>* writer) GRPC_FINAL GRPC_OVERRIDE "
+        "{\n"
+        "  abort();\n"
+        "  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"
+        "}\n");
+    printer->Print(
+        *vars,
+        "void Request$Method$("
+        "::grpc::ServerContext* context, $Request$* request, "
+        "::grpc::ServerAsyncWriter< $Response$>* writer, "
+        "::grpc::CompletionQueue* new_call_cq, "
+        "::grpc::ServerCompletionQueue* notification_cq, void *tag) {\n");
+    printer->Print(
+        *vars,
+        "  ::grpc::Service::RequestAsyncServerStreaming($Idx$, "
+        "context, request, writer, new_call_cq, notification_cq, tag);\n");
+    printer->Print("}\n");
+  } else if (method->BidiStreaming()) {
+    printer->Print(
+        *vars,
+        "// disable synchronous version of this method\n"
+        "::grpc::Status $Method$("
+        "::grpc::ServerContext* context, "
+        "::grpc::ServerReaderWriter< $Response$, $Request$>* stream) "
+        "GRPC_FINAL GRPC_OVERRIDE {\n"
+        "  abort();\n"
+        "  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"
+        "}\n");
+    printer->Print(
+        *vars,
+        "void Request$Method$("
+        "::grpc::ServerContext* context, "
+        "::grpc::ServerAsyncReaderWriter< $Response$, $Request$>* stream, "
+        "::grpc::CompletionQueue* new_call_cq, "
+        "::grpc::ServerCompletionQueue* notification_cq, void *tag) {\n");
+    printer->Print(*vars,
+                   "  ::grpc::Service::RequestAsyncBidiStreaming($Idx$, "
+                   "context, stream, new_call_cq, notification_cq, tag);\n");
+    printer->Print("}\n");
+  }
+  printer->Outdent();
+  printer->Print(*vars, "};\n");
+}
+
+void PrintHeaderServerMethodGeneric(
+    Printer *printer,
+    const Method *method,
+    std::map<grpc::string, grpc::string> *vars) {
+  (*vars)["Method"] = method->name();
+  (*vars)["Request"] = method->input_type_name();
+  (*vars)["Response"] = method->output_type_name();
+  printer->Print(*vars, "template <class BaseClass>\n");
+  printer->Print(*vars,
+                 "class WithGenericMethod_$Method$ : public BaseClass {\n");
+  printer->Print(
+      " private:\n"
+      "  void BaseClassMustBeDerivedFromService(const Service *service) {}\n");
+  printer->Print(" public:\n");
+  printer->Indent();
+  printer->Print(*vars,
+                 "WithGenericMethod_$Method$() {\n"
+                 "  ::grpc::Service::MarkMethodGeneric($Idx$);\n"
+                 "}\n");
+  printer->Print(*vars,
+                 "~WithGenericMethod_$Method$() GRPC_OVERRIDE {\n"
+                 "  BaseClassMustBeDerivedFromService(this);\n"
+                 "}\n");
+  if (method->NoStreaming()) {
+    printer->Print(
+        *vars,
+        "// disable synchronous version of this method\n"
+        "::grpc::Status $Method$("
+        "::grpc::ServerContext* context, const $Request$* request, "
+        "$Response$* response) GRPC_FINAL GRPC_OVERRIDE {\n"
+        "  abort();\n"
+        "  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"
+        "}\n");
+  } else if (method->ClientOnlyStreaming()) {
+    printer->Print(
+        *vars,
+        "// disable synchronous version of this method\n"
+        "::grpc::Status $Method$("
+        "::grpc::ServerContext* context, "
+        "::grpc::ServerReader< $Request$>* reader, "
+        "$Response$* response) GRPC_FINAL GRPC_OVERRIDE {\n"
+        "  abort();\n"
+        "  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"
+        "}\n");
+  } else if (method->ServerOnlyStreaming()) {
+    printer->Print(
+        *vars,
+        "// disable synchronous version of this method\n"
+        "::grpc::Status $Method$("
+        "::grpc::ServerContext* context, const $Request$* request, "
+        "::grpc::ServerWriter< $Response$>* writer) GRPC_FINAL GRPC_OVERRIDE "
+        "{\n"
+        "  abort();\n"
+        "  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"
+        "}\n");
+  } else if (method->BidiStreaming()) {
+    printer->Print(
+        *vars,
+        "// disable synchronous version of this method\n"
+        "::grpc::Status $Method$("
+        "::grpc::ServerContext* context, "
+        "::grpc::ServerReaderWriter< $Response$, $Request$>* stream) "
+        "GRPC_FINAL GRPC_OVERRIDE {\n"
+        "  abort();\n"
+        "  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"
+        "}\n");
+  }
+  printer->Outdent();
+  printer->Print(*vars, "};\n");
+}
+
+void PrintHeaderService(Printer *printer,
+                        const Service *service,
+                        std::map<grpc::string, grpc::string> *vars) {
+  (*vars)["Service"] = service->name();
+
+  printer->Print(*vars,
+                 "class $Service$ GRPC_FINAL {\n"
+                 " public:\n");
+  printer->Indent();
+
+  // Client side
+  printer->Print(
+      "class StubInterface {\n"
+      " public:\n");
+  printer->Indent();
+  printer->Print("virtual ~StubInterface() {}\n");
+  for (int i = 0; i < service->method_count(); ++i) {
+    PrintHeaderClientMethodInterfaces(printer, service->method(i).get(), vars, true);
+  }
+  printer->Outdent();
+  printer->Print("private:\n");
+  printer->Indent();
+  for (int i = 0; i < service->method_count(); ++i) {
+    PrintHeaderClientMethodInterfaces(printer, service->method(i).get(), vars, false);
+  }
+  printer->Outdent();
+  printer->Print("};\n");
+  printer->Print(
+      "class Stub GRPC_FINAL : public StubInterface"
+      " {\n public:\n");
+  printer->Indent();
+  printer->Print("Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel);\n");
+  for (int i = 0; i < service->method_count(); ++i) {
+    PrintHeaderClientMethod(printer, service->method(i).get(), vars, true);
+  }
+  printer->Outdent();
+  printer->Print("\n private:\n");
+  printer->Indent();
+  printer->Print("std::shared_ptr< ::grpc::ChannelInterface> channel_;\n");
+  for (int i = 0; i < service->method_count(); ++i) {
+    PrintHeaderClientMethod(printer, service->method(i).get(), vars, false);
+  }
+  for (int i = 0; i < service->method_count(); ++i) {
+    PrintHeaderClientMethodData(printer, service->method(i).get(), vars);
+  }
+  printer->Outdent();
+  printer->Print("};\n");
+  printer->Print(
+      "static std::unique_ptr<Stub> NewStub(const std::shared_ptr< "
+      "::grpc::ChannelInterface>& channel, "
+      "const ::grpc::StubOptions& options = ::grpc::StubOptions());\n");
+
+  printer->Print("\n");
+
+  // Server side - base
+  printer->Print(
+      "class Service : public ::grpc::Service {\n"
+      " public:\n");
+  printer->Indent();
+  printer->Print("Service();\n");
+  printer->Print("virtual ~Service();\n");
+  for (int i = 0; i < service->method_count(); ++i) {
+    PrintHeaderServerMethodSync(printer, service->method(i).get(), vars);
+  }
+  printer->Outdent();
+  printer->Print("};\n");
+
+  // Server side - Asynchronous
+  for (int i = 0; i < service->method_count(); ++i) {
+    (*vars)["Idx"] = as_string(i);
+    PrintHeaderServerMethodAsync(printer, service->method(i).get(), vars);
+  }
+
+  printer->Print("typedef ");
+
+  for (int i = 0; i < service->method_count(); ++i) {
+    (*vars)["method_name"] = service->method(i).get()->name();
+    printer->Print(*vars, "WithAsyncMethod_$method_name$<");
+  }
+  printer->Print("Service");
+  for (int i = 0; i < service->method_count(); ++i) {
+    printer->Print(" >");
+  }
+  printer->Print(" AsyncService;\n");
+
+  // Server side - Generic
+  for (int i = 0; i < service->method_count(); ++i) {
+    (*vars)["Idx"] = as_string(i);
+    PrintHeaderServerMethodGeneric(printer, service->method(i).get(), vars);
+  }
+
+  printer->Outdent();
+  printer->Print("};\n");
+}
+
+grpc::string GetHeaderServices(File *file,
+                               const Parameters &params) {
+  grpc::string output;
+  {
+    // Scope the output stream so it closes and finalizes output to the string.
+    auto printer = file->CreatePrinter(&output);
+    std::map<grpc::string, grpc::string> vars;
+    // Package string is empty or ends with a dot. It is used to fully qualify
+    // method names.
+    vars["Package"] = file->package();
+    if (!file->package().empty()) {
+      vars["Package"].append(".");
+    }
+
+    if (!params.services_namespace.empty()) {
+      vars["services_namespace"] = params.services_namespace;
+      printer->Print(vars, "\nnamespace $services_namespace$ {\n\n");
+    }
+
+    for (int i = 0; i < file->service_count(); ++i) {
+      PrintHeaderService(printer.get(), file->service(i).get(), &vars);
+      printer->Print("\n");
+    }
+
+    if (!params.services_namespace.empty()) {
+      printer->Print(vars, "}  // namespace $services_namespace$\n\n");
+    }
+  }
+  return output;
+}
+
+grpc::string GetHeaderEpilogue(File *file, const Parameters & /*params*/) {
+  grpc::string output;
+  {
+    // Scope the output stream so it closes and finalizes output to the string.
+    auto printer = file->CreatePrinter(&output);
+    std::map<grpc::string, grpc::string> vars;
+
+    vars["filename"] = file->filename();
+    vars["filename_identifier"] = FilenameIdentifier(file->filename());
+
+    if (!file->package().empty()) {
+      std::vector<grpc::string> parts = file->package_parts();
+
+      for (auto part = parts.rbegin(); part != parts.rend(); part++) {
+        vars["part"] = *part;
+        printer->Print(vars, "}  // namespace $part$\n");
+      }
+      printer->Print(vars, "\n");
+    }
+
+    printer->Print(vars, "\n");
+    printer->Print(vars, "#endif  // GRPC_$filename_identifier$__INCLUDED\n");
+  }
+  return output;
+}
+
+grpc::string GetSourcePrologue(File *file, const Parameters & /*params*/) {
+  grpc::string output;
+  {
+    // Scope the output stream so it closes and finalizes output to the string.
+    auto printer = file->CreatePrinter(&output);
+    std::map<grpc::string, grpc::string> vars;
+
+    vars["filename"] = file->filename();
+    vars["filename_base"] = file->filename_without_ext();
+    vars["message_header_ext"] = file->message_header_ext();
+    vars["service_header_ext"] = file->service_header_ext();
+
+    printer->Print(vars, "// Generated by the gRPC protobuf plugin.\n");
+    printer->Print(vars,
+                  "// If you make any local change, they will be lost.\n");
+    printer->Print(vars, "// source: $filename$\n\n");
+    printer->Print(vars, "#include \"$filename_base$$message_header_ext$\"\n");
+    printer->Print(vars, "#include \"$filename_base$$service_header_ext$\"\n");
+    printer->Print(vars, file->additional_headers().c_str());
+    printer->Print(vars, "\n");
+  }
+  return output;
+}
+
+grpc::string GetSourceIncludes(File *file,
+                               const Parameters &params) {
+  grpc::string output;
+  {
+    // Scope the output stream so it closes and finalizes output to the string.
+    auto printer = file->CreatePrinter(&output);
+    std::map<grpc::string, grpc::string> vars;
+
+    static const char *headers_strs[] = {
+      "grpc++/impl/codegen/async_stream.h",
+      "grpc++/impl/codegen/async_unary_call.h",
+      "grpc++/impl/codegen/channel_interface.h",
+      "grpc++/impl/codegen/client_unary_call.h",
+      "grpc++/impl/codegen/method_handler_impl.h",
+      "grpc++/impl/codegen/rpc_service_method.h",
+      "grpc++/impl/codegen/service_type.h",
+      "grpc++/impl/codegen/sync_stream.h"
+    };
+    std::vector<grpc::string> headers(headers_strs, array_end(headers_strs));
+    PrintIncludes(printer.get(), headers, params);
+
+    if (!file->package().empty()) {
+      std::vector<grpc::string> parts = file->package_parts();
+
+      for (auto part = parts.begin(); part != parts.end(); part++) {
+        vars["part"] = *part;
+        printer->Print(vars, "namespace $part$ {\n");
+      }
+    }
+
+    printer->Print(vars, "\n");
+  }
+  return output;
+}
+
+void PrintSourceClientMethod(Printer *printer,
+                             const Method *method,
+                             std::map<grpc::string, grpc::string> *vars) {
+  (*vars)["Method"] = method->name();
+  (*vars)["Request"] = method->input_type_name();
+  (*vars)["Response"] = method->output_type_name();
+  if (method->NoStreaming()) {
+    printer->Print(*vars,
+                   "::grpc::Status $ns$$Service$::Stub::$Method$("
+                   "::grpc::ClientContext* context, "
+                   "const $Request$& request, $Response$* response) {\n");
+    printer->Print(*vars,
+                   "  return ::grpc::BlockingUnaryCall(channel_.get(), "
+                   "rpcmethod_$Method$_, "
+                   "context, request, response);\n"
+                   "}\n\n");
+    printer->Print(
+        *vars,
+        "::grpc::ClientAsyncResponseReader< $Response$>* "
+        "$ns$$Service$::Stub::Async$Method$Raw(::grpc::ClientContext* context, "
+        "const $Request$& request, "
+        "::grpc::CompletionQueue* cq) {\n");
+    printer->Print(*vars,
+                   "  return new "
+                   "::grpc::ClientAsyncResponseReader< $Response$>("
+                   "channel_.get(), cq, "
+                   "rpcmethod_$Method$_, "
+                   "context, request);\n"
+                   "}\n\n");
+  } else if (method->ClientOnlyStreaming()) {
+    printer->Print(*vars,
+                   "::grpc::ClientWriter< $Request$>* "
+                   "$ns$$Service$::Stub::$Method$Raw("
+                   "::grpc::ClientContext* context, $Response$* response) {\n");
+    printer->Print(*vars,
+                   "  return new ::grpc::ClientWriter< $Request$>("
+                   "channel_.get(), "
+                   "rpcmethod_$Method$_, "
+                   "context, response);\n"
+                   "}\n\n");
+    printer->Print(*vars,
+                   "::grpc::ClientAsyncWriter< $Request$>* "
+                   "$ns$$Service$::Stub::Async$Method$Raw("
+                   "::grpc::ClientContext* context, $Response$* response, "
+                   "::grpc::CompletionQueue* cq, void* tag) {\n");
+    printer->Print(*vars,
+                   "  return new ::grpc::ClientAsyncWriter< $Request$>("
+                   "channel_.get(), cq, "
+                   "rpcmethod_$Method$_, "
+                   "context, response, tag);\n"
+                   "}\n\n");
+  } else if (method->ServerOnlyStreaming()) {
+    printer->Print(
+        *vars,
+        "::grpc::ClientReader< $Response$>* "
+        "$ns$$Service$::Stub::$Method$Raw("
+        "::grpc::ClientContext* context, const $Request$& request) {\n");
+    printer->Print(*vars,
+                   "  return new ::grpc::ClientReader< $Response$>("
+                   "channel_.get(), "
+                   "rpcmethod_$Method$_, "
+                   "context, request);\n"
+                   "}\n\n");
+    printer->Print(*vars,
+                   "::grpc::ClientAsyncReader< $Response$>* "
+                   "$ns$$Service$::Stub::Async$Method$Raw("
+                   "::grpc::ClientContext* context, const $Request$& request, "
+                   "::grpc::CompletionQueue* cq, void* tag) {\n");
+    printer->Print(*vars,
+                   "  return new ::grpc::ClientAsyncReader< $Response$>("
+                   "channel_.get(), cq, "
+                   "rpcmethod_$Method$_, "
+                   "context, request, tag);\n"
+                   "}\n\n");
+  } else if (method->BidiStreaming()) {
+    printer->Print(
+        *vars,
+        "::grpc::ClientReaderWriter< $Request$, $Response$>* "
+        "$ns$$Service$::Stub::$Method$Raw(::grpc::ClientContext* context) {\n");
+    printer->Print(*vars,
+                   "  return new ::grpc::ClientReaderWriter< "
+                   "$Request$, $Response$>("
+                   "channel_.get(), "
+                   "rpcmethod_$Method$_, "
+                   "context);\n"
+                   "}\n\n");
+    printer->Print(
+        *vars,
+        "::grpc::ClientAsyncReaderWriter< $Request$, $Response$>* "
+        "$ns$$Service$::Stub::Async$Method$Raw(::grpc::ClientContext* context, "
+        "::grpc::CompletionQueue* cq, void* tag) {\n");
+    printer->Print(*vars,
+                   "  return new "
+                   "::grpc::ClientAsyncReaderWriter< $Request$, $Response$>("
+                   "channel_.get(), cq, "
+                   "rpcmethod_$Method$_, "
+                   "context, tag);\n"
+                   "}\n\n");
+  }
+}
+
+void PrintSourceServerMethod(Printer *printer,
+                             const Method *method,
+                             std::map<grpc::string, grpc::string> *vars) {
+  (*vars)["Method"] = method->name();
+  (*vars)["Request"] = method->input_type_name();
+  (*vars)["Response"] = method->output_type_name();
+  if (method->NoStreaming()) {
+    printer->Print(*vars,
+                   "::grpc::Status $ns$$Service$::Service::$Method$("
+                   "::grpc::ServerContext* context, "
+                   "const $Request$* request, $Response$* response) {\n");
+    printer->Print("  (void) context;\n");
+    printer->Print("  (void) request;\n");
+    printer->Print("  (void) response;\n");
+    printer->Print(
+        "  return ::grpc::Status("
+        "::grpc::StatusCode::UNIMPLEMENTED, \"\");\n");
+    printer->Print("}\n\n");
+  } else if (method->ClientOnlyStreaming()) {
+    printer->Print(*vars,
+                   "::grpc::Status $ns$$Service$::Service::$Method$("
+                   "::grpc::ServerContext* context, "
+                   "::grpc::ServerReader< $Request$>* reader, "
+                   "$Response$* response) {\n");
+    printer->Print("  (void) context;\n");
+    printer->Print("  (void) reader;\n");
+    printer->Print("  (void) response;\n");
+    printer->Print(
+        "  return ::grpc::Status("
+        "::grpc::StatusCode::UNIMPLEMENTED, \"\");\n");
+    printer->Print("}\n\n");
+  } else if (method->ServerOnlyStreaming()) {
+    printer->Print(*vars,
+                   "::grpc::Status $ns$$Service$::Service::$Method$("
+                   "::grpc::ServerContext* context, "
+                   "const $Request$* request, "
+                   "::grpc::ServerWriter< $Response$>* writer) {\n");
+    printer->Print("  (void) context;\n");
+    printer->Print("  (void) request;\n");
+    printer->Print("  (void) writer;\n");
+    printer->Print(
+        "  return ::grpc::Status("
+        "::grpc::StatusCode::UNIMPLEMENTED, \"\");\n");
+    printer->Print("}\n\n");
+  } else if (method->BidiStreaming()) {
+    printer->Print(*vars,
+                   "::grpc::Status $ns$$Service$::Service::$Method$("
+                   "::grpc::ServerContext* context, "
+                   "::grpc::ServerReaderWriter< $Response$, $Request$>* "
+                   "stream) {\n");
+    printer->Print("  (void) context;\n");
+    printer->Print("  (void) stream;\n");
+    printer->Print(
+        "  return ::grpc::Status("
+        "::grpc::StatusCode::UNIMPLEMENTED, \"\");\n");
+    printer->Print("}\n\n");
+  }
+}
+
+void PrintSourceService(Printer *printer,
+                        const Service *service,
+                        std::map<grpc::string, grpc::string> *vars) {
+  (*vars)["Service"] = service->name();
+
+  printer->Print(*vars,
+                 "static const char* $prefix$$Service$_method_names[] = {\n");
+  for (int i = 0; i < service->method_count(); ++i) {
+    (*vars)["Method"] = service->method(i).get()->name();
+    printer->Print(*vars, "  \"/$Package$$Service$/$Method$\",\n");
+  }
+  printer->Print(*vars, "};\n\n");
+
+  printer->Print(*vars,
+                 "std::unique_ptr< $ns$$Service$::Stub> $ns$$Service$::NewStub("
+                 "const std::shared_ptr< ::grpc::ChannelInterface>& channel, "
+                 "const ::grpc::StubOptions& options) {\n"
+                 "  std::unique_ptr< $ns$$Service$::Stub> stub(new "
+                 "$ns$$Service$::Stub(channel));\n"
+                 "  return stub;\n"
+                 "}\n\n");
+  printer->Print(*vars,
+                 "$ns$$Service$::Stub::Stub(const std::shared_ptr< "
+                 "::grpc::ChannelInterface>& channel)\n");
+  printer->Indent();
+  printer->Print(": channel_(channel)");
+  for (int i = 0; i < service->method_count(); ++i) {
+    auto method = service->method(i);
+    (*vars)["Method"] = method->name();
+    (*vars)["Idx"] = as_string(i);
+    if (method->NoStreaming()) {
+      (*vars)["StreamingType"] = "NORMAL_RPC";
+    } else if (method->ClientOnlyStreaming()) {
+      (*vars)["StreamingType"] = "CLIENT_STREAMING";
+    } else if (method->ServerOnlyStreaming()) {
+      (*vars)["StreamingType"] = "SERVER_STREAMING";
+    } else {
+      (*vars)["StreamingType"] = "BIDI_STREAMING";
+    }
+    printer->Print(*vars,
+                   ", rpcmethod_$Method$_("
+                   "$prefix$$Service$_method_names[$Idx$], "
+                   "::grpc::RpcMethod::$StreamingType$, "
+                   "channel"
+                   ")\n");
+  }
+  printer->Print("{}\n\n");
+  printer->Outdent();
+
+  for (int i = 0; i < service->method_count(); ++i) {
+    (*vars)["Idx"] = as_string(i);
+    PrintSourceClientMethod(printer, service->method(i).get(), vars);
+  }
+
+  printer->Print(*vars, "$ns$$Service$::Service::Service() {\n");
+  printer->Indent();
+  printer->Print(*vars, "(void)$prefix$$Service$_method_names;\n");
+  for (int i = 0; i < service->method_count(); ++i) {
+    auto method = service->method(i);
+    (*vars)["Idx"] = as_string(i);
+    (*vars)["Method"] = method->name();
+    (*vars)["Request"] = method->input_type_name();
+    (*vars)["Response"] = method->output_type_name();
+    if (method->NoStreaming()) {
+      printer->Print(
+          *vars,
+          "AddMethod(new ::grpc::RpcServiceMethod(\n"
+          "    $prefix$$Service$_method_names[$Idx$],\n"
+          "    ::grpc::RpcMethod::NORMAL_RPC,\n"
+          "    new ::grpc::RpcMethodHandler< $ns$$Service$::Service, "
+          "$Request$, "
+          "$Response$>(\n"
+          "        std::mem_fn(&$ns$$Service$::Service::$Method$), this)));\n");
+    } else if (method->ClientOnlyStreaming()) {
+      printer->Print(
+          *vars,
+          "AddMethod(new ::grpc::RpcServiceMethod(\n"
+          "    $prefix$$Service$_method_names[$Idx$],\n"
+          "    ::grpc::RpcMethod::CLIENT_STREAMING,\n"
+          "    new ::grpc::ClientStreamingHandler< "
+          "$ns$$Service$::Service, $Request$, $Response$>(\n"
+          "        std::mem_fn(&$ns$$Service$::Service::$Method$), this)));\n");
+    } else if (method->ServerOnlyStreaming()) {
+      printer->Print(
+          *vars,
+          "AddMethod(new ::grpc::RpcServiceMethod(\n"
+          "    $prefix$$Service$_method_names[$Idx$],\n"
+          "    ::grpc::RpcMethod::SERVER_STREAMING,\n"
+          "    new ::grpc::ServerStreamingHandler< "
+          "$ns$$Service$::Service, $Request$, $Response$>(\n"
+          "        std::mem_fn(&$ns$$Service$::Service::$Method$), this)));\n");
+    } else if (method->BidiStreaming()) {
+      printer->Print(
+          *vars,
+          "AddMethod(new ::grpc::RpcServiceMethod(\n"
+          "    $prefix$$Service$_method_names[$Idx$],\n"
+          "    ::grpc::RpcMethod::BIDI_STREAMING,\n"
+          "    new ::grpc::BidiStreamingHandler< "
+          "$ns$$Service$::Service, $Request$, $Response$>(\n"
+          "        std::mem_fn(&$ns$$Service$::Service::$Method$), this)));\n");
+    }
+  }
+  printer->Outdent();
+  printer->Print(*vars, "}\n\n");
+  printer->Print(*vars,
+                 "$ns$$Service$::Service::~Service() {\n"
+                 "}\n\n");
+  for (int i = 0; i < service->method_count(); ++i) {
+    (*vars)["Idx"] = as_string(i);
+    PrintSourceServerMethod(printer, service->method(i).get(), vars);
+  }
+}
+
+grpc::string GetSourceServices(File *file,
+                               const Parameters &params) {
+  grpc::string output;
+  {
+    // Scope the output stream so it closes and finalizes output to the string.
+    auto printer = file->CreatePrinter(&output);
+    std::map<grpc::string, grpc::string> vars;
+    // Package string is empty or ends with a dot. It is used to fully qualify
+    // method names.
+    vars["Package"] = file->package();
+    if (!file->package().empty()) {
+      vars["Package"].append(".");
+    }
+    if (!params.services_namespace.empty()) {
+      vars["ns"] = params.services_namespace + "::";
+      vars["prefix"] = params.services_namespace;
+    } else {
+      vars["ns"] = "";
+      vars["prefix"] = "";
+    }
+
+    for (int i = 0; i < file->service_count(); ++i) {
+      PrintSourceService(printer.get(), file->service(i).get(), &vars);
+      printer->Print("\n");
+    }
+  }
+  return output;
+}
+
+grpc::string GetSourceEpilogue(File *file, const Parameters & /*params*/) {
+  grpc::string temp;
+
+  if (!file->package().empty()) {
+    std::vector<grpc::string> parts = file->package_parts();
+
+    for (auto part = parts.begin(); part != parts.end(); part++) {
+      temp.append("}  // namespace ");
+      temp.append(*part);
+      temp.append("\n");
+    }
+    temp.append("\n");
+  }
+
+  return temp;
+}
+
+}  // namespace grpc_cpp_generator
diff --git a/grpc/src/compiler/cpp_generator.h b/grpc/src/compiler/cpp_generator.h
new file mode 100644
index 000000000..953ddfd56
--- /dev/null
+++ b/grpc/src/compiler/cpp_generator.h
@@ -0,0 +1,147 @@
+/*
+ *
+ * Copyright 2015, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef GRPC_INTERNAL_COMPILER_CPP_GENERATOR_H
+#define GRPC_INTERNAL_COMPILER_CPP_GENERATOR_H
+
+// cpp_generator.h/.cc do not directly depend on GRPC/ProtoBuf, such that they
+// can be used to generate code for other serialization systems, such as
+// FlatBuffers.
+
+#include <memory>
+#include <vector>
+
+#ifndef GRPC_CUSTOM_STRING
+#include <string>
+#define GRPC_CUSTOM_STRING std::string
+#endif
+
+namespace grpc {
+
+typedef GRPC_CUSTOM_STRING string;
+
+}  // namespace grpc
+
+namespace grpc_cpp_generator {
+
+// Contains all the parameters that are parsed from the command line.
+struct Parameters {
+  // Puts the service into a namespace
+  grpc::string services_namespace;
+  // Use system includes (<>) or local includes ("")
+  bool use_system_headers;
+  // Prefix to any grpc include
+  grpc::string grpc_search_path;
+};
+
+// An abstract interface representing a method.
+struct Method {
+  virtual ~Method() {}
+
+  virtual grpc::string name() const = 0;
+
+  virtual grpc::string input_type_name() const = 0;
+  virtual grpc::string output_type_name() const = 0;
+
+  virtual bool NoStreaming() const = 0;
+  virtual bool ClientOnlyStreaming() const = 0;
+  virtual bool ServerOnlyStreaming() const = 0;
+  virtual bool BidiStreaming() const = 0;
+};
+
+// An abstract interface representing a service.
+struct Service {
+  virtual ~Service() {}
+
+  virtual grpc::string name() const = 0;
+
+  virtual int method_count() const = 0;
+  virtual std::unique_ptr<const Method> method(int i) const = 0;
+};
+
+struct Printer {
+  virtual ~Printer() {}
+
+  virtual void Print(const std::map<grpc::string, grpc::string> &vars,
+                     const char *template_string) = 0;
+  virtual void Print(const char *string) = 0;
+  virtual void Indent() = 0;
+  virtual void Outdent() = 0;
+};
+
+// An interface that allows the source generated to be output using various
+// libraries/idls/serializers.
+struct File {
+  virtual ~File() {}
+
+  virtual grpc::string filename() const = 0;
+  virtual grpc::string filename_without_ext() const = 0;
+  virtual grpc::string message_header_ext() const = 0;
+  virtual grpc::string service_header_ext() const = 0;
+  virtual grpc::string package() const = 0;
+  virtual std::vector<grpc::string> package_parts() const = 0;
+  virtual grpc::string additional_headers() const = 0;
+
+  virtual int service_count() const = 0;
+  virtual std::unique_ptr<const Service> service(int i) const = 0;
+
+  virtual std::unique_ptr<Printer> CreatePrinter(grpc::string *str) const = 0;
+};
+
+// Return the prologue of the generated header file.
+grpc::string GetHeaderPrologue(File *file, const Parameters &params);
+
+// Return the includes needed for generated header file.
+grpc::string GetHeaderIncludes(File *file, const Parameters &params);
+
+// Return the includes needed for generated source file.
+grpc::string GetSourceIncludes(File *file, const Parameters &params);
+
+// Return the epilogue of the generated header file.
+grpc::string GetHeaderEpilogue(File *file, const Parameters &params);
+
+// Return the prologue of the generated source file.
+grpc::string GetSourcePrologue(File *file, const Parameters &params);
+
+// Return the services for generated header file.
+grpc::string GetHeaderServices(File *file, const Parameters &params);
+
+// Return the services for generated source file.
+grpc::string GetSourceServices(File *file, const Parameters &params);
+
+// Return the epilogue of the generated source file.
+grpc::string GetSourceEpilogue(File *file, const Parameters &params);
+
+}  // namespace grpc_cpp_generator
+
+#endif  // GRPC_INTERNAL_COMPILER_CPP_GENERATOR_H
diff --git a/grpc/tests/grpctest.cpp b/grpc/tests/grpctest.cpp
new file mode 100644
index 000000000..d1b53776b
--- /dev/null
+++ b/grpc/tests/grpctest.cpp
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2014 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <thread>
+
+#include <grpc++/grpc++.h>
+
+#include "monster_test_generated.h"
+#include "monster_test.grpc.fb.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,
+                               const flatbuffers::BufferRef<Monster> *request,
+                               flatbuffers::BufferRef<Stat> *response)
+                               override {
+    // Create a response from the incoming request name.
+    fbb_.Clear();
+    auto stat_offset = CreateStat(fbb_, fbb_.CreateString("Hello, " +
+                                        request->GetRoot()->name()->str()));
+    fbb_.Finish(stat_offset);
+    // Since we keep reusing the same FlatBufferBuilder, the memory it owns
+    // remains valid until the next call (this BufferRef doesn't own the
+    // memory it points to).
+    *response = flatbuffers::BufferRef<Stat>(fbb_.GetBufferPointer(),
+                                             fbb_.GetSize());
+    return grpc::Status::OK;
+  }
+  virtual ::grpc::Status Retrieve(::grpc::ServerContext *context,
+                                  const flatbuffers::BufferRef<Stat> *request,
+                                  flatbuffers::BufferRef<Monster> *response)
+                                  override {
+    assert(false);  // We're not actually using this RPC.
+    return grpc::Status::CANCELLED;
+  }
+
+ private:
+  flatbuffers::FlatBufferBuilder fbb_;
+};
+
+// Track the server instance, so we can terminate it later.
+grpc::Server *server_instance = nullptr;
+// Mutex to protec this variable.
+std::mutex wait_for_server;
+std::condition_variable server_instance_cv;
+
+// This function implements the server thread.
+void RunServer() {
+  auto server_address = "0.0.0.0:50051";
+  // Callback interface we implemented above.
+  ServiceImpl service;
+  grpc::ServerBuilder builder;
+  builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
+  builder.RegisterService(&service);
+
+  // Start the server. Lock to change the variable we're changing.
+  wait_for_server.lock();
+  server_instance = builder.BuildAndStart().release();
+  wait_for_server.unlock();
+  server_instance_cv.notify_one();
+
+  std::cout << "Server listening on " << server_address << std::endl;
+  // This will block the thread and serve requests.
+  server_instance->Wait();
+}
+
+int main(int /*argc*/, const char * /*argv*/[]) {
+  // Launch server.
+  std::thread server_thread(RunServer);
+
+  // wait for server to spin up.
+  std::unique_lock<std::mutex> lock(wait_for_server);
+  while (!server_instance) server_instance_cv.wait(lock);
+
+  // Now connect the client.
+  auto channel = grpc::CreateChannel("localhost:50051",
+                                     grpc::InsecureChannelCredentials());
+  auto stub = MyGame::Example::MonsterStorage::NewStub(channel);
+
+  grpc::ClientContext context;
+
+  // Build a request with the name set.
+  flatbuffers::FlatBufferBuilder fbb;
+  auto monster_offset = CreateMonster(fbb, 0, 0, 0, fbb.CreateString("Fred"));
+  fbb.Finish(monster_offset);
+  auto request = flatbuffers::BufferRef<Monster>(fbb.GetBufferPointer(),
+                                                 fbb.GetSize());
+  flatbuffers::BufferRef<Stat> response;
+
+  // The actual RPC.
+  auto status = stub->Store(&context, request, &response);
+
+  if (status.ok()) {
+    auto resp = response.GetRoot()->id();
+    std::cout << "RPC response: " << resp->str() << std::endl;
+  } else {
+    std::cout << "RPC failed" << std::endl;
+  }
+
+  server_instance->Shutdown();
+
+  server_thread.join();
+
+  delete server_instance;
+
+  return 0;
+}
+
diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index ae50d57d6..6755ec279 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -1334,6 +1334,29 @@ class Verifier FLATBUFFERS_FINAL_CLASS {
   size_t max_tables_;
 };
 
+// Convenient way to bundle a buffer and its length, to pass it around
+// typed by its root.
+// A BufferRef does not own its buffer.
+struct BufferRefBase {};  // for std::is_base_of
+template<typename T> struct BufferRef : BufferRefBase {
+  BufferRef() : buf(nullptr), len(0), must_free(false) {}
+  BufferRef(uint8_t *_buf, uoffset_t _len)
+    : buf(_buf), len(_len), must_free(false) {}
+
+  ~BufferRef() { if (must_free) free(buf); }
+
+  const T *GetRoot() const { return flatbuffers::GetRoot<T>(buf); }
+
+  bool Verify() {
+    Verifier verifier(buf, len);
+    return verifier.VerifyBuffer<T>();
+  }
+
+  uint8_t *buf;
+  uoffset_t len;
+  bool must_free;
+};
+
 // "structs" are flat structures that do not have an offset table, thus
 // always have all members present and do not support forwards/backwards
 // compatible extensions.
diff --git a/include/flatbuffers/grpc.h b/include/flatbuffers/grpc.h
new file mode 100644
index 000000000..52a64408d
--- /dev/null
+++ b/include/flatbuffers/grpc.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef FLATBUFFERS_GRPC_H_
+#define FLATBUFFERS_GRPC_H_
+
+// Helper functionality to glue FlatBuffers and GRPC.
+
+#include "grpc++/support/byte_buffer.h"
+#include "grpc/byte_buffer_reader.h"
+
+namespace grpc {
+
+template <class T>
+class SerializationTraits<T, typename std::enable_if<std::is_base_of<
+                                 flatbuffers::BufferRefBase, T>::value>::type> {
+ public:
+  // The type we're passing here is a BufferRef, which is already serialized
+  // FlatBuffer data, which then gets passed to GRPC.
+  static grpc::Status Serialize(const T& msg,
+                                grpc_byte_buffer **buffer,
+                                bool *own_buffer) {
+    // TODO(wvo): make this work without copying.
+    auto slice = gpr_slice_from_copied_buffer(
+                   reinterpret_cast<const char *>(msg.buf), msg.len);
+    *buffer = grpc_raw_byte_buffer_create(&slice, 1);
+    *own_buffer = true;
+    return grpc::Status();
+  }
+
+  // There is no de-serialization step in FlatBuffers, so we just receive
+  // the data from GRPC.
+  static grpc::Status Deserialize(grpc_byte_buffer *buffer,
+                                  T *msg,
+                                  int max_message_size) {
+    // TODO(wvo): make this more efficient / zero copy when possible.
+    auto len = grpc_byte_buffer_length(buffer);
+    msg->buf = reinterpret_cast<uint8_t *>(malloc(len));
+    msg->len = static_cast<flatbuffers::uoffset_t>(len);
+    msg->must_free = true;
+    uint8_t *current = msg->buf;
+    grpc_byte_buffer_reader reader;
+    grpc_byte_buffer_reader_init(&reader, buffer);
+    gpr_slice slice;
+    while (grpc_byte_buffer_reader_next(&reader, &slice)) {
+      memcpy(current, GPR_SLICE_START_PTR(slice), GPR_SLICE_LENGTH(slice));
+      current += GPR_SLICE_LENGTH(slice);
+      gpr_slice_unref(slice);
+    }
+    GPR_ASSERT(current == msg->buf + msg->len);
+    grpc_byte_buffer_reader_destroy(&reader);
+    grpc_byte_buffer_destroy(buffer);
+    return grpc::Status();
+  }
+};
+
+}  // namespace grpc;
+
+#endif  // FLATBUFFERS_GRPC_H_
diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index e3027259b..b22bc08a1 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -432,7 +432,7 @@ class Parser : public ParserState {
     known_attributes_["original_order"] = true;
     known_attributes_["nested_flatbuffer"] = true;
     known_attributes_["csharp_partial"] = true;
-    known_attributes_["stream"] = true;
+    known_attributes_["streaming"] = true;
     known_attributes_["idempotent"] = true;
   }
 
@@ -679,6 +679,12 @@ extern std::string BinaryMakeRule(const Parser &parser,
                                   const std::string &path,
                                   const std::string &file_name);
 
+// Generate GRPC interfaces.
+// See idl_gen_grpc.cpp.
+bool GenerateGRPC(const Parser &parser,
+                  const std::string &path,
+                  const std::string &file_name);
+
 }  // namespace flatbuffers
 
 #endif  // FLATBUFFERS_IDL_H_
diff --git a/src/flatc.cpp b/src/flatc.cpp
index d4be151c8..c7ba29e86 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -74,10 +74,14 @@ const Generator generators[] = {
     flatbuffers::IDLOptions::kMAX,
     "Generate Python files for tables/structs",
     flatbuffers::GeneralMakeRule },
-    { flatbuffers::GeneratePhp, nullptr, "--php", "PHP",
+  { flatbuffers::GeneratePhp, nullptr, "--php", "PHP",
     flatbuffers::IDLOptions::kMAX,
     "Generate PHP files for tables/structs",
     flatbuffers::GeneralMakeRule },
+  { flatbuffers::GenerateGRPC, nullptr, "--grpc", "GRPC",
+    flatbuffers::IDLOptions::kMAX,
+    "Generate GRPC interfaces",
+    flatbuffers::CPPMakeRule },
 };
 
 const char *program_name = nullptr;
diff --git a/src/idl_gen_grpc.cpp b/src/idl_gen_grpc.cpp
new file mode 100644
index 000000000..0dcc316d6
--- /dev/null
+++ b/src/idl_gen_grpc.cpp
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2014 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// independent from idl_parser, since this code is not needed for most clients
+
+#include "flatbuffers/flatbuffers.h"
+#include "flatbuffers/idl.h"
+#include "flatbuffers/util.h"
+
+#include "src/compiler/cpp_generator.h"
+
+namespace flatbuffers {
+
+class FlatBufMethod : public grpc_cpp_generator::Method {
+ public:
+  enum Streaming { kNone, kClient, kServer, kBiDi };
+
+  FlatBufMethod(const RPCCall *method)
+    : method_(method) {
+    streaming_ = kNone;
+    auto val = method_->attributes.Lookup("streaming");
+    if (val) {
+      if (val->constant == "client") streaming_ = kClient;
+      if (val->constant == "server") streaming_ = kServer;
+      if (val->constant == "bidi") streaming_ = kBiDi;
+    }
+  }
+
+  std::string name() const { return method_->name; }
+
+  std::string GRPCType(const StructDef &sd) const {
+    return "flatbuffers::BufferRef<" + sd.name + ">";
+  }
+
+  std::string input_type_name() const {
+    return GRPCType(*method_->request);
+  }
+  std::string output_type_name() const {
+    return GRPCType(*method_->response);
+  }
+
+  bool NoStreaming() const { return streaming_ == kNone; }
+  bool ClientOnlyStreaming() const { return streaming_ == kClient; }
+  bool ServerOnlyStreaming() const { return streaming_ == kServer; }
+  bool BidiStreaming() const { return streaming_ == kBiDi; }
+
+ private:
+  const RPCCall *method_;
+  Streaming streaming_;
+};
+
+class FlatBufService : public grpc_cpp_generator::Service {
+ public:
+  FlatBufService(const ServiceDef *service) : service_(service) {}
+
+  std::string name() const { return service_->name; }
+
+  int method_count() const {
+    return static_cast<int>(service_->calls.vec.size());
+  };
+
+  std::unique_ptr<const grpc_cpp_generator::Method> method(int i) const {
+    return std::unique_ptr<const grpc_cpp_generator::Method>(
+          new FlatBufMethod(service_->calls.vec[i]));
+  };
+
+ private:
+  const ServiceDef *service_;
+};
+
+class FlatBufPrinter : public grpc_cpp_generator::Printer {
+ public:
+  FlatBufPrinter(std::string *str)
+    : str_(str), escape_char_('$'), indent_(0) {}
+
+  void Print(const std::map<std::string, std::string> &vars,
+             const char *string_template) {
+    std::string s = string_template;
+    // Replace any occurrences of strings in "vars" that are surrounded
+    // by the escape character by what they're mapped to.
+    size_t pos;
+    while ((pos = s.find(escape_char_)) != std::string::npos) {
+      // Found an escape char, must also find the closing one.
+      size_t pos2 = s.find(escape_char_, pos + 1);
+      // If placeholder not closed, ignore.
+      if (pos2 == std::string::npos) break;
+      auto it = vars.find(s.substr(pos + 1, pos2 - pos - 1));
+      // If unknown placeholder, ignore.
+      if (it == vars.end()) break;
+      // Subtitute placeholder.
+      s.replace(pos, pos2 - pos + 1, it->second);
+    }
+    Print(s.c_str());
+  }
+
+  void Print(const char *s) {
+    // 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.
+      auto lf = strchr(s, '\n');
+      if (lf) {
+        (*str_) += std::string(s, lf + 1);
+        s = lf + 1;
+        if (!*s) break;  // Only continue if there's more lines.
+      } else {
+        (*str_) += s;
+        break;
+      }
+    }
+  }
+
+  void Indent() { indent_++; }
+  void Outdent() { indent_--; assert(indent_ >= 0); }
+
+ private:
+  std::string *str_;
+  char escape_char_;
+  int indent_;
+};
+
+class FlatBufFile : public grpc_cpp_generator::File {
+ public:
+  FlatBufFile(const Parser &parser, const std::string &file_name)
+    : parser_(parser), file_name_(file_name) {}
+
+  std::string filename() const { return file_name_; }
+  std::string filename_without_ext() const {
+    return StripExtension(file_name_);
+  }
+
+  std::string message_header_ext() const { return "_generated.h"; }
+  std::string service_header_ext() const { return ".grpc.fb.h"; }
+
+  std::string package() const {
+    return parser_.namespaces_.back()->GetFullyQualifiedName("");
+  }
+
+  std::vector<std::string> package_parts() const {
+    return parser_.namespaces_.back()->components;
+  }
+
+  std::string additional_headers() const {
+    return "#include \"flatbuffers/grpc.h\"\n";
+  }
+
+  int service_count() const {
+    return static_cast<int>(parser_.services_.vec.size());
+  };
+
+  std::unique_ptr<const grpc_cpp_generator::Service> service(int i) const {
+    return std::unique_ptr<const grpc_cpp_generator::Service> (
+          new FlatBufService(parser_.services_.vec[i]));
+  }
+
+  std::unique_ptr<grpc_cpp_generator::Printer> CreatePrinter(std::string *str) const {
+    return std::unique_ptr<grpc_cpp_generator::Printer>(
+          new FlatBufPrinter(str));
+  }
+
+ private:
+  const Parser &parser_;
+  const std::string &file_name_;
+};
+
+bool GenerateGRPC(const Parser &parser,
+                  const std::string &/*path*/,
+                  const std::string &file_name) {
+
+  int nservices = 0;
+  for (auto it = parser.services_.vec.begin();
+       it != parser.services_.vec.end(); ++it) {
+    if (!(*it)->generated) nservices++;
+  }
+  if (!nservices) return true;
+
+  grpc_cpp_generator::Parameters generator_parameters;
+  // TODO(wvo): make the other parameters in this struct configurable.
+  generator_parameters.use_system_headers = true;
+
+  FlatBufFile fbfile(parser, file_name);
+
+  std::string header_code =
+      grpc_cpp_generator::GetHeaderPrologue(&fbfile, generator_parameters) +
+      grpc_cpp_generator::GetHeaderIncludes(&fbfile, generator_parameters) +
+      grpc_cpp_generator::GetHeaderServices(&fbfile, generator_parameters) +
+      grpc_cpp_generator::GetHeaderEpilogue(&fbfile, generator_parameters);
+
+  std::string source_code =
+      grpc_cpp_generator::GetSourcePrologue(&fbfile, generator_parameters) +
+      grpc_cpp_generator::GetSourceIncludes(&fbfile, generator_parameters) +
+      grpc_cpp_generator::GetSourceServices(&fbfile, generator_parameters) +
+      grpc_cpp_generator::GetSourceEpilogue(&fbfile, generator_parameters);
+
+  return flatbuffers::SaveFile((file_name + ".grpc.fb.h").c_str(),
+                               header_code, false) &&
+         flatbuffers::SaveFile((file_name + ".grpc.fb.cc").c_str(),
+                               source_code, false);
+}
+
+}  // namespace flatbuffers
+
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 8fddb3c66..b758e9592 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -1423,6 +1423,10 @@ void Parser::MarkGenerated() {
            it != structs_.vec.end(); ++it) {
     (*it)->generated = true;
   }
+  for (auto it = services_.vec.begin();
+           it != services_.vec.end(); ++it) {
+    (*it)->generated = true;
+  }
 }
 
 CheckedError Parser::ParseNamespace() {
diff --git a/tests/generate_code.bat b/tests/generate_code.bat
index 00b16d900..53d54707b 100644
--- a/tests/generate_code.bat
+++ b/tests/generate_code.bat
@@ -12,6 +12,6 @@
 :: See the License for the specific language governing permissions and
 :: limitations under the License.
 
-..\flatc.exe --cpp --java --csharp --go --binary --python --js --php --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
+..\flatc.exe --cpp --java --csharp --go --binary --python --js --php --grpc --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
 ..\flatc.exe --cpp --java --csharp --go --binary --python --js --php --gen-mutable -o namespace_test namespace_test\namespace_test1.fbs namespace_test\namespace_test2.fbs
 ..\flatc.exe --binary --schema monster_test.fbs
diff --git a/tests/generate_code.sh b/tests/generate_code.sh
index b74c2bec5..3436d8586 100644
--- a/tests/generate_code.sh
+++ b/tests/generate_code.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-../flatc --cpp --java --csharp --go --binary --python --js --php --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
+../flatc --cpp --java --csharp --go --binary --python --js --php --grpc --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
 ../flatc --cpp --java --csharp --go --binary --python --js --php --gen-mutable -o namespace_test namespace_test/namespace_test1.fbs namespace_test/namespace_test2.fbs
 ../flatc --binary --schema monster_test.fbs
 
diff --git a/tests/monster_test.fbs b/tests/monster_test.fbs
index 7ddaa582f..3fecd33cf 100755
--- a/tests/monster_test.fbs
+++ b/tests/monster_test.fbs
@@ -70,7 +70,7 @@ table Monster {
 }
 
 rpc_service MonsterStorage {
-  Store(Monster):Stat (stream);
+  Store(Monster):Stat (streaming: "none");
   Retrieve(Stat):Monster (idempotent);
 }
 
diff --git a/tests/monster_test.grpc.fb.cc b/tests/monster_test.grpc.fb.cc
new file mode 100644
index 000000000..71dbd2d4f
--- /dev/null
+++ b/tests/monster_test.grpc.fb.cc
@@ -0,0 +1,85 @@
+// Generated by the gRPC protobuf plugin.
+// If you make any local change, they will be lost.
+// source: monster_test
+
+#include "monster_test_generated.h"
+#include "monster_test.grpc.fb.h"
+#include "flatbuffers/grpc.h"
+
+#include <grpc++/impl/codegen/async_stream.h>
+#include <grpc++/impl/codegen/async_unary_call.h>
+#include <grpc++/impl/codegen/channel_interface.h>
+#include <grpc++/impl/codegen/client_unary_call.h>
+#include <grpc++/impl/codegen/method_handler_impl.h>
+#include <grpc++/impl/codegen/rpc_service_method.h>
+#include <grpc++/impl/codegen/service_type.h>
+#include <grpc++/impl/codegen/sync_stream.h>
+namespace MyGame {
+namespace Example {
+
+static const char* MonsterStorage_method_names[] = {
+  "/MyGame.Example..MonsterStorage/Store",
+  "/MyGame.Example..MonsterStorage/Retrieve",
+};
+
+std::unique_ptr< MonsterStorage::Stub> MonsterStorage::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
+  std::unique_ptr< MonsterStorage::Stub> stub(new MonsterStorage::Stub(channel));
+  return stub;
+}
+
+MonsterStorage::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel)
+  : channel_(channel)  , rpcmethod_Store_(MonsterStorage_method_names[0], ::grpc::RpcMethod::NORMAL_RPC, channel)
+  , rpcmethod_Retrieve_(MonsterStorage_method_names[1], ::grpc::RpcMethod::NORMAL_RPC, channel)
+  {}
+  
+::grpc::Status MonsterStorage::Stub::Store(::grpc::ClientContext* context, const flatbuffers::BufferRef<Monster>& request, flatbuffers::BufferRef<Stat>* response) {
+  return ::grpc::BlockingUnaryCall(channel_.get(), rpcmethod_Store_, context, request, response);
+}
+
+::grpc::ClientAsyncResponseReader< flatbuffers::BufferRef<Stat>>* MonsterStorage::Stub::AsyncStoreRaw(::grpc::ClientContext* context, const flatbuffers::BufferRef<Monster>& request, ::grpc::CompletionQueue* cq) {
+  return new ::grpc::ClientAsyncResponseReader< flatbuffers::BufferRef<Stat>>(channel_.get(), cq, rpcmethod_Store_, context, request);
+}
+
+::grpc::Status MonsterStorage::Stub::Retrieve(::grpc::ClientContext* context, const flatbuffers::BufferRef<Stat>& request, flatbuffers::BufferRef<Monster>* response) {
+  return ::grpc::BlockingUnaryCall(channel_.get(), rpcmethod_Retrieve_, context, request, response);
+}
+
+::grpc::ClientAsyncResponseReader< flatbuffers::BufferRef<Monster>>* MonsterStorage::Stub::AsyncRetrieveRaw(::grpc::ClientContext* context, const flatbuffers::BufferRef<Stat>& request, ::grpc::CompletionQueue* cq) {
+  return new ::grpc::ClientAsyncResponseReader< flatbuffers::BufferRef<Monster>>(channel_.get(), cq, rpcmethod_Retrieve_, context, request);
+}
+
+MonsterStorage::Service::Service() {
+  (void)MonsterStorage_method_names;
+  AddMethod(new ::grpc::RpcServiceMethod(
+      MonsterStorage_method_names[0],
+      ::grpc::RpcMethod::NORMAL_RPC,
+      new ::grpc::RpcMethodHandler< MonsterStorage::Service, flatbuffers::BufferRef<Monster>, flatbuffers::BufferRef<Stat>>(
+          std::mem_fn(&MonsterStorage::Service::Store), this)));
+  AddMethod(new ::grpc::RpcServiceMethod(
+      MonsterStorage_method_names[1],
+      ::grpc::RpcMethod::NORMAL_RPC,
+      new ::grpc::RpcMethodHandler< MonsterStorage::Service, flatbuffers::BufferRef<Stat>, flatbuffers::BufferRef<Monster>>(
+          std::mem_fn(&MonsterStorage::Service::Retrieve), this)));
+}
+
+MonsterStorage::Service::~Service() {
+}
+
+::grpc::Status MonsterStorage::Service::Store(::grpc::ServerContext* context, const flatbuffers::BufferRef<Monster>* request, flatbuffers::BufferRef<Stat>* response) {
+  (void) context;
+  (void) request;
+  (void) response;
+  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+}
+
+::grpc::Status MonsterStorage::Service::Retrieve(::grpc::ServerContext* context, const flatbuffers::BufferRef<Stat>* request, flatbuffers::BufferRef<Monster>* response) {
+  (void) context;
+  (void) request;
+  (void) response;
+  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+}
+
+
+}  // namespace MyGame
+}  // namespace Example
+
diff --git a/tests/monster_test.grpc.fb.h b/tests/monster_test.grpc.fb.h
new file mode 100644
index 000000000..4269234f3
--- /dev/null
+++ b/tests/monster_test.grpc.fb.h
@@ -0,0 +1,155 @@
+// Generated by the gRPC protobuf plugin.
+// If you make any local change, they will be lost.
+// source: monster_test
+#ifndef GRPC_monster_5ftest__INCLUDED
+#define GRPC_monster_5ftest__INCLUDED
+
+#include "monster_test_generated.h"
+
+#include <grpc++/impl/codegen/async_stream.h>
+#include <grpc++/impl/codegen/async_unary_call.h>
+#include <grpc++/impl/codegen/proto_utils.h>
+#include <grpc++/impl/codegen/rpc_method.h>
+#include <grpc++/impl/codegen/service_type.h>
+#include <grpc++/impl/codegen/status.h>
+#include <grpc++/impl/codegen/stub_options.h>
+#include <grpc++/impl/codegen/sync_stream.h>
+
+namespace grpc {
+class CompletionQueue;
+class Channel;
+class RpcService;
+class ServerCompletionQueue;
+class ServerContext;
+}  // namespace grpc
+
+namespace MyGame {
+namespace Example {
+
+class MonsterStorage GRPC_FINAL {
+ public:
+  class StubInterface {
+   public:
+    virtual ~StubInterface() {}
+    virtual ::grpc::Status Store(::grpc::ClientContext* context, const flatbuffers::BufferRef<Monster>& request, flatbuffers::BufferRef<Stat>* response) = 0;
+    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< flatbuffers::BufferRef<Stat>>> AsyncStore(::grpc::ClientContext* context, const flatbuffers::BufferRef<Monster>& request, ::grpc::CompletionQueue* cq) {
+      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< flatbuffers::BufferRef<Stat>>>(AsyncStoreRaw(context, request, cq));
+    }
+    virtual ::grpc::Status Retrieve(::grpc::ClientContext* context, const flatbuffers::BufferRef<Stat>& request, flatbuffers::BufferRef<Monster>* response) = 0;
+    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< flatbuffers::BufferRef<Monster>>> AsyncRetrieve(::grpc::ClientContext* context, const flatbuffers::BufferRef<Stat>& request, ::grpc::CompletionQueue* cq) {
+      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< flatbuffers::BufferRef<Monster>>>(AsyncRetrieveRaw(context, request, cq));
+    }
+  private:
+    virtual ::grpc::ClientAsyncResponseReaderInterface< flatbuffers::BufferRef<Stat>>* AsyncStoreRaw(::grpc::ClientContext* context, const flatbuffers::BufferRef<Monster>& request, ::grpc::CompletionQueue* cq) = 0;
+    virtual ::grpc::ClientAsyncResponseReaderInterface< flatbuffers::BufferRef<Monster>>* AsyncRetrieveRaw(::grpc::ClientContext* context, const flatbuffers::BufferRef<Stat>& request, ::grpc::CompletionQueue* cq) = 0;
+  };
+  class Stub GRPC_FINAL : public StubInterface {
+   public:
+    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel);
+    ::grpc::Status Store(::grpc::ClientContext* context, const flatbuffers::BufferRef<Monster>& request, flatbuffers::BufferRef<Stat>* response) GRPC_OVERRIDE;
+    std::unique_ptr< ::grpc::ClientAsyncResponseReader< flatbuffers::BufferRef<Stat>>> AsyncStore(::grpc::ClientContext* context, const flatbuffers::BufferRef<Monster>& request, ::grpc::CompletionQueue* cq) {
+      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< flatbuffers::BufferRef<Stat>>>(AsyncStoreRaw(context, request, cq));
+    }
+    ::grpc::Status Retrieve(::grpc::ClientContext* context, const flatbuffers::BufferRef<Stat>& request, flatbuffers::BufferRef<Monster>* response) GRPC_OVERRIDE;
+    std::unique_ptr< ::grpc::ClientAsyncResponseReader< flatbuffers::BufferRef<Monster>>> AsyncRetrieve(::grpc::ClientContext* context, const flatbuffers::BufferRef<Stat>& request, ::grpc::CompletionQueue* cq) {
+      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< flatbuffers::BufferRef<Monster>>>(AsyncRetrieveRaw(context, request, cq));
+    }
+  
+   private:
+    std::shared_ptr< ::grpc::ChannelInterface> channel_;
+    ::grpc::ClientAsyncResponseReader< flatbuffers::BufferRef<Stat>>* AsyncStoreRaw(::grpc::ClientContext* context, const flatbuffers::BufferRef<Monster>& request, ::grpc::CompletionQueue* cq) GRPC_OVERRIDE;
+    ::grpc::ClientAsyncResponseReader< flatbuffers::BufferRef<Monster>>* AsyncRetrieveRaw(::grpc::ClientContext* context, const flatbuffers::BufferRef<Stat>& request, ::grpc::CompletionQueue* cq) GRPC_OVERRIDE;
+    const ::grpc::RpcMethod rpcmethod_Store_;
+    const ::grpc::RpcMethod rpcmethod_Retrieve_;
+  };
+  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
+  
+  class Service : public ::grpc::Service {
+   public:
+    Service();
+    virtual ~Service();
+    virtual ::grpc::Status Store(::grpc::ServerContext* context, const flatbuffers::BufferRef<Monster>* request, flatbuffers::BufferRef<Stat>* response);
+    virtual ::grpc::Status Retrieve(::grpc::ServerContext* context, const flatbuffers::BufferRef<Stat>* request, flatbuffers::BufferRef<Monster>* response);
+  };
+  template <class BaseClass>
+  class WithAsyncMethod_Store : public BaseClass {
+   private:
+    void BaseClassMustBeDerivedFromService(const Service *service) {}
+   public:
+    WithAsyncMethod_Store() {
+      ::grpc::Service::MarkMethodAsync(0);
+    }
+    ~WithAsyncMethod_Store() GRPC_OVERRIDE {
+      BaseClassMustBeDerivedFromService(this);
+    }
+    // disable synchronous version of this method
+    ::grpc::Status Store(::grpc::ServerContext* context, const flatbuffers::BufferRef<Monster>* request, flatbuffers::BufferRef<Stat>* response) GRPC_FINAL GRPC_OVERRIDE {
+      abort();
+      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+    }
+    void RequestStore(::grpc::ServerContext* context, flatbuffers::BufferRef<Monster>* request, ::grpc::ServerAsyncResponseWriter< flatbuffers::BufferRef<Stat>>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
+      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
+    }
+  };
+  template <class BaseClass>
+  class WithAsyncMethod_Retrieve : public BaseClass {
+   private:
+    void BaseClassMustBeDerivedFromService(const Service *service) {}
+   public:
+    WithAsyncMethod_Retrieve() {
+      ::grpc::Service::MarkMethodAsync(1);
+    }
+    ~WithAsyncMethod_Retrieve() GRPC_OVERRIDE {
+      BaseClassMustBeDerivedFromService(this);
+    }
+    // disable synchronous version of this method
+    ::grpc::Status Retrieve(::grpc::ServerContext* context, const flatbuffers::BufferRef<Stat>* request, flatbuffers::BufferRef<Monster>* response) GRPC_FINAL GRPC_OVERRIDE {
+      abort();
+      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+    }
+    void RequestRetrieve(::grpc::ServerContext* context, flatbuffers::BufferRef<Stat>* request, ::grpc::ServerAsyncResponseWriter< flatbuffers::BufferRef<Monster>>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
+      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
+    }
+  };
+  typedef   WithAsyncMethod_Store<  WithAsyncMethod_Retrieve<  Service   >   >   AsyncService;
+  template <class BaseClass>
+  class WithGenericMethod_Store : public BaseClass {
+   private:
+    void BaseClassMustBeDerivedFromService(const Service *service) {}
+   public:
+    WithGenericMethod_Store() {
+      ::grpc::Service::MarkMethodGeneric(0);
+    }
+    ~WithGenericMethod_Store() GRPC_OVERRIDE {
+      BaseClassMustBeDerivedFromService(this);
+    }
+    // disable synchronous version of this method
+    ::grpc::Status Store(::grpc::ServerContext* context, const flatbuffers::BufferRef<Monster>* request, flatbuffers::BufferRef<Stat>* response) GRPC_FINAL GRPC_OVERRIDE {
+      abort();
+      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+    }
+  };
+  template <class BaseClass>
+  class WithGenericMethod_Retrieve : public BaseClass {
+   private:
+    void BaseClassMustBeDerivedFromService(const Service *service) {}
+   public:
+    WithGenericMethod_Retrieve() {
+      ::grpc::Service::MarkMethodGeneric(1);
+    }
+    ~WithGenericMethod_Retrieve() GRPC_OVERRIDE {
+      BaseClassMustBeDerivedFromService(this);
+    }
+    // disable synchronous version of this method
+    ::grpc::Status Retrieve(::grpc::ServerContext* context, const flatbuffers::BufferRef<Stat>* request, flatbuffers::BufferRef<Monster>* response) GRPC_FINAL GRPC_OVERRIDE {
+      abort();
+      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+    }
+  };
+};
+
+}  // namespace Example
+}  // namespace MyGame
+
+
+#endif  // GRPC_monster_5ftest__INCLUDED