Move towards segregating box from eval

* Some long lines split
* some linting
* correct a wrong symbol

Author: rocky

mathics/builtin/colors/color_operations.py

@@ -386,7 +386,7 @@ def eval(self, image, n, prop, evaluation, options):
         im = (
             image.color_convert("RGB")
             .pil()
-            .convert("P", palette=PILImage.ADAPTIVE, colors=256)
+            .convert("P", palette=PIL.Image.ADAPTIVE, colors=256)
         )
         pixels = numpy.array(list(im.getdata()))
 

mathics/builtin/layout.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 """
-This module contains symbols used to define the high level layout for
+This module contains symbols used to define the high level layout for \
 expression formatting.
 
-For instance, to represent a set of consecutive expressions in a row,
-we can use ``Row``
+For instance, to represent a set of consecutive expressions in a row, \
+we can use ``Row``.
 
 """
 from typing import Optional, Union
@@ -15,49 +15,53 @@
 from mathics.builtin.lists import list_boxes
 from mathics.builtin.makeboxes import MakeBoxes
 from mathics.builtin.options import options_to_rules
-from mathics.core.atoms import Real, String
+from mathics.core.atoms import Integer, Integer1, Real, String
 from mathics.core.expression import Evaluation, Expression
+from mathics.core.convert.op import operator_to_ascii, operator_to_unicode
+from mathics.core.element import BaseElement
 from mathics.core.list import ListExpression
 from mathics.core.symbols import Atom, Symbol
 from mathics.core.systemsymbols import (
     SymbolFullForm,
-    SymbolInfix,
     SymbolInputForm,
     SymbolLeft,
     SymbolMakeBoxes,
     SymbolNone,
     SymbolOutputForm,
     SymbolRight,
+    SymbolRowBox,
 )
-from mathics.eval.makeboxes import (
-    eval_fullform_makeboxes,
-    format_element,
-    make_boxes_infix,
-)
+from mathics.eval.makeboxes import eval_fullform_makeboxes, format_element, parenthesize
 
 SymbolNonAssociative = Symbol("System`NonAssociative")
 SymbolSubscriptBox = Symbol("System`SubscriptBox")
 
 
-def eval_makeboxes_infix(
+####################################################################
+# This section might get moved to mathics.box
+#
+# Some of the code below get replace Mathics code or may get put in
+# collection of boxing modules,
+# e.g. ``mathics.box.boxes_operators.box_infix()``.
+#
+####################################################################
+
+
+def box_infix(
     expr: Expression,
     operator: BaseElement,
     form: Symbol,
-    evaluation,
-    precedence_value: Optional[int] = None,
+    evaluation: Evaluation,
+    precedence_value: Optional[int] = 0,
     grouping: Optional[str] = None,
-):
-    """Implements MakeBoxes[Infix[...]]."""
-
-    # Actually, this function implements one part of the evaluation:
-    # the one that should be done at the "format" level. In that point,
-    # the operators are processed to add spaces and use the right
-    # encoding. This should be done at the level of the formatter, not
-    # in the "MakeBoxes" step.
-    # Then, the true implementation is done
-    # in  ```mathics.eval.makeboxes.make_boxes_infix```.
-
-    ## FIXME: this should go into a some formatter.
+) -> Optional[Expression]:
+    """Implements MakeBoxes[Infix[...]].
+    This function kicks off boxing for Infix operators.
+
+    Operators are processed to add spaces and to use the right encoding.
+    """
+
+    # FIXME: this should go into a some formatter.
     def format_operator(operator) -> Union[String, BaseElement]:
         """
         Format infix operator `operator`. To do this outside parameter form is used.
@@ -93,7 +97,7 @@ def format_operator(operator) -> Union[String, BaseElement]:
     if len(elements) > 1:
         if operator.has_form("List", len(elements) - 1):
             operator = [format_operator(op) for op in operator.elements]
-            return make_boxes_infix(
+            return box_infix_elements(
                 elements, operator, precedence_value, grouping, form
             )
         else:
@@ -111,17 +115,50 @@ def format_operator(operator) -> Union[String, BaseElement]:
                     String(operator_to_unicode.get(op_str, op_str))
                 )
 
-        return make_boxes_infix(elements, operator, precedence_value, grouping, form)
+        return box_infix_elements(elements, operator, precedence_value, grouping, form)
 
     elif len(elements) == 1:
         return MakeBoxes(elements[0], form)
     else:
         return MakeBoxes(expr, form)
 
 
+# FIXME: op should be a string, so remove the Union.
+def box_infix_elements(
+    elements, op: Union[String, list], precedence: int, grouping, form: Symbol
+) -> Expression:
+    result = []
+    for index, element in enumerate(elements):
+        if index > 0:
+            if isinstance(op, list):
+                result.append(op[index - 1])
+            else:
+                result.append(op)
+        parenthesized = False
+        if grouping == "System`NonAssociative":
+            parenthesized = True
+        elif grouping == "System`Left" and index > 0:
+            parenthesized = True
+        elif grouping == "System`Right" and index == 0:
+            parenthesized = True
+
+        element_boxes = Expression(SymbolMakeBoxes, element, form)
+        element = parenthesize(precedence, element, element_boxes, parenthesized)
+
+        result.append(element)
+    return Expression(SymbolRowBox, ListExpression(*result))
+
+
+####################################################################
+# End of section of code that might be in mathics.box.
+####################################################################
+
+
 class Center(Builtin):
     """
