fixing all derivate classes of BoxConstruct

Author: mmatera

mathics/builtin/base.py

@@ -603,6 +603,10 @@ def __new__(cls, *leaves, **kwargs):
         instance._leaves = leaves
         return instance
 
+    def evaluate(self, evaluation):
+        # Shall here evaluate the leaves?
+        return
+    
     def get_lookup_name(self):
         return self.get_name()
 

mathics/builtin/compilation.py

@@ -149,20 +149,26 @@ def __hash__(self):
         return hash(("CompiledCode", ctypes.addressof(self.cfunc)))  # XXX hack
 
     def atom_to_boxes(self, f, evaluation):
-        return Expression('CompiledCodeBox')
+        return CompiledCodeBox(String("Nocode"))
 
 
 class CompiledCodeBox(BoxConstruct):
     """
     Used internally by <i>CompileCode[]</i>.
     """
-    def boxes_to_text(self, leaves, **options):
+    def boxes_to_text(self, leaves=None, **options):
+        if not leaves:
+            leaves = self._leaves
         return '-CompiledCode-'
 
-    def boxes_to_xml(self, leaves, **options):
+    def boxes_to_xml(self, leaves=None, **options):
+        if not leaves:
+            leaves = self._leaves
         return '-CompiledCode-'
 
-    def boxes_to_tex(self, leaves, **options):
+    def boxes_to_tex(self, leaves=None, **options):
+        if not leaves:
+            leaves = self._leaves        
         return '-CompiledCode-'
 
 

mathics/builtin/image.py

@@ -2124,18 +2124,20 @@ def test(self, expr):
 
 
 class ImageBox(BoxConstruct):
-    def boxes_to_text(self, leaves, **options):
+    def boxes_to_text(self, leaves=None, **options):
         return "-Image-"
 
-    def boxes_to_xml(self, leaves, **options):
+    def boxes_to_xml(self, leaves=None, **options):
+        if leaves is None:
+            leaves = self._leaves
         # see https://tools.ietf.org/html/rfc2397
         return '<mglyph src="%s" width="%dpx" height="%dpx" />' % (
             leaves[0].get_string_value(),
             leaves[1].get_int_value(),
             leaves[2].get_int_value(),
         )
 
-    def boxes_to_tex(self, leaves, **options):
+    def boxes_to_tex(self, leaves=None, **options):
         return "-Image-"
 
 
@@ -2259,8 +2261,7 @@ def atom_to_boxes(self, f, evaluation):
         encoded = base64.b64encode(contents)
         encoded = b"data:image/png;base64," + encoded
 
