diff options
Diffstat (limited to 'src/tests/eolian/data')
42 files changed, 246 insertions, 89 deletions
diff --git a/src/tests/eolian/data/base.eo b/src/tests/eolian/data/base.eo index 4f1b93d518..ddfd5716d7 100644 --- a/src/tests/eolian/data/base.eo +++ b/src/tests/eolian/data/base.eo @@ -1,4 +1,5 @@ abstract Base { + [[Docs for abstract class Base. @since 1.66]] methods { @property z { values { diff --git a/src/tests/eolian/data/class_funcs.eo b/src/tests/eolian/data/class_funcs.eo index 087f380003..7d72d2fca2 100644 --- a/src/tests/eolian/data/class_funcs.eo +++ b/src/tests/eolian/data/class_funcs.eo @@ -1,4 +1,5 @@ class Class_Funcs { + [[Docs for class Class_Funcs. @since 1.66]] methods { @property a @static { get { diff --git a/src/tests/eolian/data/class_requires.eo b/src/tests/eolian/data/class_requires.eo index ffbb4fef8d..fb33314c87 100644 --- a/src/tests/eolian/data/class_requires.eo +++ b/src/tests/eolian/data/class_requires.eo @@ -2,6 +2,7 @@ import base; import mixins_require; class Class.Requires extends Base implements Mixins.Require { + [[Docs for class Class.Requires. @since 1.66]] methods { } diff --git a/src/tests/eolian/data/class_simple.eo b/src/tests/eolian/data/class_simple.eo index 12ea743b48..a912f001b0 100644 --- a/src/tests/eolian/data/class_simple.eo +++ b/src/tests/eolian/data/class_simple.eo @@ -1,9 +1,9 @@ #version 1 -const Foo: int = 5; [[doc for constant]] +const Foo: int = 5; [[doc for constant @since 1.66]] class Class_Simple { - [[Class Desc Simple]] + [[Class Desc Simple @since 1.66]] c_prefix: efl_canvas_object_simple; data: Evas_Simple_Data; methods { diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c index d11055ae5e..d80b0e3b38 100644 --- a/src/tests/eolian/data/class_simple_ref.c +++ b/src/tests/eolian/data/class_simple_ref.c @@ -17,7 +17,7 @@ __eolian_class_simple_a_set_reflect(Eo *obj, Eina_Value val) return r; } -EOAPI EFL_FUNC_BODYV(efl_canvas_object_simple_a_set, Eina_Bool, EINA_TRUE /* true */, EFL_FUNC_CALL(value), int value); +EAPI EAPI_WEAK EFL_FUNC_BODYV(efl_canvas_object_simple_a_set, Eina_Bool, EINA_TRUE /* true */, EFL_FUNC_CALL(value), int value); int _class_simple_a_get(const Eo *obj, Evas_Simple_Data *pd); @@ -29,7 +29,7 @@ __eolian_class_simple_a_get_reflect(const Eo *obj) return eina_value_int_init(val); } -EOAPI EFL_FUNC_BODY_CONST(efl_canvas_object_simple_a_get, int, 100); +EAPI EAPI_WEAK EFL_FUNC_BODY_CONST(efl_canvas_object_simple_a_get, int, 100); char *_class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, char *b, double *c, int *d); @@ -39,7 +39,7 @@ static char *__eolian_class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, cha return _class_simple_foo(obj, pd, a, b, c, d); } -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); +EAPI EAPI_WEAK 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); static Eina_Bool _class_simple_class_initializer(Efl_Class *klass) diff --git a/src/tests/eolian/data/class_simple_ref_eo.h b/src/tests/eolian/data/class_simple_ref_eo.h index d0a6d02ce8..56142c569b 100644 --- a/src/tests/eolian/data/class_simple_ref_eo.h +++ b/src/tests/eolian/data/class_simple_ref_eo.h @@ -14,6 +14,8 @@ typedef Eo Class_Simple; #ifndef FOO /** doc for constant * + * @since 1.66 + * * @ingroup Foo */ #define FOO 5 @@ -23,11 +25,13 @@ typedef Eo Class_Simple; #endif /** Class Desc Simple * + * @since 1.66 + * * @ingroup Class_Simple */ #define CLASS_SIMPLE_CLASS class_simple_class_get() -EWAPI const Efl_Class *class_simple_class_get(void); +EAPI EAPI_WEAK const Efl_Class *class_simple_class_get(void) EINA_CONST; #ifdef EFL_BETA_API_SUPPORT /** @@ -40,9 +44,11 @@ EWAPI const Efl_Class *class_simple_class_get(void); * * @return comment for property set return * + * @since 1.66 + * * @ingroup Class_Simple */ -EOAPI Eina_Bool efl_canvas_object_simple_a_set(Eo *obj, int value); +EAPI EAPI_WEAK Eina_Bool efl_canvas_object_simple_a_set(Eo *obj, int value); #endif /* EFL_BETA_API_SUPPORT */ #ifdef EFL_BETA_API_SUPPORT @@ -53,9 +59,11 @@ EOAPI Eina_Bool efl_canvas_object_simple_a_set(Eo *obj, int value); * * @return Value description * + * @since 1.66 + * * @ingroup Class_Simple */ -EOAPI int efl_canvas_object_simple_a_get(const Eo *obj); +EAPI EAPI_WEAK int efl_canvas_object_simple_a_get(const Eo *obj); #endif /* EFL_BETA_API_SUPPORT */ #ifdef EFL_BETA_API_SUPPORT @@ -70,9 +78,11 @@ EOAPI int efl_canvas_object_simple_a_get(const Eo *obj); * * @return comment for method return * + * @since 1.66 + * * @ingroup Class_Simple */ -EOAPI char *efl_canvas_object_simple_foo(Eo *obj, int a, char *b, double *c, int *d); +EAPI EAPI_WEAK char *efl_canvas_object_simple_foo(Eo *obj, int a, char *b, double *c, int *d); #endif /* EFL_BETA_API_SUPPORT */ #endif diff --git a/src/tests/eolian/data/complex_type.eo b/src/tests/eolian/data/complex_type.eo index 9cb6a1faf1..82613a1641 100644 --- a/src/tests/eolian/data/complex_type.eo +++ b/src/tests/eolian/data/complex_type.eo @@ -1,6 +1,6 @@ class Complex_Type { methods { - @property a { + @property a @beta { set { return: list<array<strbuf @move> > @move; } @@ -10,7 +10,7 @@ class Complex_Type { value: list<string> @move; } } - foo { + foo @beta { params { buf: mstring @move; sl: slice<ubyte>; diff --git a/src/tests/eolian/data/consts.eo b/src/tests/eolian/data/consts.eo index 9505e95387..953310541d 100644 --- a/src/tests/eolian/data/consts.eo +++ b/src/tests/eolian/data/consts.eo @@ -1,4 +1,5 @@ class Consts { + [[Docs for class Consts. @since 1.66]] methods { foo @const { [[comment foo]] diff --git a/src/tests/eolian/data/ctor_dtor.eo b/src/tests/eolian/data/ctor_dtor.eo index 71bdcede81..0e82c23520 100644 --- a/src/tests/eolian/data/ctor_dtor.eo +++ b/src/tests/eolian/data/ctor_dtor.eo @@ -1,4 +1,5 @@ class Ctor_Dtor extends Base { + [[Docs for class Ctor_Dtor. @since 1.66]] methods { custom_constructor_1 { params { diff --git a/src/tests/eolian/data/docs_ref.h b/src/tests/eolian/data/docs_ref.h index a00fafb5a5..00bf52ee07 100644 --- a/src/tests/eolian/data/docs_ref.h +++ b/src/tests/eolian/data/docs_ref.h @@ -60,7 +60,7 @@ typedef enum * * More docs for typedef. See @ref Bar. * - * @since 2.0 + * @since 1.1337 * * @ingroup Alias */ @@ -69,6 +69,8 @@ typedef Bar Alias; #ifndef PANTS /** Docs for var. * + * @since 1.66 + * * @ingroup pants */ #define PANTS 150 @@ -76,6 +78,8 @@ typedef Bar Alias; /** Opaque struct docs. See @ref Foo for another struct. * + * @since 1.66 + * * @ingroup Opaque */ typedef struct _Opaque Opaque; @@ -89,13 +93,13 @@ typedef struct _Opaque Opaque; * @ref PANTS @ref eo_docs_meth @ref eo_docs_prop_get @ref eo_docs_prop_get * @ref eo_docs_prop_set @ref Foo.field1 @ref BAR_FOO @ref Eo_Docs * - * @since 1.18 + * @since 1.66 * * @ingroup Eo_Docs */ #define EO_DOCS_CLASS eo_docs_class_get() -EWAPI const Efl_Class *eo_docs_class_get(void); +EAPI EAPI_WEAK const Efl_Class *eo_docs_class_get(void) EINA_CONST; /** * @brief Method documentation. @@ -107,11 +111,11 @@ EWAPI const Efl_Class *eo_docs_class_get(void); * * @return Return documentation. * - * @since 1.18 + * @since 1.66 * * @ingroup Eo_Docs */ -EOAPI int eo_docs_meth(Eo *obj, int a, float *b, long *c); +EAPI EAPI_WEAK int eo_docs_meth(Eo *obj, int a, float *b, long *c); /** * @brief Property common documentation. @@ -121,11 +125,11 @@ EOAPI int eo_docs_meth(Eo *obj, int a, float *b, long *c); * @param[in] obj The object. * @param[in] val Value documentation. * - * @since 1.18 + * @since 1.66 * * @ingroup Eo_Docs */ -EOAPI void eo_docs_prop_set(Eo *obj, int val); +EAPI EAPI_WEAK void eo_docs_prop_set(Eo *obj, int val); /** * @brief Property common documentation. @@ -136,27 +140,27 @@ EOAPI void eo_docs_prop_set(Eo *obj, int val); * * @return Value documentation. * - * @since 1.18 + * @since 1.66 * * @ingroup Eo_Docs */ -EOAPI int eo_docs_prop_get(const Eo *obj); +EAPI EAPI_WEAK int eo_docs_prop_get(const Eo *obj); -EOAPI void eo_docs_no_doc_meth(Eo *obj); +EAPI EAPI_WEAK void eo_docs_no_doc_meth(Eo *obj); /** No description supplied. * - * @since 1.18 + * @since 1.66 * * @ingroup Eo_Docs */ -EOAPI void eo_docs_doc_with_empty_doc(Eo *obj); +EAPI EAPI_WEAK void eo_docs_doc_with_empty_doc(Eo *obj); -EWAPI extern const Efl_Event_Description _EO_DOCS_EVENT_CLICKED; +EAPI EAPI_WEAK extern const Efl_Event_Description _EO_DOCS_EVENT_CLICKED; /** Event docs. * - * @since 1.18 + * @since 1.66 * * @ingroup Eo_Docs */ diff --git a/src/tests/eolian/data/enum.eo b/src/tests/eolian/data/enum.eo index 0cfc78dd42..cf8115d64a 100644 --- a/src/tests/eolian/data/enum.eo +++ b/src/tests/eolian/data/enum.eo @@ -1,23 +1,27 @@ // regular named enum enum Foo { + [[Docs for enum Foo. @since 1.66]] first, bar, baz = 5 * 3 } enum Baz { + [[Docs for enum Baz. @since 1.66]] flag1 = 1 << 0, flag2 = 1 << 1, flag3 = 1 << 2, // testing trailing comma on last item } enum Name.Spaced { + [[Docs for enum Name.Space. @since 1.66]] pants } -const Bah: Baz = Baz.flag1; +const Bah: Baz = Baz.flag1; [[Docs for var Bah. @since 1.66]] enum Value { + [[Docs for enum Value. @since 1.66]] foo, bar, baz = 2, @@ -26,9 +30,10 @@ enum Value { pants } -const Pants: Value = Value.pants; +const Pants: Value = Value.pants; [[Docs for var Pants. @since 1.66]] class Enum { + [[Docs for class Enum. @since 1.66]] methods { foo { params { diff --git a/src/tests/eolian/data/eo_docs.eo b/src/tests/eolian/data/eo_docs.eo index 8c62559d5a..4857aff665 100644 --- a/src/tests/eolian/data/eo_docs.eo +++ b/src/tests/eolian/data/eo_docs.eo @@ -30,12 +30,12 @@ enum Bar { type Alias: Bar; [[Docs for typedef. More docs for typedef. - See @Bar. @since 2.0 + See @Bar. @since 1.1337 ]] -const pants: int = 150; [[Docs for var.]] +const pants: int = 150; [[Docs for var. @since 1.66]] -struct Opaque; [[Opaque struct docs. See @Foo for another struct.]] +struct Opaque; [[Opaque struct docs. See @Foo for another struct. @since 1.66]] class Eo_Docs { [[Docs for class. @@ -53,7 +53,7 @@ class Eo_Docs { @Bar.foo @Eo_Docs - @since 1.18 + @since 1.66 ]] methods { meth { @@ -67,8 +67,6 @@ class Eo_Docs { } @property prop { [[Property common documentation. - - @since 1.18 ]] get { [[Get documentation.]] diff --git a/src/tests/eolian/data/error.eo b/src/tests/eolian/data/error.eo index 3a5867ac8d..34b1a1a129 100644 --- a/src/tests/eolian/data/error.eo +++ b/src/tests/eolian/data/error.eo @@ -1,4 +1,4 @@ -error Foo = "something bad happened"; [[Error doc]] +error Foo = "something bad happened"; [[Error doc. @since 1.66]] error @beta Bar = "another bad thing happened"; [[Another error doc]] class @beta Error { diff --git a/src/tests/eolian/data/events.eo b/src/tests/eolian/data/events.eo index 95b6a8f43c..04047e1157 100644 --- a/src/tests/eolian/data/events.eo +++ b/src/tests/eolian/data/events.eo @@ -1,4 +1,5 @@ struct Evas_Event_Clicked_Double_Info { + [[Docs for struct Evas_Event_Clicked_Double_Info. @since 1.66]] pants: int; } diff --git a/src/tests/eolian/data/extern.eo b/src/tests/eolian/data/extern.eo index 28ceb7e2aa..455541a809 100644 --- a/src/tests/eolian/data/extern.eo +++ b/src/tests/eolian/data/extern.eo @@ -1,22 +1,23 @@ /* regular type */ -type Foo: int; +type Foo: int; [[Docs for typedef Foo. @since 1.66]] /* extern type */ -type @extern Evas.Coord: int; +type @extern Evas.Coord: int; [[Docs for typedef Evas.Coord. @since 1.66]] /* regular struct */ -struct X -{ +struct X { + [[Docs for struct X. @since 1.66]] field: int; } /* extern struct */ -struct @extern Y -{ +struct @extern Y { + [[Docs for struct Y. @since 1.66]] field: int; } class Extern { + [[Docs for class Extern. @since 1.66]] methods { foo { params { diff --git a/src/tests/eolian/data/free_func.eo b/src/tests/eolian/data/free_func.eo index b10c74db6a..2aee43b294 100644 --- a/src/tests/eolian/data/free_func.eo +++ b/src/tests/eolian/data/free_func.eo @@ -1,16 +1,19 @@ /* regular struct */ struct Named1 { + [[Docs for struct Named1. @since 1.66]] field: int; } struct @free(test_free) Named2 { + [[Docs for struct Named2. @since 1.66]] field: int; } /* opaque */ -struct Opaque1; -struct @free(opaque_free) Opaque2; +struct Opaque1; [[Docs for Opaque1. @since 1.66]] +struct @free(opaque_free) Opaque2; [[Docs for struct Opaque2. @since 1.66]] class Free_Func { + [[Docs for class Free_Func. @since 1.66]] methods { foo { params { diff --git a/src/tests/eolian/data/function_as_argument.eo b/src/tests/eolian/data/function_as_argument.eo index 29b0f4b91c..7d8424c663 100644 --- a/src/tests/eolian/data/function_as_argument.eo +++ b/src/tests/eolian/data/function_as_argument.eo @@ -1,6 +1,7 @@ import function_types; class Function_As_Argument { + [[Docs for class Function_As_Argument. @since 1.66]] methods { set_cb { params { diff --git a/src/tests/eolian/data/function_as_argument_ref.c b/src/tests/eolian/data/function_as_argument_ref.c index 6d3a70d402..926d78693c 100644 --- a/src/tests/eolian/data/function_as_argument_ref.c +++ b/src/tests/eolian/data/function_as_argument_ref.c @@ -1,11 +1,11 @@ void _function_as_argument_set_cb(Eo *obj, Function_As_Argument_Data *pd, void *cb_data, SimpleFunc cb, Eina_Free_Cb cb_free_cb); -EOAPI EFL_VOID_FUNC_BODYV(function_as_argument_set_cb, EFL_FUNC_CALL(cb_data, cb, cb_free_cb), void *cb_data, SimpleFunc cb, Eina_Free_Cb cb_free_cb); +EAPI EAPI_WEAK EFL_VOID_FUNC_BODYV(function_as_argument_set_cb, EFL_FUNC_CALL(cb_data, cb, cb_free_cb), void *cb_data, SimpleFunc cb, Eina_Free_Cb cb_free_cb); char *_function_as_argument_call_cb(Eo *obj, Function_As_Argument_Data *pd, int a, double b); -EOAPI EFL_FUNC_BODYV(function_as_argument_call_cb, char *, NULL, EFL_FUNC_CALL(a, b), int a, double b); +EAPI EAPI_WEAK EFL_FUNC_BODYV(function_as_argument_call_cb, char *, NULL, EFL_FUNC_CALL(a, b), int a, double b); static Eina_Bool _function_as_argument_class_initializer(Efl_Class *klass) diff --git a/src/tests/eolian/data/function_as_argument_ref.h b/src/tests/eolian/data/function_as_argument_ref.h index b93a3e02ed..f79652eade 100644 --- a/src/tests/eolian/data/function_as_argument_ref.h +++ b/src/tests/eolian/data/function_as_argument_ref.h @@ -13,12 +13,18 @@ typedef Eo Function_As_Argument; #endif +/** Docs for class Function_As_Argument. + * + * @since 1.66 + * + * @ingroup Function_As_Argument + */ #define FUNCTION_AS_ARGUMENT_CLASS function_as_argument_class_get() -EWAPI const Efl_Class *function_as_argument_class_get(void); +EAPI EAPI_WEAK const Efl_Class *function_as_argument_class_get(void) EINA_CONST; -EOAPI void function_as_argument_set_cb(Eo *obj, void *cb_data, SimpleFunc cb, Eina_Free_Cb cb_free_cb); +EAPI EAPI_WEAK void function_as_argument_set_cb(Eo *obj, void *cb_data, SimpleFunc cb, Eina_Free_Cb cb_free_cb); -EOAPI char *function_as_argument_call_cb(Eo *obj, int a, double b) EFL_TRANSFER_OWNERSHIP EINA_WARN_UNUSED_RESULT; +EAPI EAPI_WEAK char *function_as_argument_call_cb(Eo *obj, int a, double b) EFL_TRANSFER_OWNERSHIP EINA_WARN_UNUSED_RESULT; #endif diff --git a/src/tests/eolian/data/iface.eo b/src/tests/eolian/data/iface.eo index 153bc0f914..72857f6054 100644 --- a/src/tests/eolian/data/iface.eo +++ b/src/tests/eolian/data/iface.eo @@ -1,4 +1,5 @@ interface Iface { + [[Docs for interface Iface. @since 1.66]] methods { foo {} bar {} diff --git a/src/tests/eolian/data/import.eo b/src/tests/eolian/data/import.eo index 894842487d..258ed454d5 100644 --- a/src/tests/eolian/data/import.eo +++ b/src/tests/eolian/data/import.eo @@ -1,8 +1,9 @@ import import_types; class Import { + [[Docs for class Import. @since 1.66]] methods { foo { } } -}
\ No newline at end of file +} diff --git a/src/tests/eolian/data/mixins_require.eo b/src/tests/eolian/data/mixins_require.eo index 474e1a3af1..ece6f0e82e 100644 --- a/src/tests/eolian/data/mixins_require.eo +++ b/src/tests/eolian/data/mixins_require.eo @@ -2,6 +2,7 @@ import base; import class_simple; mixin Mixins.Require requires Base { + [[Docs for mixin Mixins.Require. @since 1.66]] methods { test { diff --git a/src/tests/eolian/data/nmsp1_class1.eo b/src/tests/eolian/data/nmsp1_class1.eo index a494e5e1c5..e15bfdc0e0 100644 --- a/src/tests/eolian/data/nmsp1_class1.eo +++ b/src/tests/eolian/data/nmsp1_class1.eo @@ -1,5 +1,5 @@ -class nmsp1.class1 extends nmsp1.nmsp11.class2 implements nmsp2.class1, no_nmsp -{ +class nmsp1.class1 extends nmsp1.nmsp11.class2 implements nmsp2.class1, no_nmsp { + [[Docs for class nmsp1.class1. @since 1.66]] implements { nmsp1.nmsp11.class2.a { set; } no_nmsp.foo; diff --git a/src/tests/eolian/data/nmsp1_nmsp11_class2.eo b/src/tests/eolian/data/nmsp1_nmsp11_class2.eo index 40c7b854b9..3a3018832c 100644 --- a/src/tests/eolian/data/nmsp1_nmsp11_class2.eo +++ b/src/tests/eolian/data/nmsp1_nmsp11_class2.eo @@ -1,5 +1,5 @@ -abstract nmsp1.nmsp11.class2 -{ +abstract nmsp1.nmsp11.class2 { + [[Docs for abstract nmsp1.nmsp11.class2. @since 1.66]] methods { @property a { set @pure_virtual { diff --git a/src/tests/eolian/data/nmsp2_class1.eo b/src/tests/eolian/data/nmsp2_class1.eo index e92be95c1d..058f5fefdf 100644 --- a/src/tests/eolian/data/nmsp2_class1.eo +++ b/src/tests/eolian/data/nmsp2_class1.eo @@ -1,3 +1,3 @@ -mixin nmsp2.class1 -{ +mixin nmsp2.class1 { + [[Docs for mixin nmsp2.class1. @since 1.66]] } diff --git a/src/tests/eolian/data/no_nmsp.eo b/src/tests/eolian/data/no_nmsp.eo index daf4313282..30108ffcc9 100644 --- a/src/tests/eolian/data/no_nmsp.eo +++ b/src/tests/eolian/data/no_nmsp.eo @@ -1,5 +1,5 @@ -mixin no_nmsp -{ +mixin no_nmsp { + [[Docs for mixin no_nmsp . @since 1.66]] methods { foo { } diff --git a/src/tests/eolian/data/object_impl.eo b/src/tests/eolian/data/object_impl.eo index 7fe8ce2e24..10d85b2d05 100644 --- a/src/tests/eolian/data/object_impl.eo +++ b/src/tests/eolian/data/object_impl.eo @@ -1,6 +1,9 @@ abstract Object_Impl extends Base { + [[This Object Impl + @since 1.66 + ]] methods { - @property a { + @property a @beta { set { values { value: const(list<string>); @@ -17,25 +20,28 @@ abstract Object_Impl extends Base { } } @property b { + [[Docs for property b. @since 1.66]] set { } get @pure_virtual { /* set as virtual pure - no implementation expected */ } values { - value: list<string> @move; + value: iterator<string> @move; } } constructor_1 { + [[Docs for method constructor_1. @since 1.66]] params { @in a: int; @in b: char; } } constructor_2 { + [[Docs for method constructor_2. @since 1.66]] } foo1 { - [[comment foo]] + [[comment foo. @since 1.66]] params { @in a: int; [[a]] @inout b: char; @@ -44,13 +50,14 @@ abstract Object_Impl extends Base { return: mstring (null); [[comment for method return]] } foo2 @const { - [[comment foo]] + [[comment foo. @since 1.66]] params { @in a: int; @in b: string; } } pure_foo3 @pure_virtual { + [[Docs for method pure_foo3. @since 1.66]] /* set as virtual pure - no implementation expected */ } } diff --git a/src/tests/eolian/data/object_impl_add.eo b/src/tests/eolian/data/object_impl_add.eo index c1e82e2365..b8113a2f01 100644 --- a/src/tests/eolian/data/object_impl_add.eo +++ b/src/tests/eolian/data/object_impl_add.eo @@ -2,7 +2,7 @@ class Object_Impl_Add extends Base { data: Object_Impl_Data; methods { - @property c { + @property c @beta { set { } get { diff --git a/src/tests/eolian/data/object_impl_add_ref.c b/src/tests/eolian/data/object_impl_add_ref.c index f6b8fa5927..55f57578bb 100644 --- a/src/tests/eolian/data/object_impl_add_ref.c +++ b/src/tests/eolian/data/object_impl_add_ref.c @@ -20,7 +20,7 @@ _object_impl_a_get(const Eo *obj, Object_Impl_Data *pd, const char *part) } EOLIAN static void -_object_impl_b_set(Eo *obj, Object_Impl_Data *pd, Eina_List *value) +_object_impl_b_set(Eo *obj, Object_Impl_Data *pd, Eina_Iterator *value) { } diff --git a/src/tests/eolian/data/object_impl_ref.c b/src/tests/eolian/data/object_impl_ref.c index ddc0d7ccd5..32a331529f 100644 --- a/src/tests/eolian/data/object_impl_ref.c +++ b/src/tests/eolian/data/object_impl_ref.c @@ -20,7 +20,7 @@ _object_impl_a_get(const Eo *obj, Object_Impl_Data *pd, const char *part) } EOLIAN static void -_object_impl_b_set(Eo *obj, Object_Impl_Data *pd, Eina_List *value) +_object_impl_b_set(Eo *obj, Object_Impl_Data *pd, Eina_Iterator *value) { } diff --git a/src/tests/eolian/data/override.eo b/src/tests/eolian/data/override.eo index 4cee6008d3..dbd2b50ee9 100644 --- a/src/tests/eolian/data/override.eo +++ b/src/tests/eolian/data/override.eo @@ -1,4 +1,5 @@ abstract Override extends Base { + [[Docs for abstract class Override. @since 1.66]] methods { @property a { set @pure_virtual { diff --git a/src/tests/eolian/data/override_ref.c b/src/tests/eolian/data/override_ref.c index dbbbbae263..e2dec87915 100644 --- a/src/tests/eolian/data/override_ref.c +++ b/src/tests/eolian/data/override_ref.c @@ -1,8 +1,8 @@ -EOAPI EFL_VOID_FUNC_BODY(override_a_set); +EAPI EAPI_WEAK EFL_VOID_FUNC_BODY(override_a_set); void _override_a_get(const Eo *obj, Override_Data *pd); -EOAPI EFL_VOID_FUNC_BODY_CONST(override_a_get); +EAPI EAPI_WEAK EFL_VOID_FUNC_BODY_CONST(override_a_get); static void __eolian_override_b_set(Eo *obj EINA_UNUSED, Override_Data *pd, int idx EINA_UNUSED, float a, char b, int c) { @@ -11,23 +11,23 @@ static void __eolian_override_b_set(Eo *obj EINA_UNUSED, Override_Data *pd, int pd->c = c; } -EOAPI EFL_VOID_FUNC_BODYV(override_b_set, EFL_FUNC_CALL(idx, a, b, c), int idx, float a, char b, int c); +EAPI EAPI_WEAK EFL_VOID_FUNC_BODYV(override_b_set, EFL_FUNC_CALL(idx, a, b, c), int idx, float a, char b, int c); void _override_b_get(const Eo *obj, Override_Data *pd, int idx, float *a, char *b, int *c); -EOAPI EFL_VOID_FUNC_BODYV_CONST(override_b_get, EFL_FUNC_CALL(idx, a, b, c), int idx, float *a, char *b, int *c); +EAPI EAPI_WEAK EFL_VOID_FUNC_BODYV_CONST(override_b_get, EFL_FUNC_CALL(idx, a, b, c), int idx, float *a, char *b, int *c); void _override_c_set(Eo *obj, Override_Data *pd, int idx, int c); -EOAPI EFL_VOID_FUNC_BODYV(override_c_set, EFL_FUNC_CALL(idx, c), int idx, int c); +EAPI EAPI_WEAK EFL_VOID_FUNC_BODYV(override_c_set, EFL_FUNC_CALL(idx, c), int idx, int c); static int __eolian_override_c_get(const Eo *obj EINA_UNUSED, Override_Data *pd EINA_UNUSED, int idx EINA_UNUSED) { return 50; } -EOAPI EFL_FUNC_BODYV_CONST(override_c_get, int, 50, EFL_FUNC_CALL(idx), int idx); -EOAPI EFL_VOID_FUNC_BODY(override_foo); +EAPI EAPI_WEAK EFL_FUNC_BODYV_CONST(override_c_get, int, 50, EFL_FUNC_CALL(idx), int idx); +EAPI EAPI_WEAK EFL_VOID_FUNC_BODY(override_foo); static void __eolian_override_bar(Eo *obj EINA_UNUSED, Override_Data *pd EINA_UNUSED, int idx EINA_UNUSED, int *a, char **str) { @@ -35,7 +35,7 @@ static void __eolian_override_bar(Eo *obj EINA_UNUSED, Override_Data *pd EINA_UN if (str) *str = NULL; } -EOAPI EFL_VOID_FUNC_BODYV(override_bar, EFL_FUNC_CALL(idx, a, str), int idx, int *a, char **str); +EAPI EAPI_WEAK EFL_VOID_FUNC_BODYV(override_bar, EFL_FUNC_CALL(idx, a, str), int idx, int *a, char **str); void _override_base_constructor(Eo *obj, Override_Data *pd); diff --git a/src/tests/eolian/data/owning_ref.c b/src/tests/eolian/data/owning_ref.c index 6c9b30debe..6964944983 100644 --- a/src/tests/eolian/data/owning_ref.c +++ b/src/tests/eolian/data/owning_ref.c @@ -11,7 +11,7 @@ _owning_test1_ownership_fallback(Eina_List *test1, Eina_Iterator *test2, Eina_Ha eina_accessor_free(test4); } -EOAPI EFL_VOID_FUNC_BODYV_FALLBACK(owning_test1, _owning_test1_ownership_fallback(test1, test2, test3, test4);, EFL_FUNC_CALL(test1, test2, test3, test4), Eina_List *test1, Eina_Iterator *test2, Eina_Hash *test3, Eina_Accessor *test4); +EAPI EAPI_WEAK EFL_VOID_FUNC_BODYV_FALLBACK(owning_test1, _owning_test1_ownership_fallback(test1, test2, test3, test4);, EFL_FUNC_CALL(test1, test2, test3, test4), Eina_List *test1, Eina_Iterator *test2, Eina_Hash *test3, Eina_Accessor *test4); void _owning_test2(Eo *obj, Owning_Data *pd, Eina_List *test1, Eina_Hash *test2); @@ -27,7 +27,7 @@ _owning_test2_ownership_fallback(Eina_List *test1, Eina_Hash *test2) eina_hash_free(test2); } -EOAPI EFL_VOID_FUNC_BODYV_FALLBACK(owning_test2, _owning_test2_ownership_fallback(test1, test2);, EFL_FUNC_CALL(test1, test2), Eina_List *test1, Eina_Hash *test2); +EAPI EAPI_WEAK EFL_VOID_FUNC_BODYV_FALLBACK(owning_test2, _owning_test2_ownership_fallback(test1, test2);, EFL_FUNC_CALL(test1, test2), Eina_List *test1, Eina_Hash *test2); static Eina_Bool _owning_class_initializer(Efl_Class *klass) diff --git a/src/tests/eolian/data/scope.eo b/src/tests/eolian/data/scope.eo index def94d1d08..7f4da220bb 100644 --- a/src/tests/eolian/data/scope.eo +++ b/src/tests/eolian/data/scope.eo @@ -1,4 +1,5 @@ class Scope { + [[Docs for class Scope. @since 1.66]] methods { @property a @protected { get { diff --git a/src/tests/eolian/data/struct.eo b/src/tests/eolian/data/struct.eo index 57f250bdbe..96ed3c528e 100644 --- a/src/tests/eolian/data/struct.eo +++ b/src/tests/eolian/data/struct.eo @@ -1,20 +1,24 @@ struct Named { + [[Docs for struct Named. @since 1.66]] field: int @by_ref; something: string; } struct Another { + [[Docs for struct Another. @since 1.66]] field: Named; } /* opaque struct */ -struct Opaque; +struct Opaque; [[Docs for struct Opaque. @since 1.66]] struct @extern Not.Generated { + [[Docs for struct Not.Generated. @since 1.66]] field: int; } class Struct { + [[Docs for class Struct. @since 1.66]] methods { foo { [[Foo docs. This is $monospace. This is alone-standing $.]] diff --git a/src/tests/eolian/data/struct_ref.h b/src/tests/eolian/data/struct_ref.h index ec7ea52671..189ef6b04c 100644 --- a/src/tests/eolian/data/struct_ref.h +++ b/src/tests/eolian/data/struct_ref.h @@ -11,24 +11,48 @@ typedef Eo Struct; #ifndef _STRUCT_EO_TYPES #define _STRUCT_EO_TYPES +/** Docs for struct Named. + * + * @since 1.66 + * + * @ingroup Named + */ typedef struct _Named { int *field; const char *something; } Named; +/** Docs for struct Another. + * + * @since 1.66 + * + * @ingroup Another + */ typedef struct _Another { Named field; } Another; +/** Docs for struct Opaque. + * + * @since 1.66 + * + * @ingroup Opaque + */ typedef struct _Opaque Opaque; #endif +/** Docs for class Struct. + * + * @since 1.66 + * + * @ingroup Struct + */ #define STRUCT_CLASS struct_class_get() -EWAPI const Efl_Class *struct_class_get(void); +EAPI EAPI_WEAK const Efl_Class *struct_class_get(void) EINA_CONST; /** * @brief Foo docs. This is @c monospace. This is alone-standing $. @@ -36,10 +60,12 @@ EWAPI const Efl_Class *struct_class_get(void); * @param[in] obj The object. * @param[in] idx * + * @since 1.66 + * * @ingroup Struct */ -EOAPI char *struct_foo(Eo *obj, int idx) EFL_TRANSFER_OWNERSHIP EINA_WARN_UNUSED_RESULT; +EAPI EAPI_WEAK char *struct_foo(Eo *obj, int idx) EFL_TRANSFER_OWNERSHIP EINA_WARN_UNUSED_RESULT; -EOAPI Named *struct_bar(Eo *obj); +EAPI EAPI_WEAK Named *struct_bar(Eo *obj); #endif diff --git a/src/tests/eolian/data/struct_ref_stub.h b/src/tests/eolian/data/struct_ref_stub.h index 5ef89d3c1a..724509d2b5 100644 --- a/src/tests/eolian/data/struct_ref_stub.h +++ b/src/tests/eolian/data/struct_ref_stub.h @@ -3,10 +3,28 @@ typedef Eo Struct; +/** Docs for struct Named. + * + * @since 1.66 + * + * @ingroup Named + */ typedef struct _Named Named; +/** Docs for struct Another. + * + * @since 1.66 + * + * @ingroup Another + */ typedef struct _Another Another; +/** Docs for struct Opaque. + * + * @since 1.66 + * + * @ingroup Opaque + */ typedef struct _Opaque Opaque; diff --git a/src/tests/eolian/data/typedef.eo b/src/tests/eolian/data/typedef.eo index 916a39fcfc..27aced1b42 100644 --- a/src/tests/eolian/data/typedef.eo +++ b/src/tests/eolian/data/typedef.eo @@ -1,15 +1,15 @@ -type Evas.Coord: int; /* Simple type definition */ -type List_Objects: list<Typedef>; /* A little more complex */ +type Evas.Coord: int; /* Simple type definition */ [[Docs for typedef Evas.Coord. @since 1.66]] +type List_Objects: iterator<Typedef>; /* A little more complex */ [[Docs for typedef List_Objects. @since 1.66]] -type Evas.Coord2: Evas.Coord; -type Evas.Coord3: Evas.Coord2; +type Evas.Coord2: Evas.Coord; [[Docs for typedef Evas.Coord2. @since 1.66]] +type Evas.Coord3: Evas.Coord2; [[Docs for typedef Evas.Coord3. @since 1.66]] -type @extern Evas.Pants: float; /* not generated */ +type @extern Evas.Pants: float; /* not generated */ [[Docs for typedef Evas.Pants. @since 1.66]] type @beta Undef: __undefined_type; /* not generated */ -enum Elm.Object.Select_Mode -{ +enum Elm.Object.Select_Mode { + [[Docs for enum Elm.Object.Select_Mode. @since 1.66]] default = 0, always, none, @@ -18,6 +18,7 @@ enum Elm.Object.Select_Mode } class Typedef { + [[Docs for class Typedef. @since 1.66]] methods { foo { params { diff --git a/src/tests/eolian/data/typedef_ref.h b/src/tests/eolian/data/typedef_ref.h index dd3f3ad85e..616e0a38a7 100644 --- a/src/tests/eolian/data/typedef_ref.h +++ b/src/tests/eolian/data/typedef_ref.h @@ -11,14 +11,44 @@ typedef Eo Typedef; #ifndef _TYPEDEF_EO_TYPES #define _TYPEDEF_EO_TYPES +/** Docs for typedef Evas.Coord. + * + * @since 1.66 + * + * @ingroup Evas_Coord + */ typedef int Evas_Coord; -typedef Eina_List *List_Objects; +/** Docs for typedef List_Objects. + * + * @since 1.66 + * + * @ingroup List_Objects + */ +typedef Eina_Iterator *List_Objects; +/** Docs for typedef Evas.Coord2. + * + * @since 1.66 + * + * @ingroup Evas_Coord2 + */ typedef Evas_Coord Evas_Coord2; +/** Docs for typedef Evas.Coord3. + * + * @since 1.66 + * + * @ingroup Evas_Coord3 + */ typedef Evas_Coord2 Evas_Coord3; +/** Docs for enum Elm.Object.Select_Mode. + * + * @since 1.66 + * + * @ingroup Elm_Object_Select_Mode + */ typedef enum { ELM_OBJECT_SELECT_MODE_DEFAULT = 0, @@ -30,10 +60,16 @@ typedef enum #endif +/** Docs for class Typedef. + * + * @since 1.66 + * + * @ingroup Typedef + */ #define TYPEDEF_CLASS typedef_class_get() -EWAPI const Efl_Class *typedef_class_get(void); +EAPI EAPI_WEAK const Efl_Class *typedef_class_get(void) EINA_CONST; -EOAPI char *typedef_foo(Eo *obj, int idx) EFL_TRANSFER_OWNERSHIP EINA_WARN_UNUSED_RESULT; +EAPI EAPI_WEAK char *typedef_foo(Eo *obj, int idx) EFL_TRANSFER_OWNERSHIP EINA_WARN_UNUSED_RESULT; #endif diff --git a/src/tests/eolian/data/typedef_ref_stub.h b/src/tests/eolian/data/typedef_ref_stub.h index 0f6f4ec38b..fb0adab671 100644 --- a/src/tests/eolian/data/typedef_ref_stub.h +++ b/src/tests/eolian/data/typedef_ref_stub.h @@ -3,12 +3,36 @@ typedef Eo Typedef; +/** Docs for typedef Evas.Coord. + * + * @since 1.66 + * + * @ingroup Evas_Coord + */ typedef int Evas_Coord; -typedef Eina_List *List_Objects; +/** Docs for typedef List_Objects. + * + * @since 1.66 + * + * @ingroup List_Objects + */ +typedef Eina_Iterator *List_Objects; +/** Docs for typedef Evas.Coord2. + * + * @since 1.66 + * + * @ingroup Evas_Coord2 + */ typedef Evas_Coord Evas_Coord2; +/** Docs for typedef Evas.Coord3. + * + * @since 1.66 + * + * @ingroup Evas_Coord3 + */ typedef Evas_Coord2 Evas_Coord3; diff --git a/src/tests/eolian/data/unimpl.eo b/src/tests/eolian/data/unimpl.eo index 1e11a85e93..422fe5f5e0 100644 --- a/src/tests/eolian/data/unimpl.eo +++ b/src/tests/eolian/data/unimpl.eo @@ -1,4 +1,5 @@ class Unimpl composites Iface { + [[Docs for clss Unimpl. @since 1.66]] implements { Iface.foo; } diff --git a/src/tests/eolian/data/var.eo b/src/tests/eolian/data/var.eo index 6424427ae0..c6a29ca62f 100644 --- a/src/tests/eolian/data/var.eo +++ b/src/tests/eolian/data/var.eo @@ -1,7 +1,8 @@ // regular constant -const Foo: int = 5; +const Foo: int = 5; [[Docs for var Foo. @since 1.66]] class Var { + [[Docs for class Var. @since 1.66]] methods { foo { params { |