diff options
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/eolian/data/class_simple.eo | 13 | ||||
| -rw-r--r-- | src/tests/eolian/data/class_simple_ref.c | 12 | ||||
| -rw-r--r-- | src/tests/eolian/data/class_simple_ref.legacy.c | 12 | ||||
| -rw-r--r-- | src/tests/eolian/data/class_simple_ref_eo.h | 4 | ||||
| -rw-r--r-- | src/tests/eolian/data/class_simple_ref_legacy.h | 41 | ||||
| -rw-r--r-- | src/tests/eolian/data/docs.eo | 1 | ||||
| -rw-r--r-- | src/tests/eolian/data/docs_ref_legacy.h | 119 | ||||
| -rw-r--r-- | src/tests/eolian/eolian_generation.c | 5 | ||||
| -rw-r--r-- | src/tests/eolian/eolian_parsing.c | 15 | ||||
| -rw-r--r-- | src/tests/eolian_cxx/docs.eo | 1 |
10 files changed, 0 insertions, 223 deletions
diff --git a/src/tests/eolian/data/class_simple.eo b/src/tests/eolian/data/class_simple.eo index 6d9e59ddd7..0a89c5eea7 100644 --- a/src/tests/eolian/data/class_simple.eo +++ b/src/tests/eolian/data/class_simple.eo @@ -8,7 +8,6 @@ var @extern Bah: double; // not generated class Class_Simple { [[Class Desc Simple]] - legacy_prefix: evas_object_simple; eo_prefix: efl_canvas_object_simple; data: Evas_Simple_Data; methods { @@ -24,11 +23,6 @@ class Class_Simple { value: int (100); [[Value description]] } } - @property b { - set { - eo: null; - } - } foo @beta { [[comment foo]] params { @@ -39,12 +33,5 @@ class Class_Simple { } return: ptr(char) (null); [[comment for method return]] } - bar { - eo: null; - params { - x: int; - } - return: ptr(int); - } } } diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c index 5d1af350e6..46b4dda8f1 100644 --- a/src/tests/eolian/data/class_simple_ref.c +++ b/src/tests/eolian/data/class_simple_ref.c @@ -32,10 +32,6 @@ __eolian_class_simple_a_get_reflect(Eo *obj) EOAPI EFL_FUNC_BODY_CONST(efl_canvas_object_simple_a_get, int, 100); -void _class_simple_b_set(Eo *obj, Evas_Simple_Data *pd); - -EOAPI EFL_VOID_FUNC_BODY(efl_canvas_object_simple_b_set); - char *_class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, char *b, double *c, int *d); static char *__eolian_class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, char *b, double *c, int *d) @@ -46,10 +42,6 @@ static char *__eolian_class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, cha EOAPI EFL_FUNC_BODYV(efl_canvas_object_simple_foo, char *, NULL /* null */, EFL_FUNC_CALL(a, b, c, d), int a, char *b, double *c, int *d); -int *_class_simple_bar(Eo *obj, Evas_Simple_Data *pd, int x); - -EOAPI EFL_FUNC_BODYV(efl_canvas_object_simple_bar, int *, NULL, EFL_FUNC_CALL(x), int x); - static Eina_Bool _class_simple_class_initializer(Efl_Class *klass) { @@ -64,9 +56,7 @@ _class_simple_class_initializer(Efl_Class *klass) EFL_OPS_DEFINE(ops, EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_a_set, _class_simple_a_set), EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_a_get, _class_simple_a_get), - EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_b_set, _class_simple_b_set), EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_foo, __eolian_class_simple_foo), - EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_bar, _class_simple_bar), CLASS_SIMPLE_EXTRA_OPS ); opsp = &ops; @@ -93,5 +83,3 @@ static const Efl_Class_Description _class_simple_class_desc = { }; EFL_DEFINE_CLASS(class_simple_class_get, &_class_simple_class_desc, NULL, NULL); - -#include "eolian_class_simple.eo.legacy.c" diff --git a/src/tests/eolian/data/class_simple_ref.legacy.c b/src/tests/eolian/data/class_simple_ref.legacy.c deleted file mode 100644 index b0f922864a..0000000000 --- a/src/tests/eolian/data/class_simple_ref.legacy.c +++ /dev/null @@ -1,12 +0,0 @@ - -EAPI void -evas_object_simple_b_set(Class_Simple *obj) -{ - efl_canvas_object_simple_b_set(obj); -} - -EAPI int * -evas_object_simple_bar(Class_Simple *obj, int x) -{ - return efl_canvas_object_simple_bar(obj, x); -} diff --git a/src/tests/eolian/data/class_simple_ref_eo.h b/src/tests/eolian/data/class_simple_ref_eo.h index 1b63422e7b..60e6fe27e2 100644 --- a/src/tests/eolian/data/class_simple_ref_eo.h +++ b/src/tests/eolian/data/class_simple_ref_eo.h @@ -70,8 +70,6 @@ EOAPI Eina_Bool efl_canvas_object_simple_a_set(Eo *obj, int value); EOAPI int efl_canvas_object_simple_a_get(const Eo *obj); #endif /* EFL_BETA_API_SUPPORT */ -EOAPI void efl_canvas_object_simple_b_set(Eo *obj); - #ifdef EFL_BETA_API_SUPPORT /** * @brief comment foo @@ -89,6 +87,4 @@ EOAPI void efl_canvas_object_simple_b_set(Eo *obj); EOAPI char *efl_canvas_object_simple_foo(Eo *obj, int a, char *b, double *c, int *d); #endif /* EFL_BETA_API_SUPPORT */ -EOAPI int *efl_canvas_object_simple_bar(Eo *obj, int x); - #endif diff --git a/src/tests/eolian/data/class_simple_ref_legacy.h b/src/tests/eolian/data/class_simple_ref_legacy.h deleted file mode 100644 index 39320a4ddb..0000000000 --- a/src/tests/eolian/data/class_simple_ref_legacy.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef _EOLIAN_CLASS_SIMPLE_EO_LEGACY_H_ -#define _EOLIAN_CLASS_SIMPLE_EO_LEGACY_H_ - -#ifndef _CLASS_SIMPLE_EO_CLASS_TYPE -#define _CLASS_SIMPLE_EO_CLASS_TYPE - -typedef Eo Class_Simple; - -#endif - -#ifndef _CLASS_SIMPLE_EO_TYPES -#define _CLASS_SIMPLE_EO_TYPES - -#ifndef FOO -/** doc for constant - * - * @ingroup Foo - */ -#define FOO 5 -#endif - -/** doc for global - * - * @ingroup Bar - */ -EWAPI extern float BAR; - -/** in header but not in source - * - * @ingroup Baz - */ -EWAPI extern long BAZ; - - -#endif - -EAPI void evas_object_simple_b_set(Class_Simple *obj); - -EAPI int *evas_object_simple_bar(Class_Simple *obj, int x); - -#endif diff --git a/src/tests/eolian/data/docs.eo b/src/tests/eolian/data/docs.eo index f6bea43744..c81c6e2851 100644 --- a/src/tests/eolian/data/docs.eo +++ b/src/tests/eolian/data/docs.eo @@ -53,7 +53,6 @@ class Docs { @since 1.18 ]] - legacy_prefix: docs; methods { meth { [[Method documentation.]] diff --git a/src/tests/eolian/data/docs_ref_legacy.h b/src/tests/eolian/data/docs_ref_legacy.h deleted file mode 100644 index 8057c7aa7c..0000000000 --- a/src/tests/eolian/data/docs_ref_legacy.h +++ /dev/null @@ -1,119 +0,0 @@ -#ifndef _EOLIAN_DOCS_EO_LEGACY_H_ -#define _EOLIAN_DOCS_EO_LEGACY_H_ - -#ifndef _DOCS_EO_CLASS_TYPE -#define _DOCS_EO_CLASS_TYPE - -typedef Eo Docs; - -#endif - -#ifndef _DOCS_EO_TYPES -#define _DOCS_EO_TYPES - -/** - * @brief This is struct Foo. It does stuff. - * - * @note This is a note. - * - * This is a longer description for struct Foo. - * - * @warning This is a warning. You can only use Warning: and Note: at the - * beginning of a paragraph. - * - * This is another paragraph. - * - * @since 1.66 - * - * @ingroup Foo - */ -typedef struct _Foo -{ - int field1; /**< Field documentation. */ - float field2; - short field3; /**< Another field documentation. */ -} Foo; - -/** Docs for enum Bar. - * - * @ingroup Bar - */ -typedef enum -{ - BAR_BLAH = 0, - BAR_FOO = 1, /**< Docs for foo. */ - BAR_BAR = 2 /**< Docs for bar. */ -} Bar; - -/** - * @brief Docs for typedef. - * - * More docs for typedef. See @ref Bar. - * - * @since 2.0 - * - * @ingroup Alias - */ -typedef Bar Alias; - -/** Docs for var. - * - * @ingroup pants - */ -EWAPI extern int PANTS; - -/** Opaque struct docs. See @ref Foo for another struct. - * - * @ingroup Opaque - */ -typedef struct _Opaque Opaque; - - -#endif - -/** - * @brief Method documentation. - * - * @param[in] obj The object. - * @param[in] a Param documentation. - * @param[out] b - * @param[out] c Another param documentation. - * - * @return Return documentation. - * - * @since 1.18 - * - * @ingroup Docs_Group - */ -EAPI int docs_meth(Docs *obj, int a, float *b, long *c); - -/** - * @brief Property common documentation. - * - * Set documentation. - * - * @param[in] obj The object. - * @param[in] val Value documentation. - * - * @since 1.18 - * - * @ingroup Docs_Group - */ -EAPI void docs_prop_set(Docs *obj, int val); - -/** - * @brief Property common documentation. - * - * Get documentation. - * - * @param[in] obj The object. - * - * @return Value documentation. - * - * @since 1.18 - * - * @ingroup Docs_Group - */ -EAPI int docs_prop_get(const Docs *obj); - -#endif diff --git a/src/tests/eolian/eolian_generation.c b/src/tests/eolian/eolian_generation.c index 6a43f1fc23..2fe0be6267 100644 --- a/src/tests/eolian/eolian_generation.c +++ b/src/tests/eolian/eolian_generation.c @@ -141,7 +141,6 @@ EFL_START_TEST(eolian_default_values_generation) _remove_ref(output_filepath, "eo.c"); fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/class_simple.eo", "-gc", output_filepath)); fail_if(!_files_compare(TESTS_SRC_DIR"/data/class_simple_ref.c", output_filepath, "eo.c")); - fail_if(!_files_compare(TESTS_SRC_DIR"/data/class_simple_ref.legacy.c", output_filepath, "eo.legacy.c")); } EFL_END_TEST @@ -164,9 +163,7 @@ EFL_START_TEST(eolian_functions_descriptions) _remove_ref(output_filepath, "eo.h"); fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/class_simple.eo", "-gh", output_filepath)); fail_if(!_files_compare(TESTS_SRC_DIR"/data/class_simple_ref_eo.h", output_filepath, "eo.h")); - _remove_ref(output_filepath, "eo.legacy.h"); fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/class_simple.eo", "-gl", output_filepath)); - fail_if(!_files_compare(TESTS_SRC_DIR"/data/class_simple_ref_legacy.h", output_filepath, "eo.legacy.h")); } EFL_END_TEST @@ -189,9 +186,7 @@ EFL_START_TEST(eolian_docs) _remove_ref(output_filepath, "eo.h"); fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/docs.eo", "-gh", output_filepath)); fail_if(!_files_compare(TESTS_SRC_DIR"/data/docs_ref.h", output_filepath, "eo.h")); - _remove_ref(output_filepath, "eo.legacy.h"); fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/docs.eo", "-gl", output_filepath)); - fail_if(!_files_compare(TESTS_SRC_DIR"/data/docs_ref_legacy.h", output_filepath, "eo.legacy.h")); } EFL_END_TEST diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c index 3d2b4dbcfe..de1a740aa5 100644 --- a/src/tests/eolian/eolian_parsing.c +++ b/src/tests/eolian/eolian_parsing.c @@ -563,7 +563,6 @@ EFL_START_TEST(eolian_simple_parsing) fail_if(eolian_class_type_get(class) != EOLIAN_CLASS_REGULAR); fail_if(eolian_class_parent_get(class) != NULL); fail_if(eolian_class_extensions_get(class) != NULL); - fail_if(strcmp(eolian_class_legacy_prefix_get(class), "evas_object_simple")); fail_if(strcmp(eolian_class_eo_prefix_get(class), "efl_canvas_object_simple")); fail_if(strcmp(eolian_class_data_type_get(class), "Evas_Simple_Data")); Eina_Stringshare *dt = eolian_class_c_data_type_get(class); @@ -613,13 +612,6 @@ EFL_START_TEST(eolian_simple_parsing) fail_if(v.type != EOLIAN_EXPR_INT); fail_if(v.value.i != 100); - /* legacy only + c only */ - fail_if(eolian_class_function_by_name_get(class, "b", EOLIAN_PROPERTY)); - fail_if(!(fid = eolian_class_function_by_name_get(class, "b", EOLIAN_PROP_SET))); - fail_if(eolian_function_is_legacy_only(fid, EOLIAN_PROP_GET)); - fail_if(!eolian_function_is_legacy_only(fid, EOLIAN_PROP_SET)); - fail_if(eolian_function_is_beta(fid)); - /* Method */ fail_if(!(fid = eolian_class_function_by_name_get(class, "foo", EOLIAN_METHOD))); fail_if(!eolian_function_is_beta(fid)); @@ -635,7 +627,6 @@ EFL_START_TEST(eolian_simple_parsing) fail_if(!expr); v = eolian_expression_eval(expr, EOLIAN_MASK_NULL); fail_if(v.type != EOLIAN_EXPR_NULL); - fail_if(eolian_function_is_legacy_only(fid, EOLIAN_METHOD)); /* Function parameters */ fail_if(!(iter = eolian_function_parameters_get(fid))); @@ -666,12 +657,6 @@ EFL_START_TEST(eolian_simple_parsing) fail_if(eina_iterator_next(iter, &dummy)); eina_iterator_free(iter); - /* legacy only + c only */ - fail_if(!(fid = eolian_class_function_by_name_get(class, "bar", EOLIAN_METHOD))); - fail_if(!eolian_function_is_legacy_only(fid, EOLIAN_METHOD)); - fail_if(eolian_function_is_beta(fid)); - fail_if(!eolian_type_is_ptr(eolian_function_return_type_get(fid, EOLIAN_METHOD))); - eolian_state_free(eos); } EFL_END_TEST diff --git a/src/tests/eolian_cxx/docs.eo b/src/tests/eolian_cxx/docs.eo index 5ca93f02f2..5249b7196e 100644 --- a/src/tests/eolian_cxx/docs.eo +++ b/src/tests/eolian_cxx/docs.eo @@ -53,7 +53,6 @@ class Docs { @since 1.17 ]] - legacy_prefix: docs; methods { meth { [[Method documentation.]] |