mypy fix. typo in function call. remove has_side_effects for Which

Author: mmatera

mathics/builtin/procedural.py

@@ -717,7 +717,6 @@ class Which(SympyFunction):
     """
 
     attributes = A_HOLD_ALL | A_PROTECTED
-    has_side_effects = True
     summary_text = "test which of a sequence of conditions are true"
 
     def eval(self, items, evaluation):

mathics/core/convert/function.py

@@ -3,7 +3,7 @@
 from typing import Callable, Optional, Tuple
 
 from mathics.core.definitions import SIDE_EFFECT_BUILTINS, Definition
-from mathics.core.element import BaseElement
+from mathics.core.element import BaseElement, EvalMixin
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression, from_python
 from mathics.core.symbols import Symbol, SymbolFalse, SymbolTrue
@@ -47,8 +47,8 @@ def __init__(self, var):
 
 
 def evaluate_without_side_effects(
-    expr: BaseElement, evaluation: Evaluation
-) -> BaseElement:
+    expr: Expression, evaluation: Evaluation
+) -> Expression:
     """
     Evaluate an expression leaving unevaluated subexpressions
     related with side-effects (assignments, loops).
@@ -69,7 +69,7 @@ def evaluate_without_side_effects(
         # Restore the definitions
         for name, defin in SIDE_EFFECT_BUILTINS.items():
             definitions.builtin[name] = defin
-    return result
+    return result if result is not None else expr
 
 
 def expression_to_callable(
@@ -84,7 +84,8 @@ def expression_to_callable(
     args: a list of CompileArg elements
     evaluation: an Evaluation object used if the llvm compilation fails
     """
-    expr = evaluate_without_side_effects(expr, evaluation)
+    if evaluation is not None:
+        expr = evaluate_without_side_effects(expr, evaluation)
     try:
         cfunc = _compile(expr, args) if (use_llvm and args is not None) else None
     except CompileError:

mathics/eval/drawing/plot_compile.py

@@ -55,7 +55,7 @@ def plot_compile(evaluation, expr, names, debug=0):
     # because some functions are not themselves sympy-enabled
     # if they always get rewritten to one that is.
     try:
-        new_expr = eval_without_side_effects(expr, evaluation)
+        new_expr = evaluate_without_side_effects(expr, evaluation)
         if new_expr:
             expr = new_expr
     except Exception: