fixing format for .. and ...

Author: mmatera

mathics/core/expression.py

@@ -345,9 +345,10 @@ def do_format(self, evaluation, form):
         try:
             expr = self
             head = self.get_head_name()
+            leaves = self.get_leaves()
             include_form = False
-            if head in formats and len(self.get_leaves()) == 1:
-                expr = self.leaves[0]
+            if head in formats and len(leaves) == 1:
+                expr = leaves
                 if not (form == 'System`OutputForm' and head == 'System`StandardForm'):
                     form = head
 
@@ -367,9 +368,34 @@ def format_expr(expr):
                 return None
 
             if form != 'System`FullForm':
+                # Repeated and RepeatedNull confuse the formatter,
+                # so we need to hardlink their format rules:
+                if head == "System`Repeated":
+                    if len(leaves)==1:
+                        return Expression("System`HoldForm",
+                                      Expression("System`Postfix",
+                                      Expression(
+                                          "System`List",
+                                          leaves[0]
+                                      ),"..",170))
+                    else:
+                        return Expression("System`HoldForm",expr)
+                elif head == "System`RepeatedNull":
+                    if len(leaves)==1:
+                        return Expression("System`HoldForm",
+                                      Expression("System`Postfix",
+                                      Expression(
+                                          "System`List",
+                                          leaves[0]
+                                      ),"...",170))
+                    else:
+                        return Expression("System`HoldForm",expr)
+                
                 formatted = format_expr(expr)
                 if formatted is not None:
+                    print("   formated: ",formatted)
                     result = formatted.do_format(evaluation, form)
+                    print("   result: ", result)                    
                     if include_form:
                         result = Expression(form, result)
                     result.unformatted = unformatted
@@ -379,7 +405,8 @@ def format_expr(expr):
                 if head in formats:
                     expr = expr.do_format(evaluation, form)
                 elif (head != 'System`NumberForm' and not expr.is_atom() and
-                      head != 'System`Graphics'):
+                      head != 'System`Graphics' and
+                      not head in ("Repeat", "RepeatNull") ):
                     new_leaves = [leaf.do_format(evaluation, form)
                                   for leaf in expr.leaves]
                     expr = Expression(