Use get_eval_Expression() more often (#1446)

Use `get_eval_Expression()` more often

Also, remove some duplicate error message definitions One error message
corrected - we had a duplicate stray message added in there.

---------

Co-authored-by: Juan Mauricio Matera <matera@fisica.unlp.edu.ar>

Author: rocky

mathics/builtin/arithfns/basic.py

@@ -39,6 +39,7 @@
 )
 from mathics.core.convert.expression import to_expression
 from mathics.core.convert.sympy import from_sympy
+from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
 from mathics.core.list import ListExpression
 from mathics.core.symbols import (
@@ -283,7 +284,7 @@ class Plus(InfixOperator, SympyFunction):
     # Remember to up sympy doc link when this is corrected
     sympy_name = "Add"
 
-    def format_plus(self, items, evaluation):
+    def format_plus(self, items, evaluation: Evaluation):
         "Plus[items__]"
 
         def negate(item):  # -> Expression (see FIXME below)
@@ -334,7 +335,7 @@ def is_negative(value) -> bool:
             SymbolLeft,
         )
 
-    def eval(self, items, evaluation):
+    def eval(self, items, evaluation: Evaluation):
         "Plus[items___]"
         items_tuple = numerify(items, evaluation).get_sequence()
         return eval_Plus(*items_tuple)
@@ -437,7 +438,7 @@ class Power(InfixOperator, MPMathFunction):
     # Remember to up sympy doc link when this is corrected
     sympy_name = "Pow"
 
-    def eval_check(self, x, y, evaluation):
+    def eval_check(self, x, y, evaluation: Evaluation):
         "Power[x_, y_]"
 
         # Power uses MPMathFunction but does some error checking first

mathics/builtin/atomic/symbols.py

@@ -39,7 +39,6 @@
 )
 from mathics.core.systemsymbols import (
     SymbolAttributes,
-    SymbolContext,
     SymbolDefinition,
     SymbolFormat,
     SymbolGrid,
@@ -50,6 +49,7 @@
     SymbolSet,
 )
 from mathics.doc.online import online_doc_string
