From 0f812f15847e9127b19e9711f9cb1dd26d938f0a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Mon, 27 Nov 2017 23:54:43 +0900 Subject: [PATCH] cxx: Fix indentation of ifdef guard --- src/lib/eolian_cxx/grammar/base_class_definition.hpp | 4 ++-- src/lib/eolian_cxx/grammar/class_definition.hpp | 2 +- src/lib/eolian_cxx/grammar/function_declaration.hpp | 2 +- src/lib/eolian_cxx/grammar/part_declaration.hpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/eolian_cxx/grammar/base_class_definition.hpp b/src/lib/eolian_cxx/grammar/base_class_definition.hpp index edc6afb..f8a704d 100644 --- a/src/lib/eolian_cxx/grammar/base_class_definition.hpp +++ b/src/lib/eolian_cxx/grammar/base_class_definition.hpp @@ -34,10 +34,10 @@ struct base_class_definition_generator "struct " << string << " {\n" ).generate(sink, cls.cxx_name, context)) return false; - if(!as_generator(*(scope_tab << function_declaration(get_klass_name(cls)))) + if(!as_generator(*(function_declaration(get_klass_name(cls)))) .generate(sink, cls.functions, context)) return false; - if(!as_generator(*(scope_tab << part_declaration << ";\n")) + if(!as_generator(*(part_declaration << ";\n")) .generate(sink, cls.parts, context)) return false; // static Efl_Class const* _eo_class(); diff --git a/src/lib/eolian_cxx/grammar/class_definition.hpp b/src/lib/eolian_cxx/grammar/class_definition.hpp index 7367cf7..e7bfaba 100644 --- a/src/lib/eolian_cxx/grammar/class_definition.hpp +++ b/src/lib/eolian_cxx/grammar/class_definition.hpp @@ -97,7 +97,7 @@ struct class_definition_generator ).generate(sink, attributes::make_infinite_tuple(cls.cxx_name), context)) return false; #ifndef USE_EOCXX_INHERIT_ONLY - if(!as_generator(*(scope_tab << function_declaration(get_klass_name(cls)))) + if(!as_generator(*(function_declaration(get_klass_name(cls)))) .generate(sink, cls.functions, context)) return false; #endif diff --git a/src/lib/eolian_cxx/grammar/function_declaration.hpp b/src/lib/eolian_cxx/grammar/function_declaration.hpp index 641ae65..04694fa 100644 --- a/src/lib/eolian_cxx/grammar/function_declaration.hpp +++ b/src/lib/eolian_cxx/grammar/function_declaration.hpp @@ -51,7 +51,7 @@ struct function_declaration_generator return false; if(!as_generator - ("::efl::eolian::return_traits<" << grammar::type(true) << ">::type " << string << "(" << (parameter % ", ") << ") const;\n") + (scope_tab << "::efl::eolian::return_traits<" << grammar::type(true) << ">::type " << string << "(" << (parameter % ", ") << ") const;\n") .generate(sink, std::make_tuple(f.return_type, escape_keyword(f.name), f.parameters), ctx)) return false; if(f.is_beta && diff --git a/src/lib/eolian_cxx/grammar/part_declaration.hpp b/src/lib/eolian_cxx/grammar/part_declaration.hpp index 383403c..04258c4 100644 --- a/src/lib/eolian_cxx/grammar/part_declaration.hpp +++ b/src/lib/eolian_cxx/grammar/part_declaration.hpp @@ -18,7 +18,7 @@ struct part_declaration_generator template bool generate(OutputIterator sink, attributes::part_def const& part, Context const& ctx) const { - if(!as_generator("::efl::eolian::return_traits<::" << *(string << "::")) + if(!as_generator(scope_tab << "::efl::eolian::return_traits<::" << *(string << "::")) .generate(sink, part.klass.namespaces, add_lower_case_context(ctx))) return false; if(!as_generator(string << ">::type " << string << "() const") -- 2.7.4