summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/eolian/main.c10
-rw-r--r--src/bin/eolian_cxx/eolian_cxx.cc6
-rw-r--r--src/bin/eolian_mono/eolian_mono.cc4
-rw-r--r--src/bindings/luajit/eolian.lua32
-rw-r--r--src/lib/eolian/Eolian.h26
-rw-r--r--src/lib/eolian/database_validate.c2
-rw-r--r--src/lib/eolian/eo_lexer.c4
-rw-r--r--src/lib/eolian/eo_lexer.h4
-rw-r--r--src/lib/eolian/eolian_database.c34
-rw-r--r--src/lib/eolian/eolian_database.h8
-rw-r--r--src/lib/eolian_cxx/Eolian_Cxx.hh6
-rw-r--r--src/scripts/pyolian/eolian.py4
-rw-r--r--src/scripts/pyolian/eolian_lib.py32
-rw-r--r--src/tests/eolian/eolian_parsing.c88
14 files changed, 130 insertions, 130 deletions
diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index 63c9e7d67a..ac556a55aa 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -318,7 +318,7 @@ void eo_gen_class_names_get(const Eolian_Class *cl, char **cname,
318} 318}
319 319
320static Eina_Bool 320static Eina_Bool
321_write_header(const Eolian *eos, const Eolian_Unit *src, const char *ofname, 321_write_header(const Eolian_State *eos, const Eolian_Unit *src, const char *ofname,
322 const char *ifname, Eina_Bool legacy) 322 const char *ifname, Eina_Bool legacy)
323{ 323{
324 INF("generating header: %s (legacy: %d)", ofname, legacy); 324 INF("generating header: %s (legacy: %d)", ofname, legacy);
@@ -354,7 +354,7 @@ _write_header(const Eolian *eos, const Eolian_Unit *src, const char *ofname,
354} 354}
355 355
356static Eina_Bool 356static Eina_Bool
357_write_stub_header(const Eolian *eos, const Eolian_Unit *src, const char *ofname, 357_write_stub_header(const Eolian_State *eos, const Eolian_Unit *src, const char *ofname,
358 const char *ifname) 358 const char *ifname)
359{ 359{
360 INF("generating stub header: %s", ofname); 360 INF("generating stub header: %s", ofname);
@@ -379,7 +379,7 @@ _write_stub_header(const Eolian *eos, const Eolian_Unit *src, const char *ofname
379} 379}
380 380
381static Eina_Bool 381static Eina_Bool
382_write_source(const Eolian *eos, const Eolian_Unit *src, const char *ofname, 382_write_source(const Eolian_State *eos, const Eolian_Unit *src, const char *ofname,
383 const char *ifname, Eina_Bool eot) 383 const char *ifname, Eina_Bool eot)
384{ 384{
385 INF("generating source: %s", ofname); 385 INF("generating source: %s", ofname);
@@ -432,7 +432,7 @@ main(int argc, char **argv)
432 eina_init(); 432 eina_init();
433 eolian_init(); 433 eolian_init();
434 434
435 Eolian *eos = eolian_new(); 435 Eolian_State *eos = eolian_state_new();
436 436
437 const char *dom = "eolian_gen"; 437 const char *dom = "eolian_gen";
438 _eolian_gen_log_dom = eina_log_domain_register(dom, EINA_COLOR_GREEN); 438 _eolian_gen_log_dom = eina_log_domain_register(dom, EINA_COLOR_GREEN);
@@ -593,7 +593,7 @@ end:
593 free(outs[i]); 593 free(outs[i]);
594 free(basen); 594 free(basen);
595 595
596 eolian_free(eos); 596 eolian_state_free(eos);
597 eolian_shutdown(); 597 eolian_shutdown();
598 eina_shutdown(); 598 eina_shutdown();
599 599
diff --git a/src/bin/eolian_cxx/eolian_cxx.cc b/src/bin/eolian_cxx/eolian_cxx.cc
index 67b73b2cc5..54aaa3534e 100644
--- a/src/bin/eolian_cxx/eolian_cxx.cc
+++ b/src/bin/eolian_cxx/eolian_cxx.cc
@@ -34,7 +34,7 @@ struct options_type
34{ 34{
35 std::vector<std::string> include_dirs; 35 std::vector<std::string> include_dirs;
36 std::vector<std::string> in_files; 36 std::vector<std::string> in_files;
37 mutable Eolian* state; 37 mutable Eolian_State* state;
38 mutable Eolian_Unit const* unit; 38 mutable Eolian_Unit const* unit;
39 std::string out_file; 39 std::string out_file;
40 bool main_header; 40 bool main_header;
@@ -42,7 +42,7 @@ struct options_type
42 options_type() : main_header(false) {} 42 options_type() : main_header(false) {}
43 ~options_type() 43 ~options_type()
44 { 44 {
45 eolian_free(state); 45 eolian_state_free(state);
46 } 46 }
47}; 47};
48 48
@@ -354,7 +354,7 @@ run(options_type const& opts)
354static void 354static void
355state_init(options_type const& opts) 355state_init(options_type const& opts)
356{ 356{
357 Eolian *eos = ::eolian_new(); 357 Eolian_State *eos = ::eolian_state_new();
358 if (!eos) 358 if (!eos)
359 { 359 {
360 EINA_CXX_DOM_LOG_ERR(eolian_cxx::domain) 360 EINA_CXX_DOM_LOG_ERR(eolian_cxx::domain)
diff --git a/src/bin/eolian_mono/eolian_mono.cc b/src/bin/eolian_mono/eolian_mono.cc
index db50906318..616985e088 100644
--- a/src/bin/eolian_mono/eolian_mono.cc
+++ b/src/bin/eolian_mono/eolian_mono.cc
@@ -40,7 +40,7 @@ struct options_type
40 std::string in_file; 40 std::string in_file;
41 std::string out_file; 41 std::string out_file;
42 std::string dllimport; 42 std::string dllimport;
43 mutable Eolian* state; 43 mutable Eolian_State* state;
44 mutable Eolian_Unit const* unit; 44 mutable Eolian_Unit const* unit;
45 int v_major; 45 int v_major;
46 int v_minor; 46 int v_minor;
@@ -196,7 +196,7 @@ run(options_type const& opts)
196static void 196static void
197state_init(options_type const& opts) 197state_init(options_type const& opts)
198{ 198{
199 Eolian *eos = ::eolian_new(); 199 Eolian_State *eos = ::eolian_state_new();
200 if (!eos) 200 if (!eos)
201 { 201 {
202 EINA_CXX_DOM_LOG_ERR(eolian_mono::domain) 202 EINA_CXX_DOM_LOG_ERR(eolian_mono::domain)
diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua
index 773d302a55..bea134e2e3 100644
--- a/src/bindings/luajit/eolian.lua
+++ b/src/bindings/luajit/eolian.lua
@@ -13,7 +13,7 @@ ffi.cdef [[
13 typedef unsigned char Eina_Bool; 13 typedef unsigned char Eina_Bool;
14 typedef struct _Eina_Iterator Eina_Iterator; 14 typedef struct _Eina_Iterator Eina_Iterator;
15 15
16 typedef struct _Eolian Eolian; 16 typedef struct _Eolian_State Eolian_State;
17 typedef struct _Eolian_Class Eolian_Class; 17 typedef struct _Eolian_Class Eolian_Class;
18 typedef struct _Eolian_Function Eolian_Function; 18 typedef struct _Eolian_Function Eolian_Function;
19 typedef struct _Eolian_Type Eolian_Type; 19 typedef struct _Eolian_Type Eolian_Type;
@@ -287,17 +287,17 @@ ffi.cdef [[
287 287
288 int eolian_init(void); 288 int eolian_init(void);
289 int eolian_shutdown(void); 289 int eolian_shutdown(void);
290 Eolian *eolian_new(void); 290 Eolian_State *eolian_state_new(void);
291 void eolian_free(Eolian *state); 291 void eolian_state_free(Eolian_State *state);
292 const Eolian_Unit *eolian_file_parse(Eolian *state, const char *filepath); 292 const Eolian_Unit *eolian_file_parse(Eolian_State *state, const char *filepath);
293 Eina_Iterator *eolian_all_eo_file_paths_get(Eolian *state); 293 Eina_Iterator *eolian_all_eo_file_paths_get(Eolian_State *state);
294 Eina_Iterator *eolian_all_eot_file_paths_get(Eolian *state); 294 Eina_Iterator *eolian_all_eot_file_paths_get(Eolian_State *state);
295 Eina_Iterator *eolian_all_eo_files_get(Eolian *state); 295 Eina_Iterator *eolian_all_eo_files_get(Eolian_State *state);
296 Eina_Iterator *eolian_all_eot_files_get(Eolian *state); 296 Eina_Iterator *eolian_all_eot_files_get(Eolian_State *state);
297 Eina_Bool eolian_directory_scan(Eolian *state, const char *dir); 297 Eina_Bool eolian_directory_scan(Eolian_State *state, const char *dir);
298 Eina_Bool eolian_system_directory_scan(Eolian *state); 298 Eina_Bool eolian_system_directory_scan(Eolian_State *state);
299 Eina_Bool eolian_all_eo_files_parse(Eolian *state); 299 Eina_Bool eolian_all_eo_files_parse(Eolian_State *state);
300 Eina_Bool eolian_all_eot_files_parse(Eolian *state); 300 Eina_Bool eolian_all_eot_files_parse(Eolian_State *state);
301 const Eolian_Class *eolian_class_get_by_name(const Eolian_Unit *unit, const char *class_name); 301 const Eolian_Class *eolian_class_get_by_name(const Eolian_Unit *unit, const char *class_name);
302 const Eolian_Class *eolian_class_get_by_file(const Eolian_Unit *unit, const char *file_name); 302 const Eolian_Class *eolian_class_get_by_file(const Eolian_Unit *unit, const char *file_name);
303 const char *eolian_class_file_get(const Eolian_Class *klass); 303 const char *eolian_class_file_get(const Eolian_Class *klass);
@@ -455,7 +455,7 @@ ffi.cdef [[
455 Eina_Iterator *eolian_variable_namespaces_get(const Eolian_Variable *var); 455 Eina_Iterator *eolian_variable_namespaces_get(const Eolian_Variable *var);
456 Eina_Bool eolian_variable_is_extern(const Eolian_Variable *var); 456 Eina_Bool eolian_variable_is_extern(const Eolian_Variable *var);
457 const Eolian_Declaration *eolian_declaration_get_by_name(const Eolian_Unit *unit, const char *name); 457 const Eolian_Declaration *eolian_declaration_get_by_name(const Eolian_Unit *unit, const char *name);
458 Eina_Iterator *eolian_declarations_get_by_file(const Eolian *state, const char *fname); 458 Eina_Iterator *eolian_declarations_get_by_file(const Eolian_State *state, const char *fname);
459 Eina_Iterator *eolian_all_declarations_get(const Eolian_Unit *unit); 459 Eina_Iterator *eolian_all_declarations_get(const Eolian_Unit *unit);
460 Eolian_Declaration_Type eolian_declaration_type_get(const Eolian_Declaration *decl); 460 Eolian_Declaration_Type eolian_declaration_type_get(const Eolian_Declaration *decl);
461 const char *eolian_declaration_name_get(const Eolian_Declaration *decl); 461 const char *eolian_declaration_name_get(const Eolian_Declaration *decl);
@@ -512,7 +512,7 @@ M.object_scope = {
512 PROTECTED = 3 512 PROTECTED = 3
513} 513}
514 514
515ffi.metatype("Eolian", { 515ffi.metatype("Eolian_State", {
516 __index = { 516 __index = {
517 directory_scan = function(self, dir) 517 directory_scan = function(self, dir)
518 return eolian.eolian_directory_scan(self, dir) ~= 0 518 return eolian.eolian_directory_scan(self, dir) ~= 0
@@ -564,12 +564,12 @@ ffi.metatype("Eolian", {
564 end 564 end
565 }, 565 },
566 __gc = function(self) 566 __gc = function(self)
567 eolian.eolian_free(self) 567 eolian.eolian_state_free(self)
568 end 568 end
569}) 569})
570 570
571M.new = function() 571M.new = function()
572 return eolian.eolian_new() 572 return eolian.eolian_state_new()
573end 573end
574 574
575M.declaration_type = { 575M.declaration_type = {
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index bb67db9139..46c864cb95 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -88,7 +88,7 @@ extern "C" {
88 * 88 *
89 * @ingroup Eolian 89 * @ingroup Eolian
90 */ 90 */
91typedef struct _Eolian Eolian; 91typedef struct _Eolian_State Eolian_State;
92 92
93/* Class type used to extract information on classes 93/* Class type used to extract information on classes
94 * 94 *
@@ -482,7 +482,7 @@ EAPI int eolian_shutdown(void);
482 * 482 *
483 * @ingroup Eolian 483 * @ingroup Eolian
484 */ 484 */
485EAPI Eolian *eolian_new(void); 485EAPI Eolian_State *eolian_state_new(void);
486 486
487/* 487/*
488 * @brief Free an Eolian state. 488 * @brief Free an Eolian state.
@@ -494,7 +494,7 @@ EAPI Eolian *eolian_new(void);
494 * @param[in] state the state to free 494 * @param[in] state the state to free
495 * 495 *
496 */ 496 */
497EAPI void eolian_free(Eolian *state); 497EAPI void eolian_state_free(Eolian_State *state);
498 498
499/* 499/*
500 * @brief Parse the given .eo or .eot file and fill the database. 500 * @brief Parse the given .eo or .eot file and fill the database.
@@ -510,7 +510,7 @@ EAPI void eolian_free(Eolian *state);
510 * 510 *
511 * @ingroup Eolian 511 * @ingroup Eolian
512 */ 512 */
513EAPI const Eolian_Unit *eolian_file_parse(Eolian *state, const char *filepath); 513EAPI const Eolian_Unit *eolian_file_parse(Eolian_State *state, const char *filepath);
514 514
515/* 515/*
516 * @brief Get an iterator to all .eo file names with paths. 516 * @brief Get an iterator to all .eo file names with paths.
@@ -523,7 +523,7 @@ EAPI const Eolian_Unit *eolian_file_parse(Eolian *state, const char *filepath);
523 * 523 *
524 * @ingroup Eolian 524 * @ingroup Eolian
525 */ 525 */
526EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian *state); 526EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian_State *state);
527 527
528/* 528/*
529 * @brief Get an iterator to all .eot file names with paths. 529 * @brief Get an iterator to all .eot file names with paths.
@@ -536,7 +536,7 @@ EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian *state);
536 * 536 *
537 * @ingroup Eolian 537 * @ingroup Eolian
538 */ 538 */
539EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian *state); 539EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian_State *state);
540 540
541/* 541/*
542 * @brief Get an iterator to all .eo file names (without paths). 542 * @brief Get an iterator to all .eo file names (without paths).
@@ -549,7 +549,7 @@ EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian *state);
549 * 549 *
550 * @ingroup Eolian 550 * @ingroup Eolian
551 */ 551 */
552EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian *state); 552EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian_State *state);
553 553
554/* 554/*
555 * @brief Get an iterator to all .eot file names (without paths). 555 * @brief Get an iterator to all .eot file names (without paths).
@@ -562,7 +562,7 @@ EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian *state);
562 * 562 *
563 * @ingroup Eolian 563 * @ingroup Eolian
564 */ 564 */
565EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian *state); 565EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian_State *state);
566 566
567/* 567/*
568 * @brief Scan the given directory (recursively) and search for .eo and 568 * @brief Scan the given directory (recursively) and search for .eo and
@@ -578,7 +578,7 @@ EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian *state);
578 * 578 *
579 * @ingroup Eolian 579 * @ingroup Eolian
580 */ 580 */
581EAPI Eina_Bool eolian_directory_scan(Eolian *state, const char *dir); 581EAPI Eina_Bool eolian_directory_scan(Eolian_State *state, const char *dir);
582 582
583/* 583/*
584 * @brief Scan the system directory (recursively) and search for .eo and 584 * @brief Scan the system directory (recursively) and search for .eo and
@@ -592,7 +592,7 @@ EAPI Eina_Bool eolian_directory_scan(Eolian *state, const char *dir);
592 * 592 *
593 * @ingroup Eolian 593 * @ingroup Eolian
594 */ 594 */
595EAPI Eina_Bool eolian_system_directory_scan(Eolian *state); 595EAPI Eina_Bool eolian_system_directory_scan(Eolian_State *state);
596 596
597/* 597/*
598 * @brief Force parsing of all the .eo files located in the directories 598 * @brief Force parsing of all the .eo files located in the directories
@@ -607,7 +607,7 @@ EAPI Eina_Bool eolian_system_directory_scan(Eolian *state);
607 * 607 *
608 * @ingroup Eolian 608 * @ingroup Eolian
609 */ 609 */
610EAPI Eina_Bool eolian_all_eo_files_parse(Eolian *state); 610EAPI Eina_Bool eolian_all_eo_files_parse(Eolian_State *state);
611 611
612/* 612/*
613 * @brief Force parsing of all the .eot files located in the directories 613 * @brief Force parsing of all the .eot files located in the directories
@@ -622,7 +622,7 @@ EAPI Eina_Bool eolian_all_eo_files_parse(Eolian *state);
622 * 622 *
623 * @ingroup Eolian 623 * @ingroup Eolian
624 */ 624 */
625EAPI Eina_Bool eolian_all_eot_files_parse(Eolian *state); 625EAPI Eina_Bool eolian_all_eot_files_parse(Eolian_State *state);
626 626
627/* 627/*
628 * @brief Gets a class by its name 628 * @brief Gets a class by its name
@@ -2416,7 +2416,7 @@ EAPI const Eolian_Declaration *eolian_declaration_get_by_name(const Eolian_Unit
2416 * 2416 *
2417 * @ingroup Eolian 2417 * @ingroup Eolian
2418 */ 2418 */
2419EAPI Eina_Iterator *eolian_declarations_get_by_file(const Eolian *state, const char *fname); 2419EAPI Eina_Iterator *eolian_declarations_get_by_file(const Eolian_State *state, const char *fname);
2420 2420
2421/* 2421/*
2422 * @brief Get an iterator to all declarations in the Eolian database. 2422 * @brief Get an iterator to all declarations in the Eolian database.
diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c
index 238eabbe9a..bbdf1d501d 100644
--- a/src/lib/eolian/database_validate.c
+++ b/src/lib/eolian/database_validate.c
@@ -845,7 +845,7 @@ _var_map_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED,
845} 845}
846 846
847Eina_Bool 847Eina_Bool
848database_validate(Eolian *state, const Eolian_Unit *src) 848database_validate(Eolian_State *state, const Eolian_Unit *src)
849{ 849{
850 Eolian_Class *cl; 850 Eolian_Class *cl;
851 851
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index 80f08eac2c..70c3afdf2b 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -1014,7 +1014,7 @@ get_filename(Eo_Lexer *ls)
1014} 1014}
1015 1015
1016static void 1016static void
1017eo_lexer_set_input(Eo_Lexer *ls, Eolian *state, const char *source) 1017eo_lexer_set_input(Eo_Lexer *ls, Eolian_State *state, const char *source)
1018{ 1018{
1019 Eina_File *f = eina_file_open(source, EINA_FALSE); 1019 Eina_File *f = eina_file_open(source, EINA_FALSE);
1020 if (!f) 1020 if (!f)
@@ -1115,7 +1115,7 @@ eo_lexer_free(Eo_Lexer *ls)
1115} 1115}
1116 1116
1117Eo_Lexer * 1117Eo_Lexer *
1118eo_lexer_new(Eolian *state, const char *source) 1118eo_lexer_new(Eolian_State *state, const char *source)
1119{ 1119{
1120 volatile Eo_Lexer *ls = calloc(1, sizeof(Eo_Lexer)); 1120 volatile Eo_Lexer *ls = calloc(1, sizeof(Eo_Lexer));
1121 1121
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 9ca577101b..c944cd6ce1 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -167,7 +167,7 @@ typedef struct _Eo_Lexer
167 * display the current line with a caret at the respective column */ 167 * display the current line with a caret at the respective column */
168 const char *stream_line; 168 const char *stream_line;
169 /* a pointer to the state this lexer belongs to */ 169 /* a pointer to the state this lexer belongs to */
170 Eolian *state; 170 Eolian_State *state;
171 /* the unit being filled during current parsing */ 171 /* the unit being filled during current parsing */
172 Eolian_Unit *unit; 172 Eolian_Unit *unit;
173 /* this is jumped to when an error happens */ 173 /* this is jumped to when an error happens */
@@ -191,7 +191,7 @@ typedef struct _Eo_Lexer
191 191
192int eo_lexer_init (void); 192int eo_lexer_init (void);
193int eo_lexer_shutdown (void); 193int eo_lexer_shutdown (void);
194Eo_Lexer *eo_lexer_new (Eolian *state, const char *source); 194Eo_Lexer *eo_lexer_new (Eolian_State *state, const char *source);
195void eo_lexer_free (Eo_Lexer *ls); 195void eo_lexer_free (Eo_Lexer *ls);
196/* gets a regular token, singlechar or one of TOK_something */ 196/* gets a regular token, singlechar or one of TOK_something */
197int eo_lexer_get (Eo_Lexer *ls); 197int eo_lexer_get (Eo_Lexer *ls);
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index da5cc8766b..70a6dc3818 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -44,7 +44,7 @@ eolian_declaration_get_by_name(const Eolian_Unit *unit, const char *name)
44} 44}
45 45
46EAPI Eina_Iterator * 46EAPI Eina_Iterator *
47eolian_declarations_get_by_file(const Eolian *state, const char *fname) 47eolian_declarations_get_by_file(const Eolian_State *state, const char *fname)
48{ 48{
49 if (!state) return NULL; 49 if (!state) return NULL;
50 Eina_Stringshare *shr = eina_stringshare_add(fname); 50 Eina_Stringshare *shr = eina_stringshare_add(fname);
@@ -514,7 +514,7 @@ eolian_doc_token_ref_get(const Eolian_Unit *unit, const Eolian_Doc_Token *tok,
514} 514}
515 515
516void 516void
517database_unit_init(Eolian *state, Eolian_Unit *unit) 517database_unit_init(Eolian_State *state, Eolian_Unit *unit)
518{ 518{
519 unit->state = state; 519 unit->state = state;
520 520
@@ -549,10 +549,10 @@ _hashlist_free(void *data)
549 eina_list_free((Eina_List*)data); 549 eina_list_free((Eina_List*)data);
550} 550}
551 551
552EAPI Eolian * 552EAPI Eolian_State *
553eolian_new(void) 553eolian_state_new(void)
554{ 554{
555 Eolian *state = calloc(1, sizeof(Eolian)); 555 Eolian_State *state = calloc(1, sizeof(Eolian_State));
556 if (!state) 556 if (!state)
557 return NULL; 557 return NULL;
558 558
@@ -576,7 +576,7 @@ eolian_new(void)
576} 576}
577 577
578EAPI void 578EAPI void
579eolian_free(Eolian *state) 579eolian_state_free(Eolian_State *state)
580{ 580{
581 if (!state) 581 if (!state)
582 return; 582 return;
@@ -621,7 +621,7 @@ join_path(const char *path, const char *file)
621static void 621static void
622_scan_cb(const char *name, const char *path, void *data EINA_UNUSED) 622_scan_cb(const char *name, const char *path, void *data EINA_UNUSED)
623{ 623{
624 Eolian *state = data; 624 Eolian_State *state = data;
625 Eina_Bool is_eo = eina_str_has_suffix(name, EO_SUFFIX); 625 Eina_Bool is_eo = eina_str_has_suffix(name, EO_SUFFIX);
626 if (!is_eo && !eina_str_has_suffix(name, EOT_SUFFIX)) return; 626 if (!is_eo && !eina_str_has_suffix(name, EOT_SUFFIX)) return;
627 eina_hash_add(is_eo ? state->filenames_eo : state->filenames_eot, 627 eina_hash_add(is_eo ? state->filenames_eo : state->filenames_eot,
@@ -629,7 +629,7 @@ _scan_cb(const char *name, const char *path, void *data EINA_UNUSED)
629} 629}
630 630
631EAPI Eina_Bool 631EAPI Eina_Bool
632eolian_directory_scan(Eolian *state, const char *dir) 632eolian_directory_scan(Eolian_State *state, const char *dir)
633{ 633{
634 if (!dir || !state) return EINA_FALSE; 634 if (!dir || !state) return EINA_FALSE;
635 eina_file_dir_list(dir, EINA_TRUE, _scan_cb, state); 635 eina_file_dir_list(dir, EINA_TRUE, _scan_cb, state);
@@ -637,7 +637,7 @@ eolian_directory_scan(Eolian *state, const char *dir)
637} 637}
638 638
639EAPI Eina_Bool 639EAPI Eina_Bool
640eolian_system_directory_scan(Eolian *state) 640eolian_system_directory_scan(Eolian_State *state)
641{ 641{
642 Eina_Bool ret; 642 Eina_Bool ret;
643 Eina_Strbuf *buf = eina_strbuf_new(); 643 Eina_Strbuf *buf = eina_strbuf_new();
@@ -769,7 +769,7 @@ _merge_units(Eolian_Unit *unit)
769} 769}
770 770
771EAPI const Eolian_Unit * 771EAPI const Eolian_Unit *
772eolian_file_parse(Eolian *state, const char *filepath) 772eolian_file_parse(Eolian_State *state, const char *filepath)
773{ 773{
774 if (!state) 774 if (!state)
775 return NULL; 775 return NULL;
@@ -788,7 +788,7 @@ eolian_file_parse(Eolian *state, const char *filepath)
788 788
789typedef struct _Parse_Data 789typedef struct _Parse_Data
790{ 790{
791 Eolian *state; 791 Eolian_State *state;
792 Eina_Bool ret; 792 Eina_Bool ret;
793} Parse_Data; 793} Parse_Data;
794 794
@@ -805,7 +805,7 @@ static Eina_Bool _tfile_parse(const Eina_Hash *hash EINA_UNUSED, const void *key
805} 805}
806 806
807EAPI Eina_Bool 807EAPI Eina_Bool
808eolian_all_eot_files_parse(Eolian *state) 808eolian_all_eot_files_parse(Eolian_State *state)
809{ 809{
810 Parse_Data pd = { state, EINA_TRUE }; 810 Parse_Data pd = { state, EINA_TRUE };
811 811
@@ -834,7 +834,7 @@ static Eina_Bool _file_parse(const Eina_Hash *hash EINA_UNUSED, const void *key
834} 834}
835 835
836EAPI Eina_Bool 836EAPI Eina_Bool
837eolian_all_eo_files_parse(Eolian *state) 837eolian_all_eo_files_parse(Eolian_State *state)
838{ 838{
839 Parse_Data pd = { state, EINA_TRUE }; 839 Parse_Data pd = { state, EINA_TRUE };
840 840
@@ -851,28 +851,28 @@ eolian_all_eo_files_parse(Eolian *state)
851} 851}
852 852
853EAPI Eina_Iterator * 853EAPI Eina_Iterator *
854eolian_all_eot_files_get(const Eolian *state) 854eolian_all_eot_files_get(const Eolian_State *state)
855{ 855{
856 if (!state) return NULL; 856 if (!state) return NULL;
857 return eina_hash_iterator_key_new(state->filenames_eot); 857 return eina_hash_iterator_key_new(state->filenames_eot);
858} 858}
859 859
860EAPI Eina_Iterator * 860EAPI Eina_Iterator *
861eolian_all_eo_files_get(const Eolian *state) 861eolian_all_eo_files_get(const Eolian_State *state)
862{ 862{
863 if (!state) return NULL; 863 if (!state) return NULL;
864 return eina_hash_iterator_key_new(state->filenames_eo); 864 return eina_hash_iterator_key_new(state->filenames_eo);
865} 865}
866 866
867EAPI Eina_Iterator * 867EAPI Eina_Iterator *
868eolian_all_eot_file_paths_get(const Eolian *state) 868eolian_all_eot_file_paths_get(const Eolian_State *state)
869{ 869{
870 if (!state) return NULL; 870 if (!state) return NULL;
871 return eina_hash_iterator_data_new(state->filenames_eot); 871 return eina_hash_iterator_data_new(state->filenames_eot);
872} 872}
873 873
874EAPI Eina_Iterator * 874EAPI Eina_Iterator *
875eolian_all_eo_file_paths_get(const Eolian *state) 875eolian_all_eo_file_paths_get(const Eolian_State *state)
876{ 876{
877 if (!state) return NULL; 877 if (!state) return NULL;
878 return eina_hash_iterator_data_new(state->filenames_eo); 878 return eina_hash_iterator_data_new(state->filenames_eo);
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 58fd1c8d16..4eed189fbe 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -33,7 +33,7 @@ extern Eina_Prefix *_eolian_prefix;
33 33
34struct _Eolian_Unit 34struct _Eolian_Unit
35{ 35{
36 Eolian *state; 36 Eolian_State *state;
37 Eina_Hash *children; 37 Eina_Hash *children;
38 Eina_Hash *classes; 38 Eina_Hash *classes;
39 Eina_Hash *globals; 39 Eina_Hash *globals;
@@ -44,7 +44,7 @@ struct _Eolian_Unit
44 Eina_Hash *decls; 44 Eina_Hash *decls;
45}; 45};
46 46
47struct _Eolian 47struct _Eolian_State
48{ 48{
49 Eolian_Unit unit; 49 Eolian_Unit unit;
50 50
@@ -338,7 +338,7 @@ struct _Eolian_Variable
338}; 338};
339 339
340char *database_class_to_filename(const char *cname); 340char *database_class_to_filename(const char *cname);
341Eina_Bool database_validate(Eolian *state, const Eolian_Unit *src); 341Eina_Bool database_validate(Eolian_State *state, const Eolian_Unit *src);
342 342
343void database_decl_add(Eolian_Unit *unit, Eina_Stringshare *name, 343void database_decl_add(Eolian_Unit *unit, Eina_Stringshare *name,
344 Eolian_Declaration_Type type, 344 Eolian_Declaration_Type type,
@@ -346,7 +346,7 @@ void database_decl_add(Eolian_Unit *unit, Eina_Stringshare *name,
346 346
347void database_doc_del(Eolian_Documentation *doc); 347void database_doc_del(Eolian_Documentation *doc);
348 348
349void database_unit_init(Eolian *state, Eolian_Unit *unit); 349void database_unit_init(Eolian_State *state, Eolian_Unit *unit);
350void database_unit_del(Eolian_Unit *unit); 350void database_unit_del(Eolian_Unit *unit);
351 351
352/* types */ 352/* types */
diff --git a/src/lib/eolian_cxx/Eolian_Cxx.hh b/src/lib/eolian_cxx/Eolian_Cxx.hh
index ec5062fee3..2eb9736cb0 100644
--- a/src/lib/eolian_cxx/Eolian_Cxx.hh
+++ b/src/lib/eolian_cxx/Eolian_Cxx.hh
@@ -26,14 +26,14 @@ struct eolian_init
26 26
27struct eolian_state 27struct eolian_state
28{ 28{
29 Eolian *value; 29 Eolian_State *value;
30 eolian_state() 30 eolian_state()
31 { 31 {
32 value = ::eolian_new(); 32 value = ::eolian_state_new();
33 } 33 }
34 ~eolian_state() 34 ~eolian_state()
35 { 35 {
36 ::eolian_free(value); 36 ::eolian_state_free(value);
37 } 37 }
38 38
39 inline Eolian_Unit const* as_unit() const 39 inline Eolian_Unit const* as_unit() const
diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py
index d62e74bec2..37a0568600 100644
--- a/src/scripts/pyolian/eolian.py
+++ b/src/scripts/pyolian/eolian.py
@@ -436,11 +436,11 @@ class Eolian_Unit(EolianBaseObject):
436 436
437class Eolian(Eolian_Unit): 437class Eolian(Eolian_Unit):
438 def __init__(self): 438 def __init__(self):
439 self._obj = lib.eolian_new() # Eolian * 439 self._obj = lib.eolian_state_new() # Eolian_State *
440 440
441 def __del__(self): 441 def __del__(self):
442 if not _already_halted: # do not free after eolian_shutdown 442 if not _already_halted: # do not free after eolian_shutdown
443 lib.eolian_free(self._obj) 443 lib.eolian_state_free(self._obj)
444 444
445 def file_parse(self, filepath): 445 def file_parse(self, filepath):
446 c_unit = lib.eolian_file_parse(self._obj, _str_to_bytes(filepath)) 446 c_unit = lib.eolian_file_parse(self._obj, _str_to_bytes(filepath))
diff --git a/src/scripts/pyolian/eolian_lib.py b/src/scripts/pyolian/eolian_lib.py
index 78b3a70d94..2170d29c43 100644
--- a/src/scripts/pyolian/eolian_lib.py
+++ b/src/scripts/pyolian/eolian_lib.py
@@ -39,47 +39,47 @@ lib.eolian_init.restype = c_int
39lib.eolian_shutdown.argtypes = [] 39lib.eolian_shutdown.argtypes = []
40lib.eolian_shutdown.restype = c_int 40lib.eolian_shutdown.restype = c_int
41 41
42# EAPI Eolian *eolian_new(void); 42# EAPI Eolian_State *eolian_state_new(void);
43lib.eolian_new.argtypes = [] 43lib.eolian_state_new.argtypes = []
44lib.eolian_new.restype = c_void_p 44lib.eolian_state_new.restype = c_void_p
45 45
46# EAPI void eolian_free(Eolian *state); 46# EAPI void eolian_state_free(Eolian_State *state);
47lib.eolian_free.argtypes = [c_void_p,] 47lib.eolian_state_free.argtypes = [c_void_p,]
48lib.eolian_free.restype = None 48lib.eolian_state_free.restype = None
49 49
50# EAPI const Eolian_Unit *eolian_file_parse(Eolian *state, const char *filepath); 50# EAPI const Eolian_Unit *eolian_file_parse(Eolian_State *state, const char *filepath);
51lib.eolian_file_parse.argtypes = [c_void_p, c_char_p] 51lib.eolian_file_parse.argtypes = [c_void_p, c_char_p]
52lib.eolian_file_parse.restype = c_void_p 52lib.eolian_file_parse.restype = c_void_p
53 53
54# EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian *state); 54# EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian_State *state);
55lib.eolian_all_eo_file_paths_get.argtypes = [c_void_p,] 55lib.eolian_all_eo_file_paths_get.argtypes = [c_void_p,]
56lib.eolian_all_eo_file_paths_get.restype = c_void_p 56lib.eolian_all_eo_file_paths_get.restype = c_void_p
57 57
58# EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian *state); 58# EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian_State *state);
59lib.eolian_all_eot_file_paths_get.argtypes = [c_void_p,] 59lib.eolian_all_eot_file_paths_get.argtypes = [c_void_p,]
60lib.eolian_all_eot_file_paths_get.restype = c_void_p 60lib.eolian_all_eot_file_paths_get.restype = c_void_p
61 61
62# EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian *state); 62# EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian_State *state);
63lib.eolian_all_eo_files_get.argtypes = [c_void_p,] 63lib.eolian_all_eo_files_get.argtypes = [c_void_p,]
64lib.eolian_all_eo_files_get.restype = c_void_p 64lib.eolian_all_eo_files_get.restype = c_void_p
65 65
66# EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian *state); 66# EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian_State *state);
67lib.eolian_all_eot_files_get.argtypes = [c_void_p,] 67lib.eolian_all_eot_files_get.argtypes = [c_void_p,]
68lib.eolian_all_eot_files_get.restype = c_void_p 68lib.eolian_all_eot_files_get.restype = c_void_p
69 69
70# EAPI Eina_Bool eolian_directory_scan(Eolian *state, const char *dir); 70# EAPI Eina_Bool eolian_directory_scan(Eolian_State *state, const char *dir);
71lib.eolian_directory_scan.argtypes = [c_void_p, c_char_p] 71lib.eolian_directory_scan.argtypes = [c_void_p, c_char_p]
72lib.eolian_directory_scan.restype = c_bool 72lib.eolian_directory_scan.restype = c_bool
73 73
74# EAPI Eina_Bool eolian_system_directory_scan(Eolian *state); 74# EAPI Eina_Bool eolian_system_directory_scan(Eolian_State *state);
75lib.eolian_system_directory_scan.argtypes = [c_void_p,] 75lib.eolian_system_directory_scan.argtypes = [c_void_p,]
76lib.eolian_system_directory_scan.restype = c_bool 76lib.eolian_system_directory_scan.restype = c_bool
77 77
78# EAPI Eina_Bool eolian_all_eo_files_parse(Eolian *state); 78# EAPI Eina_Bool eolian_all_eo_files_parse(Eolian_State *state);
79lib.eolian_all_eo_files_parse.argtypes = [c_void_p,] 79lib.eolian_all_eo_files_parse.argtypes = [c_void_p,]
80lib.eolian_all_eo_files_parse.restype = c_bool 80lib.eolian_all_eo_files_parse.restype = c_bool
81 81
82# EAPI Eina_Bool eolian_all_eot_files_parse(Eolian *state); 82# EAPI Eina_Bool eolian_all_eot_files_parse(Eolian_State *state);
83lib.eolian_all_eot_files_parse.argtypes = [c_void_p,] 83lib.eolian_all_eot_files_parse.argtypes = [c_void_p,]
84lib.eolian_all_eot_files_parse.restype = c_bool 84lib.eolian_all_eot_files_parse.restype = c_bool
85 85
@@ -684,7 +684,7 @@ lib.eolian_variable_is_extern.restype = c_bool
684lib.eolian_declaration_get_by_name.argtypes = [c_void_p, c_char_p] 684lib.eolian_declaration_get_by_name.argtypes = [c_void_p, c_char_p]
685lib.eolian_declaration_get_by_name.restype = c_void_p 685lib.eolian_declaration_get_by_name.restype = c_void_p
686 686
687# EAPI Eina_Iterator *eolian_declarations_get_by_file(const Eolian *state, const char *fname); 687# EAPI Eina_Iterator *eolian_declarations_get_by_file(const Eolian_State *state, const char *fname);
688lib.eolian_declarations_get_by_file.argtypes = [c_void_p, c_char_p] 688lib.eolian_declarations_get_by_file.argtypes = [c_void_p, c_char_p]
689lib.eolian_declarations_get_by_file.restype = c_void_p 689lib.eolian_declarations_get_by_file.restype = c_void_p
690 690
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index 7c75be94da..79d7ef03b1 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -23,7 +23,7 @@ START_TEST(eolian_namespaces)
23 void *dummy; 23 void *dummy;
24 24
25 eolian_init(); 25 eolian_init();
26 Eolian *eos = eolian_new(); 26 Eolian_State *eos = eolian_state_new();
27 /* Parsing */ 27 /* Parsing */
28 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 28 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
29 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/nmsp1_class1.eo"))); 29 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/nmsp1_class1.eo")));
@@ -90,7 +90,7 @@ START_TEST(eolian_namespaces)
90 fail_if(eina_iterator_next(iter, &dummy)); 90 fail_if(eina_iterator_next(iter, &dummy));
91 eina_iterator_free(iter); 91 eina_iterator_free(iter);
92 92
93 eolian_free(eos); 93 eolian_state_free(eos);
94 eolian_shutdown(); 94 eolian_shutdown();
95} 95}
96END_TEST 96END_TEST
@@ -106,7 +106,7 @@ START_TEST(eolian_events)
106 void *dummy; 106 void *dummy;
107 107
108 eolian_init(); 108 eolian_init();
109 Eolian *eos = eolian_new(); 109 Eolian_State *eos = eolian_state_new();
110 /* Parsing */ 110 /* Parsing */
111 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 111 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
112 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/events.eo"))); 112 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/events.eo")));
@@ -166,7 +166,7 @@ START_TEST(eolian_events)
166 fail_if(!eolian_class_event_get_by_name(class, "clicked,double")); 166 fail_if(!eolian_class_event_get_by_name(class, "clicked,double"));
167 fail_if(eolian_class_event_get_by_name(class, "clicked,triple")); 167 fail_if(eolian_class_event_get_by_name(class, "clicked,triple"));
168 168
169 eolian_free(eos); 169 eolian_state_free(eos);
170 eolian_shutdown(); 170 eolian_shutdown();
171} 171}
172END_TEST 172END_TEST
@@ -181,7 +181,7 @@ START_TEST(eolian_override)
181 const Eolian_Unit *unit; 181 const Eolian_Unit *unit;
182 182
183 eolian_init(); 183 eolian_init();
184 Eolian *eos = eolian_new(); 184 Eolian_State *eos = eolian_state_new();
185 /* Parsing */ 185 /* Parsing */
186 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 186 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
187 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/override.eo"))); 187 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/override.eo")));
@@ -226,7 +226,7 @@ START_TEST(eolian_override)
226 226
227 eina_iterator_free(iter); 227 eina_iterator_free(iter);
228 228
229 eolian_free(eos); 229 eolian_state_free(eos);
230 eolian_shutdown(); 230 eolian_shutdown();
231} 231}
232END_TEST 232END_TEST
@@ -238,7 +238,7 @@ START_TEST(eolian_consts)
238 const Eolian_Unit *unit; 238 const Eolian_Unit *unit;
239 239
240 eolian_init(); 240 eolian_init();
241 Eolian *eos = eolian_new(); 241 Eolian_State *eos = eolian_state_new();
242 /* Parsing */ 242 /* Parsing */
243 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 243 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
244 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/consts.eo"))); 244 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/consts.eo")));
@@ -248,7 +248,7 @@ START_TEST(eolian_consts)
248 fail_if(!(fid = eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD))); 248 fail_if(!(fid = eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD)));
249 fail_if(EINA_FALSE == eolian_function_object_is_const(fid)); 249 fail_if(EINA_FALSE == eolian_function_object_is_const(fid));
250 250
251 eolian_free(eos); 251 eolian_state_free(eos);
252 eolian_shutdown(); 252 eolian_shutdown();
253} 253}
254END_TEST 254END_TEST
@@ -265,7 +265,7 @@ START_TEST(eolian_ctor_dtor)
265 void *dummy; 265 void *dummy;
266 266
267 eolian_init(); 267 eolian_init();
268 Eolian *eos = eolian_new(); 268 Eolian_State *eos = eolian_state_new();
269 /* Parsing */ 269 /* Parsing */
270 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 270 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
271 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/ctor_dtor.eo"))); 271 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/ctor_dtor.eo")));
@@ -318,7 +318,7 @@ START_TEST(eolian_ctor_dtor)
318 fail_if(eina_iterator_next(iter, &dummy)); 318 fail_if(eina_iterator_next(iter, &dummy));
319 eina_iterator_free(iter); 319 eina_iterator_free(iter);
320 320
321 eolian_free(eos); 321 eolian_state_free(eos);
322 eolian_shutdown(); 322 eolian_shutdown();
323} 323}
324END_TEST 324END_TEST
@@ -334,7 +334,7 @@ START_TEST(eolian_typedef)
334 const char *file; 334 const char *file;
335 335
336 eolian_init(); 336 eolian_init();
337 Eolian *eos = eolian_new(); 337 Eolian_State *eos = eolian_state_new();
338 /* Parsing */ 338 /* Parsing */
339 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 339 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
340 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/typedef.eo"))); 340 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/typedef.eo")));
@@ -402,7 +402,7 @@ START_TEST(eolian_typedef)
402 fail_if(!eina_iterator_next(iter, (void**)&tdl)); 402 fail_if(!eina_iterator_next(iter, (void**)&tdl));
403 fail_if(eina_iterator_next(iter, (void**)&tdl)); 403 fail_if(eina_iterator_next(iter, (void**)&tdl));
404 404
405 eolian_free(eos); 405 eolian_state_free(eos);
406 eolian_shutdown(); 406 eolian_shutdown();
407} 407}
408END_TEST 408END_TEST
@@ -419,7 +419,7 @@ START_TEST(eolian_complex_type)
419 void *dummy; 419 void *dummy;
420 420
421 eolian_init(); 421 eolian_init();
422 Eolian *eos = eolian_new(); 422 Eolian_State *eos = eolian_state_new();
423 /* Parsing */ 423 /* Parsing */
424 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 424 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
425 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/complex_type.eo"))); 425 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/complex_type.eo")));
@@ -491,7 +491,7 @@ START_TEST(eolian_complex_type)
491 fail_if(strcmp(type_name, "char *")); 491 fail_if(strcmp(type_name, "char *"));
492 eina_stringshare_del(type_name); 492 eina_stringshare_del(type_name);
493 493
494 eolian_free(eos); 494 eolian_state_free(eos);
495 eolian_shutdown(); 495 eolian_shutdown();
496} 496}
497END_TEST 497END_TEST
@@ -503,7 +503,7 @@ START_TEST(eolian_scope)
503 const Eolian_Unit *unit; 503 const Eolian_Unit *unit;
504 504
505 eolian_init(); 505 eolian_init();
506 Eolian *eos = eolian_new(); 506 Eolian_State *eos = eolian_state_new();
507 /* Parsing */ 507 /* Parsing */
508 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 508 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
509 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/scope.eo"))); 509 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/scope.eo")));
@@ -527,7 +527,7 @@ START_TEST(eolian_scope)
527 fail_if(!(fid = eolian_class_function_get_by_name(class, "foobar", EOLIAN_METHOD))); 527 fail_if(!(fid = eolian_class_function_get_by_name(class, "foobar", EOLIAN_METHOD)));
528 fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PUBLIC); 528 fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PUBLIC);
529 529
530 eolian_free(eos); 530 eolian_state_free(eos);
531 eolian_shutdown(); 531 eolian_shutdown();
532} 532}
533END_TEST 533END_TEST
@@ -546,7 +546,7 @@ START_TEST(eolian_simple_parsing)
546 void *dummy; 546 void *dummy;
547 547
548 eolian_init(); 548 eolian_init();
549 Eolian *eos = eolian_new(); 549 Eolian_State *eos = eolian_state_new();
550 /* Parsing */ 550 /* Parsing */
551 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 551 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
552 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/class_simple.eo"))); 552 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/class_simple.eo")));
@@ -666,7 +666,7 @@ START_TEST(eolian_simple_parsing)
666 fail_if(eolian_function_is_beta(fid)); 666 fail_if(eolian_function_is_beta(fid));
667 fail_if(!eolian_type_is_ptr(eolian_function_return_type_get(fid, EOLIAN_METHOD))); 667 fail_if(!eolian_type_is_ptr(eolian_function_return_type_get(fid, EOLIAN_METHOD)));
668 668
669 eolian_free(eos); 669 eolian_state_free(eos);
670 eolian_shutdown(); 670 eolian_shutdown();
671} 671}
672END_TEST 672END_TEST
@@ -683,7 +683,7 @@ START_TEST(eolian_struct)
683 const char *file; 683 const char *file;
684 684
685 eolian_init(); 685 eolian_init();
686 Eolian *eos = eolian_new(); 686 Eolian_State *eos = eolian_state_new();
687 687
688 /* Parsing */ 688 /* Parsing */
689 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 689 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
@@ -739,7 +739,7 @@ START_TEST(eolian_struct)
739 fail_if(!(tdl = eolian_type_typedecl_get(type))); 739 fail_if(!(tdl = eolian_type_typedecl_get(type)));
740 fail_if(eolian_typedecl_type_get(tdl) != EOLIAN_TYPEDECL_STRUCT); 740 fail_if(eolian_typedecl_type_get(tdl) != EOLIAN_TYPEDECL_STRUCT);
741 741
742 eolian_free(eos); 742 eolian_state_free(eos);
743 eolian_shutdown(); 743 eolian_shutdown();
744} 744}
745END_TEST 745END_TEST
@@ -751,7 +751,7 @@ START_TEST(eolian_extern)
751 const Eolian_Unit *unit; 751 const Eolian_Unit *unit;
752 752
753 eolian_init(); 753 eolian_init();
754 Eolian *eos = eolian_new(); 754 Eolian_State *eos = eolian_state_new();
755 755
756 /* Parsing */ 756 /* Parsing */
757 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 757 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
@@ -777,7 +777,7 @@ START_TEST(eolian_extern)
777 fail_if(!(tdl = eolian_typedecl_struct_get_by_name(unit, "Y"))); 777 fail_if(!(tdl = eolian_typedecl_struct_get_by_name(unit, "Y")));
778 fail_if(!eolian_typedecl_is_extern(tdl)); 778 fail_if(!eolian_typedecl_is_extern(tdl));
779 779
780 eolian_free(eos); 780 eolian_state_free(eos);
781 eolian_shutdown(); 781 eolian_shutdown();
782} 782}
783END_TEST 783END_TEST
@@ -793,7 +793,7 @@ START_TEST(eolian_var)
793 const char *name; 793 const char *name;
794 794
795 eolian_init(); 795 eolian_init();
796 Eolian *eos = eolian_new(); 796 Eolian_State *eos = eolian_state_new();
797 797
798 /* Parsing */ 798 /* Parsing */
799 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 799 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
@@ -845,7 +845,7 @@ START_TEST(eolian_var)
845 fail_if(strcmp(name, "double")); 845 fail_if(strcmp(name, "double"));
846 fail_if(eolian_variable_value_get(var)); 846 fail_if(eolian_variable_value_get(var));
847 847
848 eolian_free(eos); 848 eolian_state_free(eos);
849 eolian_shutdown(); 849 eolian_shutdown();
850} 850}
851END_TEST 851END_TEST
@@ -864,7 +864,7 @@ START_TEST(eolian_enum)
864 Eolian_Value v; 864 Eolian_Value v;
865 865
866 eolian_init(); 866 eolian_init();
867 Eolian *eos = eolian_new(); 867 Eolian_State *eos = eolian_state_new();
868 868
869 /* Parsing */ 869 /* Parsing */
870 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 870 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
@@ -949,7 +949,7 @@ START_TEST(eolian_enum)
949 fail_if(v.type != EOLIAN_EXPR_INT); 949 fail_if(v.type != EOLIAN_EXPR_INT);
950 fail_if(v.value.i != 5); 950 fail_if(v.value.i != 5);
951 951
952 eolian_free(eos); 952 eolian_state_free(eos);
953 eolian_shutdown(); 953 eolian_shutdown();
954} 954}
955END_TEST 955END_TEST
@@ -961,7 +961,7 @@ START_TEST(eolian_class_funcs)
961 const Eolian_Unit *unit; 961 const Eolian_Unit *unit;
962 962
963 eolian_init(); 963 eolian_init();
964 Eolian *eos = eolian_new(); 964 Eolian_State *eos = eolian_state_new();
965 /* Parsing */ 965 /* Parsing */
966 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 966 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
967 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/class_funcs.eo"))); 967 fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/class_funcs.eo")));
@@ -988,7 +988,7 @@ START_TEST(eolian_class_funcs)
988 fail_if(eolian_function_is_class(fid)); 988 fail_if(eolian_function_is_class(fid));
989 fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PROTECTED); 989 fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PROTECTED);
990 990
991 eolian_free(eos); 991 eolian_state_free(eos);
992 eolian_shutdown(); 992 eolian_shutdown();
993} 993}
994END_TEST 994END_TEST
@@ -1001,7 +1001,7 @@ START_TEST(eolian_free_func)
1001 const Eolian_Unit *unit; 1001 const Eolian_Unit *unit;
1002 1002
1003 eolian_init(); 1003 eolian_init();
1004 Eolian *eos = eolian_new(); 1004 Eolian_State *eos = eolian_state_new();
1005 1005
1006 /* Parsing */ 1006 /* Parsing */
1007 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 1007 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
@@ -1037,7 +1037,7 @@ START_TEST(eolian_free_func)
1037 fail_if(!(type = eolian_typedecl_base_type_get(tdl))); 1037 fail_if(!(type = eolian_typedecl_base_type_get(tdl)));
1038 fail_if(strcmp(eolian_type_free_func_get(type), "ptr_free")); 1038 fail_if(strcmp(eolian_type_free_func_get(type), "ptr_free"));
1039 1039
1040 eolian_free(eos); 1040 eolian_state_free(eos);
1041 eolian_shutdown(); 1041 eolian_shutdown();
1042} 1042}
1043END_TEST 1043END_TEST
@@ -1051,7 +1051,7 @@ START_TEST(eolian_null)
1051 Eina_Iterator *iter; 1051 Eina_Iterator *iter;
1052 1052
1053 eolian_init(); 1053 eolian_init();
1054 Eolian *eos = eolian_new(); 1054 Eolian_State *eos = eolian_state_new();
1055 1055
1056 /* Parsing */ 1056 /* Parsing */
1057 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 1057 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
@@ -1089,7 +1089,7 @@ START_TEST(eolian_null)
1089 fail_if(eina_iterator_next(iter, (void**)&param)); 1089 fail_if(eina_iterator_next(iter, (void**)&param));
1090 eina_iterator_free(iter); 1090 eina_iterator_free(iter);
1091 1091
1092 eolian_free(eos); 1092 eolian_state_free(eos);
1093 eolian_shutdown(); 1093 eolian_shutdown();
1094} 1094}
1095END_TEST 1095END_TEST
@@ -1101,7 +1101,7 @@ START_TEST(eolian_import)
1101 const Eolian_Unit *unit; 1101 const Eolian_Unit *unit;
1102 1102
1103 eolian_init(); 1103 eolian_init();
1104 Eolian *eos = eolian_new(); 1104 Eolian_State *eos = eolian_state_new();
1105 1105
1106 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 1106 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
1107 1107
@@ -1114,7 +1114,7 @@ START_TEST(eolian_import)
1114 fail_if(!(tdl = eolian_typedecl_struct_get_by_name(unit, "Imported_Struct"))); 1114 fail_if(!(tdl = eolian_typedecl_struct_get_by_name(unit, "Imported_Struct")));
1115 fail_if(strcmp(eolian_typedecl_file_get(tdl), "import_types.eot")); 1115 fail_if(strcmp(eolian_typedecl_file_get(tdl), "import_types.eot"));
1116 1116
1117 eolian_free(eos); 1117 eolian_state_free(eos);
1118 eolian_shutdown(); 1118 eolian_shutdown();
1119} 1119}
1120END_TEST 1120END_TEST
@@ -1129,7 +1129,7 @@ START_TEST(eolian_decl)
1129 Eina_Iterator *itr; 1129 Eina_Iterator *itr;
1130 1130
1131 eolian_init(); 1131 eolian_init();
1132 Eolian *eos = eolian_new(); 1132 Eolian_State *eos = eolian_state_new();
1133 1133
1134 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 1134 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
1135 1135
@@ -1178,7 +1178,7 @@ START_TEST(eolian_decl)
1178 fail_if(!(decl = eolian_declaration_get_by_name(unit, "A"))); 1178 fail_if(!(decl = eolian_declaration_get_by_name(unit, "A")));
1179 fail_if(eolian_declaration_type_get(decl) != EOLIAN_DECL_STRUCT); 1179 fail_if(eolian_declaration_type_get(decl) != EOLIAN_DECL_STRUCT);
1180 1180
1181 eolian_free(eos); 1181 eolian_state_free(eos);
1182 eolian_shutdown(); 1182 eolian_shutdown();
1183} 1183}
1184END_TEST 1184END_TEST
@@ -1198,7 +1198,7 @@ START_TEST(eolian_docs)
1198 Eina_Iterator *itr; 1198 Eina_Iterator *itr;
1199 1199
1200 eolian_init(); 1200 eolian_init();
1201 Eolian *eos = eolian_new(); 1201 Eolian_State *eos = eolian_state_new();
1202 1202
1203 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 1203 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
1204 1204
@@ -1424,7 +1424,7 @@ START_TEST(eolian_docs)
1424 "Event docs.")); 1424 "Event docs."));
1425 fail_if(eolian_documentation_description_get(doc)); 1425 fail_if(eolian_documentation_description_get(doc));
1426 1426
1427 eolian_free(eos); 1427 eolian_state_free(eos);
1428 eolian_shutdown(); 1428 eolian_shutdown();
1429} 1429}
1430END_TEST 1430END_TEST
@@ -1442,7 +1442,7 @@ START_TEST(eolian_function_types)
1442 void *dummy; 1442 void *dummy;
1443 1443
1444 eolian_init(); 1444 eolian_init();
1445 Eolian *eos = eolian_new(); 1445 Eolian_State *eos = eolian_state_new();
1446 1446
1447 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 1447 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
1448 1448
@@ -1552,7 +1552,7 @@ START_TEST(eolian_function_types)
1552 1552
1553 fail_if(eina_iterator_next(iter, &dummy)); 1553 fail_if(eina_iterator_next(iter, &dummy));
1554 1554
1555 eolian_free(eos); 1555 eolian_state_free(eos);
1556 eolian_shutdown(); 1556 eolian_shutdown();
1557} 1557}
1558END_TEST 1558END_TEST
@@ -1570,7 +1570,7 @@ START_TEST(eolian_function_as_arguments)
1570 void *dummy; 1570 void *dummy;
1571 1571
1572 eolian_init(); 1572 eolian_init();
1573 Eolian *eos = eolian_new(); 1573 Eolian_State *eos = eolian_state_new();
1574 1574
1575 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 1575 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
1576 1576
@@ -1594,7 +1594,7 @@ START_TEST(eolian_function_as_arguments)
1594 1594
1595 fail_if(eina_iterator_next(iter, &dummy)); 1595 fail_if(eina_iterator_next(iter, &dummy));
1596 1596
1597 eolian_free(eos); 1597 eolian_state_free(eos);
1598 eolian_shutdown(); 1598 eolian_shutdown();
1599} 1599}
1600END_TEST 1600END_TEST
@@ -1612,7 +1612,7 @@ START_TEST(eolian_parts)
1612 }; 1612 };
1613 1613
1614 eolian_init(); 1614 eolian_init();
1615 Eolian *eos = eolian_new(); 1615 Eolian_State *eos = eolian_state_new();
1616 1616
1617 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data")); 1617 fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
1618 1618
@@ -1641,7 +1641,7 @@ START_TEST(eolian_parts)
1641 } 1641 }
1642 eina_iterator_free(iter); 1642 eina_iterator_free(iter);
1643 1643
1644 eolian_free(eos); 1644 eolian_state_free(eos);
1645 eolian_shutdown(); 1645 eolian_shutdown();
1646} 1646}
1647END_TEST 1647END_TEST