enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

eolian cxx: remove usages of obsolete file_get APIs

This commit is contained in:
Daniel Kolesa 2018-03-08 22:53:51 +01:00
parent 10448fec97
commit 1117a67818
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/eolian_cxx/eolian_cxx.cc
View File

@ -68,7 +68,7 @@ generate(const Eolian_Class* klass, eolian_cxx::options_type const& opts,
std::string const& cpp_types_header)
{
std::string header_decl_file_name = opts.out_file.empty()
? (::eolian_class_file_get(klass) + std::string(".hh")) : opts.out_file;
? (::eolian_object_file_get((const Eolian_Object *)klass) + std::string(".hh")) : opts.out_file;
std::string header_impl_file_name = header_decl_file_name;
std::size_t dot_pos = header_impl_file_name.rfind(".hh");
@ -83,7 +83,7 @@ generate(const Eolian_Class* klass, eolian_cxx::options_type const& opts,
std::set<std::string> c_headers;
std::set<std::string> cpp_headers;
c_headers.insert(eolian_class_file_get(klass) + std::string(".h"));
c_headers.insert(eolian_object_file_get((const Eolian_Object *)klass) + std::string(".h"));
std::function<void(efl::eolian::grammar::attributes::type_def const&)>
variant_function;
@ -92,8 +92,8 @@ generate(const Eolian_Class* klass, eolian_cxx::options_type const& opts,
{
Eolian_Class const* klass2 = get_klass(name, opts.unit);
assert(klass2);
c_headers.insert(eolian_class_file_get(klass2) + std::string(".h"));
cpp_headers.insert(eolian_class_file_get(klass2) + std::string(".hh"));
c_headers.insert(eolian_object_file_get((const Eolian_Object *)klass2) + std::string(".h"));
cpp_headers.insert(eolian_object_file_get((const Eolian_Object *)klass2) + std::string(".hh"));
efl::eolian::grammar::attributes::klass_def cls{klass2, opts.unit};
forward_klasses.insert(cls);
};
@ -124,8 +124,8 @@ generate(const Eolian_Class* klass, eolian_cxx::options_type const& opts,
, inherit_last; inherit_iterator != inherit_last; ++inherit_iterator)
{
Eolian_Class const* inherit = &*inherit_iterator;
c_headers.insert(eolian_class_file_get(inherit) + std::string(".h"));
cpp_headers.insert(eolian_class_file_get(inherit) + std::string(".hh"));
c_headers.insert(eolian_object_file_get((const Eolian_Object *)inherit) + std::string(".h"));
cpp_headers.insert(eolian_object_file_get((const Eolian_Object *)inherit) + std::string(".hh"));
efl::eolian::grammar::attributes::klass_def klass3{inherit, opts.unit};
forward_klasses.insert(klass3);
@ -157,7 +157,7 @@ generate(const Eolian_Class* klass, eolian_cxx::options_type const& opts,
forward_klasses.insert(part_klass);
}
cpp_headers.erase(eolian_class_file_get(klass) + std::string(".hh"));
cpp_headers.erase(eolian_object_file_get((const Eolian_Object *)klass) + std::string(".hh"));
std::string guard_name;
as_generator(*(efl::eolian::grammar::string << "_") << efl::eolian::grammar::string << "_EO_HH")
@ -321,7 +321,7 @@ run(options_type const& opts)
free(dup);
if (klass)
{
std::string filename = eolian_class_file_get(klass);
std::string filename = eolian_object_file_get((const Eolian_Object *)klass);
headers.insert(filename + std::string(".hh"));
eo_files.insert(filename);
}

2
src/lib/eolian_cxx/grammar/implementation_include_directive.hpp
View File

@ -20,7 +20,7 @@ struct implementation_include_directive_generator
bool generate(OutputIterator sink, attributes::klass_def const& cls, Context const& ctx) const
{
return as_generator("#include \"" << string << ".impl.hh\"\n")
.generate(sink, std::string(eolian_class_file_get(get_klass(get_klass_name(cls, unit_from_context(ctx))))), add_lower_case_context(ctx));
.generate(sink, std::string(eolian_object_file_get((const Eolian_Object *)get_klass(get_klass_name(cls, unit_from_context(ctx))))), add_lower_case_context(ctx));
}
template <typename OutputIterator, typename Context>
bool generate(OutputIterator sink, std::string const& cls, Context const& ctx) const

4
src/lib/eolian_cxx/grammar/klass_def.hpp
View File

@ -634,7 +634,7 @@ struct function_def
if (type != EOLIAN_FUNCTION_POINTER)
{
const Eolian_Class *klass = eolian_function_class_get(function);
filename = eolian_class_file_get(klass);
filename = eolian_object_file_get((const Eolian_Object *)klass);
}
else
{
@ -941,7 +941,7 @@ struct klass_def
this->namespaces.push_back(&*namespace_iterator);
}
cxx_name = eolian_name = eolian_class_name_get(klass);
filename = eolian_class_file_get(klass);
filename = eolian_object_file_get((const Eolian_Object *)klass);
for(efl::eina::iterator<Eolian_Function const> eolian_functions ( ::eolian_class_functions_get(klass, EOLIAN_PROPERTY))
, functions_last; eolian_functions != functions_last; ++eolian_functions)
{