summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-10-13 23:48:34 +0200
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-07 18:00:04 +0900
commit81ef814cdb88850fc8d1d5b89c941309902959c8 (patch)
tree45111e71a8bb1682814786bb4ee16b951a3aaa2b
parent18388f33c78702a3ffee284a4e687976c2119031 (diff)
downloadefl-81ef814cdb88850fc8d1d5b89c941309902959c8.tar.gz
eolian: fix setter generation for @auto functions
Because of a typo in generator source (and overlooked error in tests) we were previously generating incorrect code for setters with the @auto qualifier. This was brought up in D5306 and is now fixed.
-rw-r--r--src/bin/eolian/sources.c2
-rw-r--r--src/tests/eolian/data/override_ref.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/eolian/sources.c b/src/bin/eolian/sources.c
index d1ab3d5870..097293add0 100644
--- a/src/bin/eolian/sources.c
+++ b/src/bin/eolian/sources.c
@@ -281,7 +281,7 @@ _gen_func(const Eolian_Unit *src, const Eolian_Class *cl,
if (is_auto)
{
if (ftype == EOLIAN_PROP_SET)
- eina_strbuf_append_printf(params_init, " %s = pd->%s;\n", prn, prn);
+ eina_strbuf_append_printf(params_init, " pd->%s = %s;\n", prn, prn);
else
{
eina_strbuf_append_printf(params_init, " if (%s) *%s = pd->%s;\n",
diff --git a/src/tests/eolian/data/override_ref.c b/src/tests/eolian/data/override_ref.c
index 967914a09d..95ee937ae0 100644
--- a/src/tests/eolian/data/override_ref.c
+++ b/src/tests/eolian/data/override_ref.c
@@ -6,9 +6,9 @@ EOAPI 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)
{
- a = pd->a;
- b = pd->b;
- c = pd->c;
+ pd->a = a;
+ pd->b = b;
+ 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);
@@ -42,9 +42,9 @@ void _override_base_constructor(Eo *obj, Override_Data *pd);
static void __eolian_override_base_z_set(Eo *obj EINA_UNUSED, Override_Data *pd, int a, char b, float c)
{
- a = pd->a;
- b = pd->b;
- c = pd->c;
+ pd->a = a;
+ pd->b = b;
+ pd->c = c;
}