more singletonizing

Author: mmatera

mathics/builtin/arithmetic.py

@@ -31,16 +31,16 @@
     Real,
     String,
     Symbol,
-    SymbolN,
+    SymbolComplexInfinity,
+    SymbolDirectedInfinity,
     SymbolFalse,
+    SymbolInfinity,
+    SymbolN,
     SymbolNull,
+    SymbolSequence,
     SymbolTrue,
-    SymbolList,
-    SymbolInfinity,
-    SymbolDirectedInfinity,
-    SymbolComplexInfinity,
-    from_python,
     from_mpmath,
+    from_python,
 )
 from mathics.core.numbers import min_prec, dps, SpecialValueError
 
@@ -964,7 +964,7 @@ def apply_check(self, x, y, evaluation):
             factor = self.apply(Expression("Sequence", x.imag, y), evaluation)
             return Expression("Times", factor, Expression("Power", Integer(-1), yhalf))
 
-        result = self.apply(Expression("Sequence", x, y), evaluation)
+        result = self.apply(Expression(SymbolSequence, x, y), evaluation)
         if result is None or result != SymbolNull:
             return result
 

mathics/builtin/calculus.py

@@ -6,7 +6,7 @@
 from mathics.version import __version__  # noqa used in loading to check consistency.
 
 from mathics.builtin.base import Builtin, PostfixOperator, SympyFunction
-from mathics.core.expression import Expression, Integer, Number, SymbolTrue, SymbolFalse, SymbolList, SymbolN
+from mathics.core.expression import Expression, Integer, Number, SymbolTrue, SymbolFalse, SymbolList, SymbolN, SymbolRule
 from mathics.core.convert import sympy_symbol_prefix, SympyExpression, from_sympy
 from mathics.core.rules import Pattern
 from mathics.core.numbers import dps
