Merge pull request #3885 from Lakedaemon/shareWarningAndTwoMethods

Share warning and two methods

include/flatbuffers/code_generators.h

@@ -21,14 +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() {
+    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) {
@@ -41,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

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); }

src/idl_gen_cpp.cpp

@@ -747,9 +747,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_;

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)) return false;
       }
     }
 
@@ -1180,18 +1144,35 @@ 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)) 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);
     }
     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) {
+    if (!classcode.length()) return true;
+
+    std::string code;
+    code = code + "// " + FlatBuffersGeneratedWarning();
+    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_name.empty()) code += lang.namespace_end;
+    auto filename = namespace_dir_ + defname + lang.file_extension;
+    return SaveFile(filename.c_str(), code, false);
+  }
 };
 }  // namespace general
 
@@ -1201,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;

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,44 @@ 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 code = "";
+    BeginFile(LastNamespacePart(), needs_imports, &code);
+    code += classcode;
+    std::string filename = namespace_dir_ + def.name + ".go";
+    return SaveFile(filename.c_str(), code, false);
+  }
 };
 }  // namespace go
 

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);

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,41 @@ 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 code = "";
+        BeginFile(FullNamespace("\\"), needs_imports, &code);
+        code += classcode;
+
+        std::string filename =
+            namespace_dir_ + kPathSeparator + def.name + ".php";
+        return SaveFile(filename.c_str(), code, false);
+      }
     };
     }  // namespace php
 

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,42 @@ 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_dir = path_;
+    auto &namespaces = parser_.namespaces_.back()->components;
+    for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
+      if (it != namespaces.begin()) namespace_dir += kPathSeparator;
+      namespace_dir += *it;
+      std::string init_py_filename = namespace_dir + "/__init__.py";
+      SaveFile(init_py_filename.c_str(), "", false);
+    }
+
+    std::string code = "";
+    BeginFile(LastNamespacePart(), needs_imports, &code);
+    code += classcode;
+    std::string filename = namespace_dir_ + kPathSeparator + def.name + ".py";
+    return SaveFile(filename.c_str(), code, false);
+  }
 };
 
 }  // namespace python

tests/MyGame/Example/Any.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {

tests/MyGame/Example/Any.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 

tests/MyGame/Example/Any.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 

tests/MyGame/Example/Any.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 

tests/MyGame/Example/Any.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 

tests/MyGame/Example/Color.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {

tests/MyGame/Example/Color.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 

tests/MyGame/Example/Color.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 

tests/MyGame/Example/Color.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 

tests/MyGame/Example/Color.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 

tests/MyGame/Example/Monster.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {

tests/MyGame/Example/Monster.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 

tests/MyGame/Example/Monster.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 

tests/MyGame/Example/Monster.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 

tests/MyGame/Example/Monster.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 

tests/MyGame/Example/Stat.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {

tests/MyGame/Example/Stat.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 

tests/MyGame/Example/Stat.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 

tests/MyGame/Example/Stat.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 

tests/MyGame/Example/Stat.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 

tests/MyGame/Example/Test.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {

tests/MyGame/Example/Test.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 

tests/MyGame/Example/Test.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 

tests/MyGame/Example/Test.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 

tests/MyGame/Example/Test.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 

tests/MyGame/Example/TestSimpleTableWithEnum.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {

tests/MyGame/Example/TestSimpleTableWithEnum.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 

tests/MyGame/Example/TestSimpleTableWithEnum.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 

tests/MyGame/Example/TestSimpleTableWithEnum.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 

tests/MyGame/Example/TestSimpleTableWithEnum.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 

tests/MyGame/Example/Vec3.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {

tests/MyGame/Example/Vec3.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 

tests/MyGame/Example/Vec3.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 

tests/MyGame/Example/Vec3.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 

tests/MyGame/Example/Vec3.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 

tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA.NamespaceB
 {

tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceB
 

tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA.NamespaceB;
 

tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA\NamespaceB;
 

tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceB
 

tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA.NamespaceB
 {

tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceB
 

tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA.NamespaceB;
 

tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA\NamespaceB;
 

tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceB
 

tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA.NamespaceB
 {

tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceB
 

tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA.NamespaceB;
 

tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA\NamespaceB;
 

tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceB
 

tests/namespace_test/NamespaceA/SecondTableInA.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA
 {

tests/namespace_test/NamespaceA/SecondTableInA.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA
 

tests/namespace_test/NamespaceA/SecondTableInA.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA;
 

tests/namespace_test/NamespaceA/SecondTableInA.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA;
 

tests/namespace_test/NamespaceA/SecondTableInA.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceA
 

tests/namespace_test/NamespaceA/TableInC.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA
 {

tests/namespace_test/NamespaceA/TableInC.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA
 

tests/namespace_test/NamespaceA/TableInC.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA;
 

tests/namespace_test/NamespaceA/TableInC.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA;
 

tests/namespace_test/NamespaceA/TableInC.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceA
 

tests/namespace_test/NamespaceA/TableInFirstNS.cs

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA
 {

tests/namespace_test/NamespaceA/TableInFirstNS.go

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA
 

tests/namespace_test/NamespaceA/TableInFirstNS.java

-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA;
 

tests/namespace_test/NamespaceA/TableInFirstNS.php

 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA;
 

tests/namespace_test/NamespaceA/TableInFirstNS.py

-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceA