Delete IDLOptions::lang (#6841)

Co-authored-by: Casper Neo <cneo@google.com>

include/flatbuffers/idl.h

@@ -616,8 +616,6 @@ struct IDLOptions {
     kMAX
   };
 
-  Language lang;
-
   enum MiniReflect { kNone, kTypes, kTypesAndNames };
 
   MiniReflect mini_reflect;
@@ -681,7 +679,6 @@ struct IDLOptions {
         filename_extension(),
         no_warnings(false),
         project_root(""),
-        lang(IDLOptions::kJava),
         mini_reflect(IDLOptions::kNone),
         require_explicit_ids(false),
         lang_to_generate(0),
@@ -1162,9 +1159,10 @@ extern std::string RustMakeRule(const Parser &parser, const std::string &path,
 
 // Generate a make rule for generated Java or C# files.
 // See code_generators.cpp.
-extern std::string JavaCSharpMakeRule(const Parser &parser,
+extern std::string CSharpMakeRule(const Parser &parser, const std::string &path,
-                                      const std::string &path,
+                                  const std::string &file_name);
-                                      const std::string &file_name);
+extern std::string JavaMakeRule(const Parser &parser, const std::string &path,
+                                const std::string &file_name);
 
 // Generate a make rule for the generated text (JSON) files.
 // See idl_gen_text.cpp.

src/code_generators.cpp

@@ -314,14 +314,10 @@ std::string SimpleFloatConstantGenerator::NaN(float v) const {
   return this->NaN(static_cast<double>(v));
 }
 
-std::string JavaCSharpMakeRule(const Parser &parser, const std::string &path,
+std::string JavaCSharpMakeRule(const bool java, const Parser &parser,
+                               const std::string &path,
                                const std::string &file_name) {
-  FLATBUFFERS_ASSERT(parser.opts.lang == IDLOptions::kJava ||
+  const std::string file_extension = java ? ".java" : ".cs";
-                     parser.opts.lang == IDLOptions::kCSharp);
-
-  std::string file_extension =
-      (parser.opts.lang == IDLOptions::kJava) ? ".java" : ".cs";
-
   std::string make_rule;
 
   for (auto it = parser.enums_.vec.begin(); it != parser.enums_.vec.end();
@@ -350,6 +346,15 @@ std::string JavaCSharpMakeRule(const Parser &parser, const std::string &path,
   return make_rule;
 }
 
+std::string JavaMakeRule(const Parser &parser, const std::string &path,
+                         const std::string &file_name) {
+  return JavaCSharpMakeRule(true, parser, path, file_name);
+}
+std::string CSharpMakeRule(const Parser &parser, const std::string &path,
+                           const std::string &file_name) {
+  return JavaCSharpMakeRule(false, parser, path, file_name);
+}
+
 std::string BinaryFileName(const Parser &parser, const std::string &path,
                            const std::string &file_name) {
   auto ext = parser.file_extension_.length() ? parser.file_extension_ : "bin";

src/flatc.cpp

@@ -527,7 +527,6 @@ int FlatCompiler::Compile(int argc, const char **argv) {
         flatbuffers::StripPath(flatbuffers::StripExtension(filename));
 
     for (size_t i = 0; i < params_.num_generators; ++i) {
-      parser->opts.lang = params_.generators[i].lang;
       if (generator_enabled[i]) {
         if (!print_make_rules) {
           flatbuffers::EnsureDirExists(output_path);

src/flatc_main.cpp

@@ -69,8 +69,7 @@ int main(int argc, const char *argv[]) {
       "Generate Go files for tables/structs", nullptr },
     { flatbuffers::GenerateJava, "-j", "--java", "Java", true,
       flatbuffers::GenerateJavaGRPC, flatbuffers::IDLOptions::kJava,
-      "Generate Java classes for tables/structs",
+      "Generate Java classes for tables/structs", flatbuffers::JavaMakeRule },
-      flatbuffers::JavaCSharpMakeRule },
     { flatbuffers::GenerateDart, "-d", "--dart", "Dart", true, nullptr,
       flatbuffers::IDLOptions::kDart,
       "Generate Dart classes for tables/structs", flatbuffers::DartMakeRule },
@@ -79,8 +78,7 @@ int main(int argc, const char *argv[]) {
       "Generate TypeScript code for tables/structs", flatbuffers::TSMakeRule },
     { flatbuffers::GenerateCSharp, "-n", "--csharp", "C#", true, nullptr,
       flatbuffers::IDLOptions::kCSharp,
-      "Generate C# classes for tables/structs",
+      "Generate C# classes for tables/structs", flatbuffers::CSharpMakeRule },
-      flatbuffers::JavaCSharpMakeRule },
     { flatbuffers::GeneratePython, "-p", "--python", "Python", true,
       flatbuffers::GeneratePythonGRPC, flatbuffers::IDLOptions::kPython,
       "Generate Python files for tables/structs", nullptr },

src/idl_gen_dart.cpp

@@ -1122,8 +1122,6 @@ bool GenerateDart(const Parser &parser, const std::string &path,
 
 std::string DartMakeRule(const Parser &parser, const std::string &path,
                          const std::string &file_name) {
-  assert(parser.opts.lang <= IDLOptions::kMAX);
-
   auto filebase =
       flatbuffers::StripPath(flatbuffers::StripExtension(file_name));
   dart::DartGenerator generator(parser, path, file_name);

src/idl_gen_ts.cpp

@@ -1602,8 +1602,6 @@ bool GenerateTS(const Parser &parser, const std::string &path,
 
 std::string TSMakeRule(const Parser &parser, const std::string &path,
                        const std::string &file_name) {
-  FLATBUFFERS_ASSERT(parser.opts.lang <= IDLOptions::kMAX);
-
   std::string filebase =
       flatbuffers::StripPath(flatbuffers::StripExtension(file_name));
   ts::TsGenerator generator(parser, path, file_name);