From ba8cd06646e82029b5144b7c3c75c06fe2ea41da Mon Sep 17 00:00:00 2001 From: Todd Hansen Date: Wed, 11 Aug 2021 09:07:32 -0500 Subject: [PATCH] Make CSharp use the command line parameter for file name extension and suffix --- src/idl_gen_csharp.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/idl_gen_csharp.cpp b/src/idl_gen_csharp.cpp index b0fc81b01..535546d03 100644 --- a/src/idl_gen_csharp.cpp +++ b/src/idl_gen_csharp.cpp @@ -65,7 +65,7 @@ class CSharpGenerator : public BaseGenerator { one_file_code += enumcode; } else { if (!SaveType(enum_def.name, *enum_def.defined_namespace, enumcode, - false)) + false, parser_.opts)) return false; } } @@ -81,14 +81,14 @@ class CSharpGenerator : public BaseGenerator { one_file_code += declcode; } else { if (!SaveType(struct_def.name, *struct_def.defined_namespace, declcode, - true)) + true, parser_.opts)) return false; } } if (parser_.opts.one_file) { return SaveType(file_name_, *parser_.current_namespace_, one_file_code, - true); + true, parser_.opts); } return true; } @@ -96,7 +96,8 @@ class CSharpGenerator : public BaseGenerator { // Save out the generated code for a single class while adding // declaration boilerplate. bool SaveType(const std::string &defname, const Namespace &ns, - const std::string &classcode, bool needs_includes) const { + const std::string &classcode, bool needs_includes, + const IDLOptions &options) const { if (!classcode.length()) return true; std::string code = @@ -117,7 +118,7 @@ class CSharpGenerator : public BaseGenerator { } code += classcode; if (!namespace_name.empty()) { code += "\n}\n"; } - auto filename = NamespaceDir(ns) + defname + ".cs"; + auto filename = GeneratedFileName(NamespaceDir(ns), defname, options); return SaveFile(filename.c_str(), code, false); }