+from mathics.eval.stackframe import get_eval_Expression
 
 
 def gather_and_format_definition_rules(
@@ -204,9 +204,7 @@ def eval(self, symbol, evaluation):
 
         name = symbol.get_name()
         if not name:
-            evaluation.message(
-                "Context", "normal", Integer1, Expression(SymbolContext, symbol)
-            )
+            evaluation.message("Context", "normal", Integer1, get_eval_Expression())
             return
         assert "`" in name
         context = name[: name.rindex("`") + 1]

mathics/builtin/colors/color_operations.py

@@ -9,6 +9,9 @@
 import itertools
 from math import floor
 
+import numpy
+import PIL.ImageOps
+
 from mathics.builtin.colors.color_directives import ColorError, RGBColor, _ColorObject
 from mathics.builtin.colors.color_internals import convert_color
 from mathics.builtin.image.base import Image
@@ -23,9 +26,6 @@
 
 _image_requires = ("numpy", "PIL")
 
-import numpy
-import PIL.ImageOps
-
 
 class Blend(Builtin):
     """

mathics/builtin/directories/directory_operations.py

@@ -47,7 +47,6 @@ class CreateDirectory(Builtin):
         "fstr": (
             "File specification `1` is not a string of " "one or more characters."
         ),
-        "nffil": "File not found during `1`.",
         "filex": "`1` already exists.",
     }
     summary_text = "create a directory"

mathics/builtin/distance/clusters.py

@@ -25,6 +25,7 @@
     SymbolClusteringComponents,
     SymbolFailed,
     SymbolFindClusters,
+    SymbolMethod,
     SymbolRule,
 )
 from mathics.eval.distance.clusters import (
@@ -35,6 +36,7 @@
 )
 from mathics.eval.nevaluator import eval_N
 from mathics.eval.parts import walk_levels
+from mathics.eval.stackframe import get_eval_Expression
 from mathics.eval.tensors import get_default_distance
 
 
@@ -74,7 +76,6 @@ class _Cluster(Builtin):
         "amtd": "`1` failed to pick a suitable distance function for `2`.",
         "bdmtd": 'Method in `` must be either "Optimize", "Agglomerate" or "KMeans".',
         "intpm": "Positive integer expected at position 2 in ``.",
-        "list": "Expected a list or a rule with equally sized lists at position 1 in ``.",
         "nclst": "Cannot find more clusters than there are elements: `1` is larger than `2`.",
         "xnum": "The distance function returned ``, which is not a non-negative real value.",
         "rseed": "The random seed specified through `` must be an integer or Automatic.",
@@ -91,7 +92,7 @@ def _cluster(self, p, k, mode, evaluation, options, expr):
         method_string, method = self.get_option_string(options, "Method", evaluation)
         if method_string not in ("Optimize", "Agglomerate", "KMeans"):
             evaluation.message(
-                self.get_name(), "bdmtd", Expression(SymbolRule, "Method", method)
+                self.get_name(), "bdmtd", Expression(SymbolRule, SymbolMethod, method)
             )
             return
 
@@ -407,7 +408,6 @@ class Nearest(Builtin):
 
     messages = {
         "amtd": "`1` failed to pick a suitable distance function for `2`.",
-        "list": "Expected a list or a rule with equally sized lists at position 1 in ``.",
         "nimp": "Method `1` is not implemented yet.",
     }
 
@@ -463,9 +463,7 @@ def eval(
         if distance_function_string == "Automatic":
             distance_function = get_default_distance(dist_p)
             if distance_function is None:
-                evaluation.message(
-                    self.get_name(), "amtd", "Nearest", ListExpression(*dist_p)
-                )
+                evaluation.message(self.get_name(), "amtd", get_eval_Expression())
                 return
 
             if pivot.get_head_name() == "System`List":

mathics/builtin/exp_structure/general.py

@@ -3,15 +3,16 @@
 Structural Expression Functions
 """
 
-from mathics.core.atoms import Integer, Integer1
+from mathics.core.atoms import Integer, Integer1, Integer2
 from mathics.core.builtin import Builtin, InfixOperator, Predefined
 from mathics.core.exceptions import InvalidLevelspecError
 from mathics.core.expression import Evaluation, Expression
 from mathics.core.list import ListExpression
 from mathics.core.rules import BasePattern
 from mathics.core.symbols import Atom, SymbolFalse, SymbolTrue
-from mathics.core.systemsymbols import SymbolMap, SymbolSortBy
+from mathics.core.systemsymbols import SymbolMap
 from mathics.eval.parts import python_levelspec, walk_levels
+from mathics.eval.stackframe import get_eval_Expression
 
 
 class MapApply(InfixOperator):
@@ -264,13 +265,10 @@ def eval(self, li, f, evaluation: Evaluation):
         "SortBy[li_, f_]"
 
         if isinstance(li, Atom):
-            evaluation.message(
-                "Sort", "normal", Integer1, Expression(SymbolSortBy, li, f)
-            )
+            evaluation.message("Sort", "normal", Integer1, get_eval_Expression())
             return
         elif li.get_head_name() != "System`List":
-            expr = Expression(SymbolSortBy, li, f)
-            evaluation.message(self.get_name(), "list", expr, 1)
+            evaluation.message(self.get_name(), "list", get_eval_Expression(), Integer1)
             return
         else:
             keys_expr = Expression(SymbolMap, f, li).evaluate(evaluation)  # precompute:
@@ -282,8 +280,7 @@ def eval(self, li, f, evaluation: Evaluation):
                 or keys_expr.get_head_name() != "System`List"
                 or len(keys_expr.elements) != len(li.elements)
             ):
-                expr = Expression(SymbolSortBy, li, f)
-                evaluation.message("SortBy", "func", expr, 2)
+                evaluation.message("SortBy", "func", get_eval_Expression(), Integer2)
                 return
 
             keys = keys_expr.elements

mathics/builtin/file_operations/file_properties.py