-        return Expression(
-            "ImageBox", String(encoded), Integer(scaled_width), Integer(scaled_height)
+        return ImageBox(String(encoded), Integer(scaled_width), Integer(scaled_height)
         )
 
     def __str__(self):

mathics/builtin/inout.py

@@ -791,7 +791,9 @@ def get_array(self, leaves, evaluation):
             raise BoxConstructError
         return items, options
 
-    def boxes_to_tex(self, leaves, **box_options) -> str:
+    def boxes_to_tex(self, leaves=None, **box_options) -> str:
+        if not leaves:
+            leaves = self._leaves
         evaluation = box_options.get('evaluation')
         items, options = self.get_array(leaves, evaluation)
         new_box_options = box_options.copy()
@@ -811,14 +813,16 @@ def boxes_to_tex(self, leaves, **box_options) -> str:
             column_count = max(column_count, len(row))
         result = r'\begin{array}{%s} ' % (column_alignments * column_count)
         for index, row in enumerate(items):
-            result += ' & '.join(item.boxes_to_tex(**new_box_options)
+            result += ' & '.join(item.evaluate(evaluation).boxes_to_tex(**new_box_options)
                                  for item in row)
             if index != len(items) - 1:
                 result += '\\\\ '
         result += r'\end{array}'
         return result
 
-    def boxes_to_xml(self, leaves, **box_options) -> str:
+    def boxes_to_xml(self, leaves=None, **box_options) -> str:
+        if not leaves:
+            leaves = self._leaves
         evaluation = box_options.get('evaluation')
         items, options = self.get_array(leaves, evaluation)
         attrs = {}
@@ -855,8 +859,7 @@ def boxes_to_text(self, leaves=None, **box_options) -> str:
         if not items:
             return ''
         widths = [0] * len(items[0])
-        cells = [[item.boxes_to_text(**box_options).splitlines()
-                  for item in row] for row in items]
+        cells = [[item.evaluate(evaluation).boxes_to_text(**box_options).splitlines() for item in row] for row in items]
         for row in cells:
             for index, cell in enumerate(row):
                 if index >= len(widths):
@@ -907,14 +910,12 @@ class Grid(Builtin):
     def apply_makeboxes(self, array, f, evaluation, options) -> Expression:
         '''MakeBoxes[Grid[array_?MatrixQ, OptionsPattern[Grid]],
             f:StandardForm|TraditionalForm|OutputForm]'''
-
-        return Expression(
-            'GridBox',
-            Expression('List', *(
+        return GridBox(Expression('List', *(
                 Expression('List', *(
                     Expression('MakeBoxes', item, f) for item in row.leaves))
                 for row in array.leaves)),
             *options_to_rules(options))
+#        return Expression('GridBox',Expression('List', *(Expression('List', *(Expression('MakeBoxes', item, f) for item in row.leaves)) for row in array.leaves)),            *options_to_rules(options))
 
 
 class TableForm(Builtin):
@@ -974,10 +975,13 @@ def apply_makeboxes(self, table, f, evaluation, options):
         if depth <= 0:
             return Expression('MakeBoxes', table, f)
         elif depth == 1:
-            return Expression(
-                'GridBox', Expression('List', *(
+            return GridBox( Expression('List', *(
                     Expression('List', Expression('MakeBoxes', item, f))
                     for item in table.leaves)))
+            #return Expression(
+            #    'GridBox', Expression('List', *(
+            #        Expression('List', Expression('MakeBoxes', item, f))
+            #        for item in table.leaves)))
         else:
             new_depth = Expression('Rule', Symbol('TableDepth'), depth - 2)
 
@@ -987,8 +991,7 @@ def transform_item(item):
                 else:
                     return item
 
-            return Expression(
-                'GridBox', Expression('List', *(
+            return GridBox(Expression('List', *(
                     Expression('List', *(
                         Expression('MakeBoxes', transform_item(item), f)
                         for item in row.leaves)) for row in table.leaves)))
@@ -2011,11 +2014,9 @@ def apply_mathml(self, expr, evaluation) -> Expression:
         'MakeBoxes[expr_, MathMLForm]'
 
         boxes = MakeBoxes(expr).evaluate(evaluation)
-        print("=====MakeBoxes, MathMLForm  boxes=",boxes)
         try:
             xml = boxes.boxes_to_xml(evaluation=evaluation)
         except BoxError:
-            print("======error")
             evaluation.message(
                 'General', 'notboxes',
                 Expression('FullForm', boxes).evaluate(evaluation))

mathics/core/expression.py

@@ -454,6 +454,7 @@ def format_expr(expr):
                   head != 'System`Graphics'):
                 new_leaves = [leaf.do_format(evaluation, form)
                               for leaf in expr.leaves]
+                formathead = expr.head.do_format(evaluation, form)
                 expr = Expression(
                     expr.head.do_format(evaluation, form), *new_leaves)
 
@@ -660,8 +661,8 @@ class Expression(BaseExpression):
     leaves: typing.List[Any]
     _sequences: Any
 
-    def __new__(cls, head, *leaves) -> 'Expression':
-        self = super(Expression, cls).__new__(cls)
+    def __new__(cls, head, *leaves, **kwargs) -> 'Expression':
+        self = super(Expression, cls).__new__(cls)    
         if isinstance(head, str):
             head = Symbol(head)
         self._head = head