Merge pull request #74 from ros/fix_default_value_non_primitive_fixed…

…_size_arrays fix default value for non-primitive fixed-size arrays
ros · Feb 27, 2017 · 45ecd54 · 45ecd54
2 parents 9ee0460 + e91679e
commit 45ecd54
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/genpy/generator.py b/src/genpy/generator.py
@@ -156,9 +156,17 @@ def default_value(msg_context, field_type, default_package):
                 return "b''"
         elif array_len is None: #var-length
             return '[]'
-        else: # fixed-length, fill values
+        else:
+            # fixed-length
             def_val = default_value(msg_context, base_type, default_package)
-            return '[' + def_val + '] * ' + str(array_len)
+            if base_type in [
+                'byte', 'int8', 'int16', 'int32', 'int64', 'uint16', 'uint32',
+                'uint64', 'float32', 'float64', 'string', 'bool'
+            ]:  # fill primitive values
+                return '[' + def_val + '] * ' + str(array_len)
+            else:  # fill values with distinct instances
+                def_val = default_value(msg_context, base_type, default_package)
+                return '[' + def_val + ' for _ in range(' + str(array_len) + ')]'
     else:
         return compute_constructor(msg_context, default_package, field_type)
 

diff --git a/test/test_genpy_generator.py b/test/test_genpy_generator.py
@@ -170,7 +170,7 @@ def test_default_value():
     assert b'\0\0\0\0' == eval(default_value(msg_context, 'uint8[4]', 'roslib'))
 
     assert '[]' == default_value(msg_context, 'fake_msgs/String[]', 'std_msgs')
-    assert '[fake_msgs.msg.String()] * 2' == default_value(msg_context, 'fake_msgs/String[2]', 'std_msgs')
+    assert '[fake_msgs.msg.String() for _ in range(2)]' == default_value(msg_context, 'fake_msgs/String[2]', 'std_msgs')
 
 def test_make_python_safe():
     from genpy.generator import make_python_safe