Optimize and fix bug in container output.

Author: mkskeller

Compiler/library.py

@@ -106,8 +106,10 @@ def print_plain_str(ss):
                 raise CompilerError('Cannot print secret value:', args[i])
             elif isinstance(val, cfloat):
                 val.print_float_plain()
-            elif isinstance(val, (list, tuple, Array, SubMultiArray)):
+            elif isinstance(val, (list, tuple)):
                 print_str(*_expand_to_print(val), print_secrets=print_secrets)
+            elif isinstance(val, (Array, SubMultiArray)):
+                val.output(print_secrets=print_secrets)
             else:
                 try:
                     val.output()

Compiler/types.py

@@ -6415,6 +6415,12 @@ def _(i):
             library.print_str('%s', self[self.length - 1].reveal())
             library.print_str(']' + end)
 
+    def output(self, **kwargs):
+        try:
+            library.print_str('%s', self[:], **kwargs)
+        except:
+            MultiArray.output(self, **kwargs)
+
     def reveal_to_binary_output(self, player=None):
         """ Reveal to binary output if supported by type.
 
@@ -7392,6 +7398,13 @@ def _(i):
             self[len(self) - 1].print_reveal_nested(end='')
             library.print_str(']' + end)
 
+    def output(self, **kwargs):
+        library.print_str('[')
+        @library.for_range(len(self) - 1)
+        def _(i):
+            library.print_str('%s, ', self[i], **kwargs)
+        library.print_str('%s]', self[len(self) - 1], **kwargs)
+
     def reveal_to_binary_output(self, player=None):
         """ Reveal to binary output if supported by type.