Merge pull request #250 from ACRIOS-Systems/feature/improve_enum_usage

Improve enum usage in unions.

Author: MichalPrincNXP

erpcgen/src/PythonGenerator.cpp

@@ -690,6 +690,56 @@ data_map PythonGenerator::getTypeInfo(DataType *t)
                 data_map caseData;
                 caseData["name"] = unionCase->getCaseName();
                 caseData["value"] = unionCase->getCaseValue();
+                if (info.has("discriminatorType") && (info["discriminatorType"].get().get()->getmap()["type"]->getvalue() == "enum"))
+                {
+                    caseData["type"] = info["discriminatorType"];
+                }
+                else if (unionCase->getCaseName() != "")
+                {
+                    for (auto it : m_globals->getSymbolsOfType(DataType::kEnumTypeSymbol))
+                    {
+                        EnumType *enumType = dynamic_cast<EnumType *>(it);
+                        assert(enumType);
+                        for (auto itMember :enumType->getMembers())
+                        {
+                            if (unionCase->getCaseName() == itMember->getName())
+                            {
+                                data_map typeInfo;
+                                typeInfo["name"] = enumType->getName();
+                                typeInfo["type"] = "enum";
+                                caseData["type"] = typeInfo;
+                                break;
+                            }
+                        }
+                        if(caseData.has("type"))
+                        {
+                            break;
+                        }
+                    }
+                    if(!caseData.has("type"))
+                    {
+                        for (auto it : m_globals->getSymbolsOfType(DataType::kConstSymbol))
+                        {
+                            ConstType *constType = dynamic_cast<ConstType *>(it);
+                            assert(constType);
+                            if (unionCase->getCaseName() == constType->getName())
+                            {
+                                data_map typeInfo;
+                                typeInfo["name"] = "";
+                                typeInfo["type"] = "const";
+                                caseData["type"] = typeInfo;
+                                break;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    data_map typeInfo;
+                    typeInfo["name"] = "";
+                    typeInfo["type"] = "";
+                    caseData["type"] = typeInfo;
+                }
                 data_list caseMembers;
                 data_map caseMembersFree;
 

erpcgen/src/templates/py_coders.template

@@ -111,7 +111,7 @@ codec.start_write_union({$self}{$info.discriminatorName})
 {%    set defaultCase = c %}
 {%   elif not c.isVoid %}
 {%    set hasNonVoidCase = true %}
-{$indent}{$"if" if isFirst else "elif"} {$self}{$info.discriminatorName} == {$c.value}:
+{$indent}{$"if" if isFirst else "elif"} {$self}{$info.discriminatorName} == {% if c.name != "" && (c.type.type == "enum" || c.type.type == "const") %}{% if c.type.name != "" %}{$c.type.name}.{%  endif %}{$c.name}{% else %}{$c.value}{%  endif %}:
 {%    for cm in c.members %}
 {%     if cm.isNullable %}
 {$indent}    if {$name}.{$cm.name} is None:
@@ -171,7 +171,7 @@ codec.start_write_union({$self}{$info.discriminatorName})
 {%    set defaultCase = c %}
 {%   elif not c.isVoid %}
 {%    set hasNonVoidCase = true %}
-{$indent}{$"if" if isFirst else "elif"} {$self}{$info.discriminatorName} == {$c.value}:
+{$indent}{$"if" if isFirst else "elif"} {$self}{$info.discriminatorName} == {% if c.name != "" && (c.type.type == "enum" || c.type.type == "const") %}{% if c.type.name != "" %}{$c.type.name}.{%  endif %}{$c.name}{% else %}{$c.value}{%  endif %}:
 {%    for cm in c.members %}
 {%     if cm.isNullable %}
 {$indent}    if not {$codec}.read_null_flag()

erpcgen/test/test_union_py.yml

@@ -52,60 +52,60 @@ test/common.py:
   - blah = None # int32
   - def _read(self, codec)
   - discriminator = codec.start_read_union()
-  - if discriminator == 0
+  - if discriminator == fruitType.apple
   - self.myFoobar = foobar()._read(codec)
-  - elif discriminator == 2
+  - elif discriminator == fruitType.banana
   - self.x = codec.read_int32()
   - self.y = codec.read_float()
-  - elif discriminator == 5
+  - elif discriminator == fruitType.papaya
   - self.x = codec.read_int32()
   - self.y = codec.read_float()
-  - elif discriminator == 1
+  - elif discriminator == fruitType.orange
   - _n1 = codec.start_read_list()
   - self.a = []
   - for _i1 in range(_n1)
   - _v1 = codec.read_int32()
   - self.a.append(_v1)
-  - elif discriminator == 3
+  - elif discriminator == fruitType.coconut
   - self.cx = codec.read_uint32()
   - _n1 = codec.start_read_list()
   - self.cc = []
   - for _i1 in range(_n1)
   - _v1 = codec.read_int32()
   - self.cc.append(_v1)
-  - elif discriminator == 10
+  - elif discriminator == returnVal
   - self.ret = codec.read_int32()
   - else # default case
   - self.c = codec.read_bool()
   - self.blah = codec.read_int32()
   - return self, discriminator
   - def _write(self, codec, discriminator)
   - codec.start_write_union(discriminator)
-  - if discriminator == 0
+  - if discriminator == fruitType.apple
   - if self.myFoobar is None
   - raise ValueError("self.myFoobar is None")
   - self.myFoobar._write(codec)
-  - elif discriminator == 2
+  - elif discriminator == fruitType.banana
   - if self.x is None
   - raise ValueError("self.x is None")
   - codec.write_int32(self.x)
   - if self.y is None
   - raise ValueError("self.y is None")
   - codec.write_float(self.y)
-  - elif discriminator == 5
+  - elif discriminator == fruitType.papaya
   - if self.x is None
   - raise ValueError("self.x is None")
   - codec.write_int32(self.x)
   - if self.y is None
   - raise ValueError("self.y is None")
   - codec.write_float(self.y)
-  - elif discriminator == 1
+  - elif discriminator == fruitType.orange
   - if self.a is None
   - raise ValueError("self.a is None")
   - codec.start_write_list(len(self.a))
   - for _i1 in self.a
   - codec.write_int32(_i1)
-  - elif discriminator == 3
+  - elif discriminator == fruitType.coconut
   - if self.cx is None
   - raise ValueError("self.cx is None")
   - codec.write_uint32(self.cx)
@@ -114,7 +114,7 @@ test/common.py:
   - codec.start_write_list(len(self.cc))
   - for _i1 in self.cc
   - codec.write_int32(_i1)
-  - elif discriminator == 10
+  - elif discriminator == returnVal
   - if self.ret is None
   - raise ValueError("self.ret is None")
   - codec.write_int32(self.ret)