zmike pushed a commit to branch efl-1.22. http://git.enlightenment.org/core/efl.git/commit/?id=beb45a4c151e618ad96270212fdd36122ee79728
commit beb45a4c151e618ad96270212fdd36122ee79728 Author: Lauro Moura <[email protected]> Date: Mon Apr 22 17:53:30 2019 -0300 csharp: Simple spacing rules changes Summary: Also do not generated empty tag if doc would be empty. Reviewers: vitor.sousa, segfaultxavi Reviewed By: vitor.sousa, segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8612 --- src/bin/eolian_mono/eolian/mono/alias_definition.hh | 9 +++++---- src/bin/eolian_mono/eolian/mono/async_function_definition.hh | 4 ++-- src/bin/eolian_mono/eolian/mono/documentation.hh | 5 ++++- src/bin/eolian_mono/eolian/mono/enum_definition.hh | 2 +- src/bin/eolian_mono/eolian/mono/name_helpers.hh | 4 ++-- src/bin/eolian_mono/eolian/mono/variable_definition.hh | 2 +- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/bin/eolian_mono/eolian/mono/alias_definition.hh b/src/bin/eolian_mono/eolian/mono/alias_definition.hh index cf9d3495ce..f9c7f435ca 100644 --- a/src/bin/eolian_mono/eolian/mono/alias_definition.hh +++ b/src/bin/eolian_mono/eolian/mono/alias_definition.hh @@ -35,17 +35,18 @@ struct alias_definition_generator std::string const alias_name = utils::remove_all(alias.eolian_name, '_'); if (!as_generator( - "public struct " << alias_name << " {\n" + "public struct " << alias_name << "\n" + << "{\n" << scope_tab << "private " << type << " payload;\n" << scope_tab << "public static implicit operator " << alias_name << "(" << type << " x)\n" << scope_tab << "{\n" << scope_tab << scope_tab << "return new " << alias_name << "{payload=x};\n" - << scope_tab << "}\n" + << scope_tab << "}\n\n" << scope_tab << "public static implicit operator " << type << "(" << alias_name << " x)\n" << scope_tab << "{\n" << scope_tab << scope_tab << "return x.payload;\n" - << scope_tab << "}\n" - << "}\n" + << scope_tab << "}\n\n" + << "}\n\n" ).generate(sink, std::make_tuple(alias.base_type, alias.base_type, alias.base_type), context)) return false; diff --git a/src/bin/eolian_mono/eolian/mono/async_function_definition.hh b/src/bin/eolian_mono/eolian/mono/async_function_definition.hh index 5164311ee7..f6a3ff5dc2 100644 --- a/src/bin/eolian_mono/eolian/mono/async_function_definition.hh +++ b/src/bin/eolian_mono/eolian/mono/async_function_definition.hh @@ -55,7 +55,7 @@ struct async_function_declaration_generator if (!as_generator( scope_tab << "System.Threading.Tasks.Task<Eina.Value> " << name_helpers::managed_async_method_name(f) << "(" << *(parameter << ",") << - " System.Threading.CancellationToken token=default(System.Threading.CancellationToken));\n" + " System.Threading.CancellationToken token = default(System.Threading.CancellationToken));\n" ).generate(sink, f.parameters, context)) return false; @@ -89,7 +89,7 @@ struct async_function_definition_generator std::transform(f.parameters.begin(), f.parameters.end(), std::back_inserter(param_forwarding), parameter_forwarding); if(!as_generator( - scope_tab << "public System.Threading.Tasks.Task<Eina.Value> " << name_helpers::managed_async_method_name(f) << "(" << *(parameter << ",") << " System.Threading.CancellationToken token=default(System.Threading.CancellationToken))\n" + scope_tab << "public System.Threading.Tasks.Task<Eina.Value> " << name_helpers::managed_async_method_name(f) << "(" << *(parameter << ",") << " System.Threading.CancellationToken token = default(System.Threading.CancellationToken))\n" << scope_tab << "{\n" << scope_tab << scope_tab << "Eina.Future future = " << name_helpers::managed_method_name(f) << "(" << (string % ",") << ");\n" << scope_tab << scope_tab << "return Efl.Eo.Globals.WrapAsync(future, token);\n" diff --git a/src/bin/eolian_mono/eolian/mono/documentation.hh b/src/bin/eolian_mono/eolian/mono/documentation.hh index 9646fd314f..2cad038e25 100644 --- a/src/bin/eolian_mono/eolian/mono/documentation.hh +++ b/src/bin/eolian_mono/eolian/mono/documentation.hh @@ -285,6 +285,9 @@ struct documentation_generator template<typename OutputIterator, typename Context> bool generate_tag(OutputIterator sink, std::string const& tag, std::string const &text, Context const& context, std::string tag_params = "") const { + if (text == "") + return true; + if (!as_generator(scope_tab(scope_size) << "/// ").generate(sink, attributes::unused, context)) return false; if (!generate_opening_tag(sink, tag, context, tag_params)) return false; if (!generate_escaped_content(sink, text, context)) return false; @@ -485,7 +488,7 @@ struct documentation_generator for (auto &¶m : ctor.function.parameters) { if (!as_generator( - scope_tab << "///<param name=\"" << constructor_parameter_name(ctor) << "\">" << summary << " See <see cref=\"" << function_conversion(func) << "\"/></param>\n" + scope_tab << "/// <param name=\"" << constructor_parameter_name(ctor) << "\">" << summary << " See <see cref=\"" << function_conversion(func) << "\"/></param>\n" ).generate(sink, param, context)) return false; } diff --git a/src/bin/eolian_mono/eolian/mono/enum_definition.hh b/src/bin/eolian_mono/eolian/mono/enum_definition.hh index 78af78af2c..922463936e 100644 --- a/src/bin/eolian_mono/eolian/mono/enum_definition.hh +++ b/src/bin/eolian_mono/eolian/mono/enum_definition.hh @@ -44,7 +44,7 @@ struct enum_definition_generator return false; } - if(!as_generator("}\n").generate(sink, attributes::unused, context)) return false; + if(!as_generator("}\n\n").generate(sink, attributes::unused, context)) return false; if(!name_helpers::close_namespaces(sink, enum_.namespaces, context)) return false; diff --git a/src/bin/eolian_mono/eolian/mono/name_helpers.hh b/src/bin/eolian_mono/eolian/mono/name_helpers.hh index 6e913556a2..858ab59a89 100644 --- a/src/bin/eolian_mono/eolian/mono/name_helpers.hh +++ b/src/bin/eolian_mono/eolian/mono/name_helpers.hh @@ -465,14 +465,14 @@ bool open_namespaces(OutputIterator sink, std::vector<std::string> namespaces, C { std::transform(namespaces.begin(), namespaces.end(), namespaces.begin(), managed_namespace); - auto open_namespace = *("namespace " << string << " { ") << "\n"; + auto open_namespace = *("namespace " << string << " {\n\n"); return as_generator(open_namespace).generate(sink, namespaces, context); } template<typename OutputIterator, typename Context> bool close_namespaces(OutputIterator sink, std::vector<std::string> const& namespaces, Context const& context) { - auto close_namespace = *(lit("} ")) << "\n"; + auto close_namespace = (lit("}") % "\n\n" ) << "\n\n"; return as_generator(close_namespace).generate(sink, namespaces, context); } diff --git a/src/bin/eolian_mono/eolian/mono/variable_definition.hh b/src/bin/eolian_mono/eolian/mono/variable_definition.hh index f13efdecc2..29211d079a 100644 --- a/src/bin/eolian_mono/eolian/mono/variable_definition.hh +++ b/src/bin/eolian_mono/eolian/mono/variable_definition.hh @@ -34,7 +34,7 @@ struct constant_definition_generator if (!name_helpers::open_namespaces(sink, constant.namespaces, context)) return false; - if (!as_generator("public partial class Constants {\n").generate(sink, attributes::unused, context)) + if (!as_generator("public partial class Constants\n{\n").generate(sink, attributes::unused, context)) return false; std::string literal; --