@@ -842,7 +842,7 @@ def transform_solution(sol):
                     Expression(
                         "List",
                         *(
-                            Expression("Rule", var, from_sympy(sol[var_sympy]))
+                            Expression(SymbolRule, var, from_sympy(sol[var_sympy]))
                             for var, var_sympy in zip(vars, vars_sympy)
                             if var_sympy in sol
                         )
@@ -1141,4 +1141,4 @@ def sub(evaluation):
         else:
             evaluation.message("FindRoot", "maxiter")
 
-        return Expression(SymbolList, Expression("Rule", x, x0))
+        return Expression(SymbolList, Expression(SymbolRule, x, x0))

mathics/builtin/graphics.py

@@ -28,6 +28,7 @@
     Symbol,
     SymbolList,
     SymbolN,
+    SymbolMakeBoxes,
     strip_context,
     system_symbols,
     system_symbols_dict,
@@ -292,7 +293,7 @@ def _CMC_distance(lab1, lab2, l, c):
 
 
 def _extract_graphics(graphics, format, evaluation):
-    graphics_box = Expression("MakeBoxes", graphics).evaluate(evaluation)
+    graphics_box = Expression(SymbolMakeBoxes, graphics).evaluate(evaluation)
     builtin = GraphicsBox(expression=False)
     elements, calc_dimensions = builtin._prepare_elements(
         graphics_box.leaves, {"evaluation": evaluation}, neg_y=True

mathics/builtin/image.py

@@ -15,6 +15,8 @@
     MachineReal,
     Symbol,
     SymbolNull,
+    SymbolList,
+    SymbolRule,
     from_python,
 )
 from mathics.builtin.colors import (
@@ -194,7 +196,7 @@ def extract(im, evaluation):
                 else:
                     continue
 
-                yield Expression("Rule", String(_Exif._names.get(k, name)), value)
+                yield Expression(SymbolRule, String(_Exif._names.get(k, name)), value)
 
 
 class ImageImport(_ImageBuiltin):
@@ -217,15 +219,15 @@ def apply(self, path, evaluation):
         pillow = PIL.Image.open(path.get_string_value())
         pixels = numpy.asarray(pillow)
         is_rgb = len(pixels.shape) >= 3 and pixels.shape[2] >= 3
-        exif = Expression("List", *list(_Exif.extract(pillow, evaluation)))
+        exif = Expression(SymbolList, *list(_Exif.extract(pillow, evaluation)))
 
         image = Image(pixels, "RGB" if is_rgb else "Grayscale")
         return Expression(
             "List",
-            Expression("Rule", String("Image"), image),
-            Expression("Rule", String("ColorSpace"), String(image.color_space)),
-            Expression("Rule", String("ImageSize"), from_python(image.dimensions())),
-            Expression("Rule", String("RawExif"), exif),
+            Expression(SymbolRule, String("Image"), image),
+            Expression(SymbolRule, String("ColorSpace"), String(image.color_space)),
+            Expression(SymbolRule, String("ImageSize"), from_python(image.dimensions())),
+            Expression(SymbolRule, String("RawExif"), exif),
         )
 
 
@@ -569,7 +571,7 @@ def apply_resize_width_height(self, image, width, height, evaluation, options):
         h = self._get_image_size_spec(old_h, height)
         if h is None or w is None:
             return evaluation.message(
-                "ImageResize", "imgrssz", Expression("List", width, height)
+                "ImageResize", "imgrssz", Expression(SymbolList, width, height)
             )
 
         # handle Automatic
@@ -696,7 +698,7 @@ def apply(self, image, orig, dest, evaluation):
 
         if method is None:
             return evaluation.message(
-                "ImageReflect", "bdrfl2", Expression("Rule", orig, dest)
+                "ImageReflect", "bdrfl2", Expression(SymbolRule, orig, dest)
             )
 
         return Image(method(image.pixels), image.color_space)
@@ -1041,7 +1043,7 @@ def apply(self, image, r, t, evaluation):
 
 
 def _matrix(rows):
-    return Expression("List", *[Expression("List", *r) for r in rows])
+    return Expression(SymbolList, *[Expression(SymbolList, *r) for r in rows])
 
 
 class BoxMatrix(_ImageBuiltin):
@@ -1467,7 +1469,7 @@ def apply(self, image, evaluation):
         else:
             for i in range(pixels.shape[2]):
                 images.append(Image(pixels[:, :, i], "Grayscale"))
-        return Expression("List", *images)
+        return Expression(SymbolList, *images)
 
 
 class ColorCombine(_ImageBuiltin):
@@ -1755,7 +1757,7 @@ def result():
                     else:
                         yield Expression(out_palette_head, *prototype)
 
-        return Expression("List", *itertools.islice(result(), 0, at_most))
+        return Expression(SymbolList, *itertools.islice(result(), 0, at_most))
 
 
 # pixel access
@@ -1893,7 +1895,7 @@ def apply(self, image, x, y, evaluation):
             return evaluation.message("PixelValue", "nopad")
         pixel = pixels_as_float(image.pixels)[height - y, x - 1]
         if isinstance(pixel, (numpy.ndarray, numpy.generic, list)):
-            return Expression("List", *[MachineReal(float(x)) for x in list(pixel)])
+            return Expression(SymbolList, *[MachineReal(float(x)) for x in list(pixel)])
         else:
             return MachineReal(float(pixel))
 
@@ -1940,7 +1942,7 @@ def apply(self, image, val, d, evaluation):
             result = sorted(
                 (j + 1, height - i, k + 1) for i, j, k in positions.tolist()
             )
-        return Expression("List", *(Expression("List", *arg) for arg in result))
+        return Expression(SymbolList, *(Expression(SymbolList, *arg) for arg in result))
 
 
 # image attribute queries
@@ -1968,7 +1970,7 @@ class ImageDimensions(_ImageBuiltin):
 
     def apply(self, image, evaluation):
         "ImageDimensions[image_Image]"
-        return Expression("List", *image.dimensions())
+        return Expression(SymbolList, *image.dimensions())
 
 
 class ImageAspectRatio(_ImageBuiltin):
@@ -2297,8 +2299,8 @@ def storage_type(self):
     def options(self):
         return Expression(
             "List",
-            Expression("Rule", String("ColorSpace"), String(self.color_space)),
-            Expression("Rule", String("MetaInformation"), self.metadata),
+            Expression(SymbolRule, String("ColorSpace"), String(self.color_space)),
+            Expression(SymbolRule, String("MetaInformation"), self.metadata),
         )
 
 

mathics/builtin/importexport.py

@@ -9,6 +9,7 @@
 from mathics.core.expression import (
     ByteArrayAtom,
     SymbolList,
+    SymbolRule,
     Expression,
     from_python,
     strip_context,
@@ -904,7 +905,7 @@ def _importer_exporter_options(
             if py_name:
                 value = get_option(remaining_options, py_name, evaluation, pop=True)
                 if value is not None:
-                    expr = Expression("Rule", String(py_name), value)
+                    expr = Expression(SymbolRule, String(py_name), value)
                     if py_name == "CharacterEncoding":
                         stream_options.append(expr)
                     else:
@@ -917,7 +918,7 @@ def _importer_exporter_options(
             evaluation.message(
                 builtin_name,
                 "optx",
-                Expression("Rule", strip_context(name), value),
+                Expression(SymbolRule, strip_context(name), value),
                 strip_context(builtin_name),
             )
 
@@ -1478,7 +1479,7 @@ def get_results(tmp_function, findfile):
                 return Expression(
                     "List",
                     *(
-                        Expression("Rule", String(key), defaults[key])
+                        Expression(SymbolRule, String(key), defaults[key])
                         for key in defaults.keys()
                     )
                 )