xartigas pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3a570c38c99a4db729cded66c2e23c62cc3b033a
commit 3a570c38c99a4db729cded66c2e23c62cc3b033a Author: Lauro Moura <[email protected]> Date: Tue May 7 13:44:23 2019 +0200 csharp: Add Part suffix for the part wrappers Reviewers: segfaultxavi Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8835 --- src/bin/eolian_mono/eolian/mono/name_helpers.hh | 2 +- src/tests/efl_mono/Parts.cs | 4 ++-- src/tests/efl_mono/dummy_part_holder.eo | 4 ++-- src/tests/efl_mono/libefl_mono_native_test.c | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/bin/eolian_mono/eolian/mono/name_helpers.hh b/src/bin/eolian_mono/eolian/mono/name_helpers.hh index 1ae35cab6d..ca36d0492a 100644 --- a/src/bin/eolian_mono/eolian/mono/name_helpers.hh +++ b/src/bin/eolian_mono/eolian/mono/name_helpers.hh @@ -282,7 +282,7 @@ inline std::string property_managed_name(attributes::property_def const& propert inline std::string managed_part_name(attributes::part_def const& part) { std::vector<std::string> names = utils::split(part.name, '_'); - return utils::to_pascal_case(names); + return utils::to_pascal_case(names) + "Part"; } // Class name translation (interface/concrete/inherit/etc) diff --git a/src/tests/efl_mono/Parts.cs b/src/tests/efl_mono/Parts.cs index 50527c1c63..3de0b6c94b 100644 --- a/src/tests/efl_mono/Parts.cs +++ b/src/tests/efl_mono/Parts.cs @@ -30,8 +30,8 @@ public static class TestParts private static void do_part_test(Dummy.PartHolder t) { - var p1 = t.PartOne; - var p2 = t.PartTwo; + var p1 = t.OnePart; + var p2 = t.TwoPart; Test.Assert(p1 is Dummy.TestObject); Test.AssertEquals("part_one", p1.GetName()); Test.Assert(p2 is Dummy.TestObject); diff --git a/src/tests/efl_mono/dummy_part_holder.eo b/src/tests/efl_mono/dummy_part_holder.eo index 2dc5ad79f2..d65fd12e5b 100644 --- a/src/tests/efl_mono/dummy_part_holder.eo +++ b/src/tests/efl_mono/dummy_part_holder.eo @@ -3,8 +3,8 @@ import eina_types; class @beta Dummy.Part_Holder extends Dummy.Test_Object implements Efl.Part { parts { - part_one: Dummy.Test_Object; [[ Part number one. ]] - part_two: Dummy.Test_Object; [[ Part number two. ]] + one: Dummy.Test_Object; [[ Part number one. ]] + two: Dummy.Test_Object; [[ Part number two. ]] } implements { Efl.Part.part_get; diff --git a/src/tests/efl_mono/libefl_mono_native_test.c b/src/tests/efl_mono/libefl_mono_native_test.c index 52d9190994..0201a6a026 100644 --- a/src/tests/efl_mono/libefl_mono_native_test.c +++ b/src/tests/efl_mono/libefl_mono_native_test.c @@ -92,8 +92,8 @@ typedef struct Dummy_Child_Data typedef struct Dummy_Part_Holder_Data { - Eo *part_one; - Eo *part_two; + Eo *one; + Eo *two; } Dummy_Part_Holder_Data; typedef struct Dummy_Inherit_Helper_Data @@ -4057,8 +4057,8 @@ _dummy_part_holder_efl_object_constructor(Eo *obj, Dummy_Part_Holder_Data *pd) // To avoid an infinite loop calling the same constructor if (!efl_parent_get(obj)) { - pd->part_one = efl_add(DUMMY_TEST_OBJECT_CLASS, obj, efl_name_set(efl_added, "part_one")); - pd->part_two = efl_add(DUMMY_TEST_OBJECT_CLASS, obj, efl_name_set(efl_added, "part_two")); + pd->one = efl_add(DUMMY_TEST_OBJECT_CLASS, obj, efl_name_set(efl_added, "part_one")); + pd->two = efl_add(DUMMY_TEST_OBJECT_CLASS, obj, efl_name_set(efl_added, "part_two")); } return obj; @@ -4066,10 +4066,10 @@ _dummy_part_holder_efl_object_constructor(Eo *obj, Dummy_Part_Holder_Data *pd) Efl_Object *_dummy_part_holder_efl_part_part_get(EINA_UNUSED const Eo *obj, Dummy_Part_Holder_Data *pd, const char *name) { - if (!strcmp(name, "part_one")) - return pd->part_one; - else if (!strcmp(name, "part_two")) - return pd->part_two; + if (!strcmp(name, "one")) + return pd->one; + else if (!strcmp(name, "two")) + return pd->two; else return NULL; } --
