Merge branch 'master' of github.com:pyecore/pyecoregen

Author: aranega

pyecoregen/ecore.py

@@ -109,7 +109,14 @@ class EcoreGenerator(multigen.jinja.JinjaGenerator):
 
     @staticmethod
     def test_type(value, type_):
-        """Jinja test to check object type."""
+        """Jinja test to check if an object's class is exactly the tested type."""
+        return value.__class__ is type_
+
+    @staticmethod
+    def test_kind(value, type_):
+        """Jinja test to check the 'kind' or an object.
+        An object is 'kind' of a type when the object's class isinstance from the tested type.
+        """
         return isinstance(value, type_)
 
     @staticmethod
@@ -208,6 +215,7 @@ def create_environment(self, **kwargs):
         environment = super().create_environment(**kwargs)
         environment.tests.update({
             'type': self.test_type,
+            'kind': self.test_kind,
             'opposite_before_self': self.test_opposite_before_self,
         })
         environment.filters.update({

pyecoregen/templates/module.py.tpl

@@ -136,10 +136,10 @@ class {{ c.name }}({{ c | supertypes }}):
 
 {#- -------------------------------------------------------------------------------------------- -#}
 
-{%- for c in element.eClassifiers if c is type(ecore.EEnum) %}
+{%- for c in element.eClassifiers if c is type(ecore.EEnum) -%}
 {{ generate_enum(c) }}
 {%- endfor %}
-{%- for c in element.eClassifiers if c is type(ecore.EDataType) and c is not type(ecore.EEnum)%}
+{% for c in element.eClassifiers if c is type(ecore.EDataType) -%}
 {{ generate_edatatype(c) }}
 {%- endfor %}
 

pyecoregen/templates/package.py.tpl

@@ -46,7 +46,7 @@ eSuperPackage = {{ element.eSuperPackage.name | default('None') }}
     {%- endwith %}
 {%- endif %}
 
-otherClassifiers = [{{ element.eClassifiers | select('type', ecore.EDataType) | map(attribute='name') | join(', ') }}]
+otherClassifiers = [{{ element.eClassifiers | select('kind', ecore.EDataType) | map(attribute='name') | join(', ') }}]
 
 for classif in otherClassifiers:
     eClassifiers[classif.name] = classif