summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/eolian_cxx/eolian_cxx.cc4
-rw-r--r--src/bin/eolian_mono/eolian/mono/parameter.hh2
-rw-r--r--src/bin/eolian_mono/eolian/mono/type_impl.hh2
-rw-r--r--src/bin/eolian_mono/eolian_mono.cc8
-rw-r--r--src/lib/eolian_cxx/grammar/klass_def.hpp2
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_documentation.cc6
6 files changed, 12 insertions, 12 deletions
diff --git a/src/bin/eolian_cxx/eolian_cxx.cc b/src/bin/eolian_cxx/eolian_cxx.cc
index 02a6fd7192..eaaec797ae 100644
--- a/src/bin/eolian_cxx/eolian_cxx.cc
+++ b/src/bin/eolian_cxx/eolian_cxx.cc
@@ -279,7 +279,7 @@ run(options_type const& opts)
279 char* base = basename(dup); 279 char* base = basename(dup);
280 std::string cpp_types_header; 280 std::string cpp_types_header;
281 opts.unit = (Eolian_Unit*)opts.state; 281 opts.unit = (Eolian_Unit*)opts.state;
282 klass = ::eolian_class_get_by_file(opts.unit, base); 282 klass = ::eolian_state_class_by_file_get(opts.state, base);
283 free(dup); 283 free(dup);
284 if (klass) 284 if (klass)
285 { 285 {
@@ -317,7 +317,7 @@ run(options_type const& opts)
317 } 317 }
318 char* dup = strdup(name.c_str()); 318 char* dup = strdup(name.c_str());
319 char* base = basename(dup); 319 char* base = basename(dup);
320 Eolian_Class const* klass = ::eolian_class_get_by_file(unit, base); 320 Eolian_Class const* klass = ::eolian_state_class_by_file_get(opts.state, base);
321 free(dup); 321 free(dup);
322 if (klass) 322 if (klass)
323 { 323 {
diff --git a/src/bin/eolian_mono/eolian/mono/parameter.hh b/src/bin/eolian_mono/eolian/mono/parameter.hh
index 834ca1248d..d836124fe0 100644
--- a/src/bin/eolian_mono/eolian/mono/parameter.hh
+++ b/src/bin/eolian_mono/eolian/mono/parameter.hh
@@ -1277,7 +1277,7 @@ struct native_convert_function_pointer_generator
1277 // Getting the type through C api 1277 // Getting the type through C api
1278 std::string type_name = param.type.original_type.visit(type_name_visitor{}); 1278 std::string type_name = param.type.original_type.visit(type_name_visitor{});
1279 1279
1280 const Eolian_Typedecl *tpd = ::eolian_typedecl_alias_get_by_name(param.unit, type_name.c_str()); 1280 const Eolian_Typedecl *tpd = ::eolian_unit_alias_by_name_get(param.unit, type_name.c_str());
1281 if (!tpd) 1281 if (!tpd)
1282 { 1282 {
1283 EINA_LOG_ERR("Failed to get typedecl for c type [%s]", param.type.c_type.c_str()); 1283 EINA_LOG_ERR("Failed to get typedecl for c type [%s]", param.type.c_type.c_str());
diff --git a/src/bin/eolian_mono/eolian/mono/type_impl.hh b/src/bin/eolian_mono/eolian/mono/type_impl.hh
index 9b56805b99..dac1ea152e 100644
--- a/src/bin/eolian_mono/eolian/mono/type_impl.hh
+++ b/src/bin/eolian_mono/eolian/mono/type_impl.hh
@@ -229,7 +229,7 @@ struct visitor_generate
229 // else 229 // else
230 // return false; 230 // return false;
231 // } 231 // }
232 // else if(Eolian_Typedecl const* typedecl = eolian_typedecl_struct_get_by_name(c_type.c_str())) 232 // else if(Eolian_Typedecl const* typedecl = eolian_state_struct_by_name_get(c_type.c_str()))
233 // { 233 // {
234 // return as_generator 234 // return as_generator
235 // ( 235 // (
diff --git a/src/bin/eolian_mono/eolian_mono.cc b/src/bin/eolian_mono/eolian_mono.cc
index e2b0355530..f7f2781a6b 100644
--- a/src/bin/eolian_mono/eolian_mono.cc
+++ b/src/bin/eolian_mono/eolian_mono.cc
@@ -99,8 +99,8 @@ run(options_type const& opts)
99 const Eolian_Typedecl *tp = NULL; 99 const Eolian_Typedecl *tp = NULL;
100 char* dup = strdup(opts.in_file.c_str()); 100 char* dup = strdup(opts.in_file.c_str());
101 std::string basename_input = basename(dup); 101 std::string basename_input = basename(dup);
102 klass = ::eolian_class_get_by_file(opts.unit, basename_input.c_str()); 102 klass = ::eolian_state_class_by_file_get(opts.state, basename_input.c_str());
103 aliases= ::eolian_typedecl_aliases_get_by_file(opts.unit, basename_input.c_str()); 103 aliases= ::eolian_state_aliases_by_file_get(opts.state, basename_input.c_str());
104 free(dup); 104 free(dup);
105 105
106 std::string class_file_name = opts.out_file; 106 std::string class_file_name = opts.out_file;
@@ -169,7 +169,7 @@ run(options_type const& opts)
169 } 169 }
170 //else 170 //else
171 { 171 {
172 for (efl::eina::iterator<const Eolian_Typedecl> enum_iterator( ::eolian_typedecl_enums_get_by_file(opts.unit, basename_input.c_str())) 172 for (efl::eina::iterator<const Eolian_Typedecl> enum_iterator( ::eolian_state_enums_by_file_get(opts.state, basename_input.c_str()))
173 , enum_last; enum_iterator != enum_last; ++enum_iterator) 173 , enum_last; enum_iterator != enum_last; ++enum_iterator)
174 { 174 {
175 efl::eolian::grammar::attributes::enum_def enum_(&*enum_iterator, opts.unit); 175 efl::eolian::grammar::attributes::enum_def enum_(&*enum_iterator, opts.unit);
@@ -179,7 +179,7 @@ run(options_type const& opts)
179 } 179 }
180 } 180 }
181 181
182 for (efl::eina::iterator<const Eolian_Typedecl> struct_iterator( ::eolian_typedecl_structs_get_by_file(opts.unit, basename_input.c_str())) 182 for (efl::eina::iterator<const Eolian_Typedecl> struct_iterator( ::eolian_state_structs_by_file_get(opts.state, basename_input.c_str()))
183 , struct_last; struct_iterator != struct_last; ++struct_iterator) 183 , struct_last; struct_iterator != struct_last; ++struct_iterator)
184 { 184 {
185 efl::eolian::grammar::attributes::struct_def struct_(&*struct_iterator, opts.unit); 185 efl::eolian::grammar::attributes::struct_def struct_(&*struct_iterator, opts.unit);
diff --git a/src/lib/eolian_cxx/grammar/klass_def.hpp b/src/lib/eolian_cxx/grammar/klass_def.hpp
index 610a844ee1..3ffdbe4101 100644
--- a/src/lib/eolian_cxx/grammar/klass_def.hpp
+++ b/src/lib/eolian_cxx/grammar/klass_def.hpp
@@ -1170,7 +1170,7 @@ inline Eolian_Class const* get_klass(klass_name const& klass_name_, Eolian_Unit
1170 , context_null{})) 1170 , context_null{}))
1171 return nullptr; 1171 return nullptr;
1172 else 1172 else
1173 return ::eolian_class_get_by_name(unit, klass_name.c_str()); 1173 return ::eolian_unit_class_by_name_get(unit, klass_name.c_str());
1174} 1174}
1175 1175
1176inline std::vector<std::string> cpp_namespaces(std::vector<std::string> namespaces) 1176inline std::vector<std::string> cpp_namespaces(std::vector<std::string> namespaces)
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_documentation.cc b/src/tests/eolian_cxx/eolian_cxx_test_documentation.cc
index 4ec7dfe56e..8acca1001c 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_documentation.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_documentation.cc
@@ -26,7 +26,7 @@ klass_def init_test_data(efl::eolian::eolian_state const& state)
26 ck_assert(::eolian_state_all_eot_files_parse(state.value)); 26 ck_assert(::eolian_state_all_eot_files_parse(state.value));
27 ck_assert(::eolian_state_file_parse(state.value, PACKAGE_DATA_DIR"/docs.eo")); 27 ck_assert(::eolian_state_file_parse(state.value, PACKAGE_DATA_DIR"/docs.eo"));
28 28
29 const Eolian_Class *c_klass = ::eolian_class_get_by_name(state.as_unit(), "Docs"); 29 const Eolian_Class *c_klass = ::eolian_state_class_by_name_get(state.value, "Docs");
30 ck_assert_ptr_ne(c_klass, NULL); 30 ck_assert_ptr_ne(c_klass, NULL);
31 31
32 klass_def klass(c_klass, state.as_unit()); 32 klass_def klass(c_klass, state.as_unit());
@@ -172,7 +172,7 @@ START_TEST(eolian_cxx_test_enum_docs)
172 klass_def klass = init_test_data(eolian_state); 172 klass_def klass = init_test_data(eolian_state);
173 173
174 auto unit = eolian_state.as_unit(); 174 auto unit = eolian_state.as_unit();
175 enum_def _enum(::eolian_typedecl_enum_get_by_name(unit, "Bar"), unit); 175 enum_def _enum(::eolian_state_enum_by_name_get(eolian_state.value, "Bar"), unit);
176 176
177 documentation_def doc = _enum.documentation; 177 documentation_def doc = _enum.documentation;
178 ck_assert_str_eq(doc.summary.c_str(), "Docs for enum Bar."); 178 ck_assert_str_eq(doc.summary.c_str(), "Docs for enum Bar.");
@@ -215,7 +215,7 @@ START_TEST(eolian_cxx_test_struct_docs)
215 klass_def klass = init_test_data(eolian_state); 215 klass_def klass = init_test_data(eolian_state);
216 216
217 auto unit = eolian_state.as_unit(); 217 auto unit = eolian_state.as_unit();
218 struct_def _struct(::eolian_typedecl_struct_get_by_name(unit, "Foo"), unit); 218 struct_def _struct(::eolian_state_struct_by_name_get(eolian_state.value, "Foo"), unit);
219 219
220 documentation_def doc = _struct.documentation; 220 documentation_def doc = _struct.documentation;
221 ck_assert_str_eq(doc.summary.c_str(), "This is struct Foo. " 221 ck_assert_str_eq(doc.summary.c_str(), "This is struct Foo. "