@@ -50,7 +50,6 @@ class FileDate(Builtin):
     """
 
     messages = {
-        "nffil": "File not found during `1`.",
         "datetype": (
             'Date type Fail should be "Access", "Modification", '
             '"Creation" (Windows only), '
@@ -248,7 +247,6 @@ class SetFileDate(Builtin):
         "fstr": (
             "File specification `1` is not a string of one or " "more characters."
         ),
-        "nffil": "File not found during `1`.",
         "fdate": (
             "Date specification should be either the number of seconds "
             "since January 1, 1900 or a {y, m, d, h, m, s} list."

mathics/builtin/files_io/files.py

@@ -587,7 +587,7 @@ def eval_input(self, exprs, name, n, evaluation: Evaluation):
         stream = stream_manager.lookup_stream(n.get_int_value())
 
         if stream is None or stream.io.closed:
-            evaluation.message("Put", "openx", to_expression("OutputSteam", name, n))
+            evaluation.message("Put", "openx", get_eval_Expression())
             return
 
         # In Mathics-server, evaluation.format_output is modified.
@@ -1304,11 +1304,7 @@ def eval(self, name, n, typ, m, evaluation: Evaluation, options: dict):
 
         py_m = m.to_python()
         if not (isinstance(py_m, int) and py_m > 0):
-            evaluation.message(
-                "Skip",
-                "intm",
-                to_expression("Skip", stream, typ, m),
-            )
+            evaluation.message("Skip", "intm", get_eval_Expression())
             return
         for i in range(py_m):
             result = super(Skip, self).eval(stream, typ, evaluation, options)

mathics/builtin/files_io/filesystem.py

@@ -36,8 +36,7 @@
 )
 from mathics.eval.directories import DIRECTORY_STACK
 from mathics.eval.files_io.files import eval_Get
-
-SymbolAbsoluteTime = Symbol("AbsoluteTime")
+from mathics.eval.stackframe import get_eval_Expression
 
 
 class AbsoluteFileName(Builtin):
@@ -57,7 +56,6 @@ class AbsoluteFileName(Builtin):
 
     messages = {
         "fstr": ("File specification x is not a string of one or more characters."),
-        "nffil": "File not found during `1`.",
     }
     summary_text = "get absolute file path"
 
@@ -155,7 +153,6 @@ class CopyFile(Builtin):
         "fstr": (
             "File specification `1` is not a string of " "one or more characters."
         ),
-        "nffil": "File not found during `1`.",
     }
     summary_text = "copy a file into a new path"
 
@@ -192,9 +189,7 @@ def eval(self, source, dest, evaluation):
         try:
             shutil.copy(py_source, py_dest)
         except IOError:
-            evaluation.message(
-                "CopyFile", "nffil", to_expression("CopyFile", source, dest)
-            )
+            evaluation.message("CopyFile", "nffil", get_eval_Expression())
             return SymbolFailed
 
         return dest
@@ -287,7 +282,6 @@ class DeleteFile(Builtin):
         "strs": (
             "String or non-empty list of strings expected at " "position `1` in `2`."
         ),
-        "nffil": "File not found during `1`.",
     }
     summary_text = "delete a file"
 
@@ -303,10 +297,7 @@ def eval(self, filename, evaluation):
             # Check filenames
             if not isinstance(path, str):
                 evaluation.message(
-                    "DeleteFile",
-                    "strs",
-                    filename,
-                    to_expression("DeleteFile", filename),
+                    "DeleteFile", "strs", filename, get_eval_Expression()
                 )
                 return
 
@@ -315,9 +306,7 @@ def eval(self, filename, evaluation):
             path, _ = path_search(path)
 
             if path is None:
-                evaluation.message(
-                    "DeleteFile", "nffil", to_expression("DeleteFile", filename)
-                )
+                evaluation.message("DeleteFile", "nffil", get_eval_Expression())
                 return SymbolFailed
             py_paths.append(path)
 
@@ -397,9 +386,7 @@ def eval(self, name, evaluation):
         py_name = name.to_python()
 
         if not (isinstance(py_name, str) and py_name[0] == py_name[-1] == '"'):
-            evaluation.message(
-                "ExpandFileName", "string", to_expression("ExpandFileName", name)
-            )
+            evaluation.message("ExpandFileName", "string", get_eval_Expression())
             return
         py_name = py_name[1:-1]
 
@@ -618,7 +605,7 @@ def eval(self, name, evaluation):
         py_name = name.to_python()
 
         if not (isinstance(py_name, str) and py_name[0] == py_name[-1] == '"'):
-            evaluation.message("FindFile", "string", to_expression("FindFile", name))
+            evaluation.message("FindFile", "string", get_eval_Expression())
             return
         py_name = py_name[1:-1]
 
@@ -961,7 +948,6 @@ class RenameFile(Builtin):
         "fstr": (
             "File specification `1` is not a string of " "one or more characters."
         ),
-        "nffil": "File not found during `1`.",
     }
     summary_text = "change the name of a file"
 
@@ -982,7 +968,7 @@ def eval(self, source, dest, evaluation):
         py_source = py_source[1:-1]
         py_dest = py_dest[1:-1]
 
-        py_source, is_temporary_file = path_search(py_source)
+        py_source, _ = path_search(py_source)
 
         if py_source is None:
             evaluation.message("RenameFile", "filex", source)

mathics/builtin/files_io/importexport.py

@@ -2068,9 +2068,6 @@ class FileFormat(Builtin):
     """
 
     summary_text = "determine the file format of a file"
-    messages = {
-        "nffil": "File not found during `1`.",
-    }
 
     detector = None