-    <url>:WMA link:https://reference.wolfram.com/language/ref/Center.html</url>
+    <url>
+    :WMA link:
+    https://reference.wolfram.com/language/ref/Center.html</url>
 
     <dl>
       <dt>'Center'
@@ -187,7 +224,7 @@ class Grid(Builtin):
     options = GridBox.options
     summary_text = " 2D layout containing arbitrary objects"
 
-    def eval_makeboxes(self, array, f, evaluation, options) -> Expression:
+    def eval_makeboxes(self, array, f, evaluation: Evaluation, options) -> Expression:
         """MakeBoxes[Grid[array_?MatrixQ, OptionsPattern[Grid]],
         f:StandardForm|TraditionalForm|OutputForm]"""
         return GridBox(
@@ -248,23 +285,23 @@ class Infix(Builtin):
 
     # the right rule should be
     # mbexpression:MakeBoxes[Infix[___], form]
-    def eval_makeboxes(self, expression, form, evaluation):
+    def eval_makeboxes(self, expression, form, evaluation: Evaluation):
         """MakeBoxes[Infix[___],
         form:StandardForm|TraditionalForm|OutputForm|InputForm]"""
         infix_expr = expression.elements[0]
         elements = list(infix_expr.elements)
         num_parms = len(elements)
 
         if num_parms == 0 or num_parms > 4:
-            evaluation.message("Infix", "argb", Integer(len(parms.get_sequence())))
+            evaluation.message("Infix", "argb", Integer(num_parms))
             return eval_fullform_makeboxes(infix_expr, evaluation, form)
 
         if num_parms == 1:
             expr = elements[0]
-            return eval_makeboxes_infix(expr, String("~"), form, evaluation)
+            return box_infix(expr, String("~"), form, evaluation)
         if num_parms == 2:
             expr, operator = elements
-            return eval_makeboxes_infix(expr, operator, form, evaluation)
+            return box_infix(expr, operator, form, evaluation)
 
         expr, operator, precedence = elements[:3]
         if not isinstance(precedence, Integer):
@@ -277,11 +314,9 @@ def eval_makeboxes(self, expression, form, evaluation):
 
         grouping = SymbolNone if num_parms < 4 else elements[3]
         if grouping is SymbolNone:
-            return eval_makeboxes_infix(
-                expr, operator, form, evaluation, precedence.value
-            )
+            return box_infix(expr, operator, form, evaluation, precedence.value)
         if grouping in (SymbolNonAssociative, SymbolLeft, SymbolRight):
-            return eval_makeboxes_infix(
+            return box_infix(
                 expr, operator, form, evaluation, precedence.value, grouping.get_name()
             )
 
@@ -295,7 +330,8 @@ class Left(Builtin):
 
     <dl>
       <dt>'Left'
-      <dd>is used with operator formatting constructs to specify a left-associative operator.
+      <dd>is used with operator formatting constructs to specify a \
+          left-associative operator.
     </dl>
     """
 
@@ -310,7 +346,8 @@ class NonAssociative(Builtin):
 
         <dl>
           <dt>'NonAssociative'
-          <dd>is used with operator formatting constructs to specify a non-associative operator.
+          <dd>is used with operator formatting constructs to specify a \
+          non-associative operator.
         </dl>
     """
 
@@ -427,7 +464,8 @@ class Right(Builtin):
 
     <dl>
       <dt>'Right'
-      <dd>is used with operator formatting constructs to specify a right-associative operator.
+      <dd>is used with operator formatting constructs to specify a \
+          right-associative operator.
     </dl>
     """
 
@@ -446,21 +484,21 @@ class Row(Builtin):
 
     summary_text = "1D layouts containing arbitrary objects in a row"
 
-    def eval_makeboxes(self, items, sep, f, evaluation: Evaluation):
+    def eval_makeboxes(self, items, sep, form, evaluation: Evaluation):
         """MakeBoxes[Row[{items___}, sep_:""],
-        f:StandardForm|TraditionalForm|OutputForm]"""
+        form:StandardForm|TraditionalForm|OutputForm]"""
 
         items = items.get_sequence()
         if not isinstance(sep, String):
-            sep = MakeBoxes(sep, f)
+            sep = MakeBoxes(sep, form)
         if len(items) == 1:
-            return MakeBoxes(items[0], f)
+            return MakeBoxes(items[0], form)
         else:
             result = []
             for index, item in enumerate(items):
                 if index > 0 and not sep.sameQ(String("")):
                     result.append(to_boxes(sep, evaluation))
-                item = MakeBoxes(item, f).evaluate(evaluation)
+                item = MakeBoxes(item, form).evaluate(evaluation)
                 item = to_boxes(item, evaluation)
                 result.append(item)
             return RowBox(*result)
@@ -473,22 +511,31 @@ class Style(Builtin):
     <dl>
       <dt>'Style[$expr$, options]'
       <dd>displays $expr$ formatted using the specified option settings.
+
       <dt>'Style[$expr$, "style"]'
       <dd> uses the option settings for the specified style in the current notebook.
+
       <dt>'Style[$expr$, $color$]'
       <dd>displays using the specified color.
+
       <dt>'Style[$expr$, $Bold$]'
       <dd>displays with fonts made bold.
+
       <dt>'Style[$expr$, $Italic$]'
       <dd>displays with fonts made italic.
+
       <dt>'Style[$expr$, $Underlined$]'
       <dd>displays with fonts underlined.
+
       <dt>'Style[$expr$, $Larger$]
       <dd>displays with fonts made larger.
+
       <dt>'Style[$expr$, $Smaller$]'
       <dd>displays with fonts made smaller.
+
       <dt>'Style[$expr$, $n$]'
       <dd>displays with font size n.
+
       <dt>'Style[$expr$, $Tiny$]'
       <dt>'Style[$expr$, $Small$]', etc.
       <dd>display with fonts that are tiny, small, etc.
@@ -536,7 +583,9 @@ def eval_makeboxes(self, x, y, f, evaluation) -> Expression:
 
 class Subsuperscript(Builtin):
     """
-    <url>:WMA link:https://reference.wolfram.com/language/ref/Subsuperscript.html</url>
+    <url>
+    :WMA link:
+    https://reference.wolfram.com/language/ref/Subsuperscript.html</url>
 
     <dl>
       <dt>'Subsuperscript[$a$, $b$, $c$]'
@@ -558,7 +607,9 @@ class Subsuperscript(Builtin):
 
 class Superscript(Builtin):
     """
-    <url>:WMA link:https://reference.wolfram.com/language/ref/Superscript.html</url>
+    <url>
+    :WMA link:
+    https://reference.wolfram.com/language/ref/Superscript.html</url>
 
     <dl>
       <dt>'Superscript[$x$, $y$]'

mathics/eval/image.py

@@ -37,11 +37,11 @@
 }
 
 # After Python 3.6 support is dropped, this can be simplified
-# to for Pillow 9+ and use PILImage.Resampling only.
-if hasattr(PILImage, "Resampling"):
-    pil_resize = PILImage.Resampling
+# to for Pillow 9+ and use PIL.Image.Resampling only.
+if hasattr(PIL.Image, "Resampling"):
+    pil_resize = PIL.Image.Resampling
 else:
-    pil_resize = PILImage
+    pil_resize = PIL.Image
 
 # See:
 # https://pillow.readthedocs.io/en/stable/handbook/concepts.html#filters