config.py, tsdl182gen.py: fix Mypy/Pylint errors

diff --git a/barectf/config.py b/barectf/config.py
index 30fdf5a03881794dda7f457c45029419f23a4b4b..552b668b4d7635b6dd15b65a113a00d96265e817 100644 (file)
--- a/barectf/config.py
+++ b/barectf/config.py
@@ -226,7 +226,7 @@ class DynamicArrayFieldType(_ArrayFieldType):
     def __init__(self, length_field_type: UnsignedIntegerFieldType, element_field_type: _FieldType):
         super().__init__(element_field_type)
         self._length_field_type = length_field_type
-        self._length_ft_member_name = None
+        self._length_ft_member_name: Optional[str] = None
 
     @property
     def length_field_type(self):

diff --git a/barectf/templates/metadata/struct-ft.j2 b/barectf/templates/metadata/struct-ft.j2
index a2affa14cd4e7d35e34a99ccf8019ee6a99c53c1..49cabca7b44a6ee134def57483ce5d0d68e51d94 100644 (file)
--- a/barectf/templates/metadata/struct-ft.j2
+++ b/barectf/templates/metadata/struct-ft.j2
@@ -25,6 +25,6 @@
 struct {
 {% for name, member in ft.members.items() %}
        {{ member.field_type | deepest_ft | ft_str | indent_tab }} {{ name }}
-       {%- for len in member.field_type | ft_lengths(name) %}[{{ len }}]{% endfor %};
+       {%- for len in member.field_type | ft_lengths %}[{{ len }}]{% endfor %};
 {% endfor %}
 } align({{ ft.minimum_alignment }})

diff --git a/barectf/tsdl182gen.py b/barectf/tsdl182gen.py
index e2c81c132b6588cef9ec4b06555b60afef26330f..5de785d3522a0e036ea5647a24f91fa65379a730 100644 (file)
--- a/barectf/tsdl182gen.py
+++ b/barectf/tsdl182gen.py
@@ -53,7 +53,7 @@ def _gen_str_ft(ft: barectf_config._FieldType) -> str:
     return _STR_FT_TEMPL.render(ft=ft)
 
 
-def _filt_ft_lengths(ft: barectf_config._FieldType, name: str) -> List[Union[str, int]]:
+def _filt_ft_lengths(ft: barectf_config._FieldType) -> List[Union[str, int]]:
     lengths: List[Union[str, int]] = []
 
     while isinstance(ft, barectf_config._ArrayFieldType):
@@ -63,7 +63,7 @@ def _filt_ft_lengths(ft: barectf_config._FieldType, name: str) -> List[Union[str
         else:
             assert type(ft) is barectf_config.DynamicArrayFieldType
             ft = typing.cast(barectf_config.DynamicArrayFieldType, ft)
-            lengths.append(ft._length_ft_member_name)
+            lengths.append(typing.cast(str, ft._length_ft_member_name))
 
         ft = ft.element_field_type