Rename BinaryOperator to InfixOperator.. (#1175)

rocky · web-flow · commit 3ba26119f4f4 · 2024-11-19T12:49:13.000-05:00
Rename BinaryOperator to InfixOperator, since that is more precisely what it is.

Also, order the builtin class names more alphabetically within each category of classes. Attach ABC to some abstract classes.
diff --git a/mathics/builtin/arithfns/basic.py b/mathics/builtin/arithfns/basic.py
@@ -31,8 +31,8 @@
     A_READ_PROTECTED,
 )
 from mathics.core.builtin import (
-    BinaryOperator,
     Builtin,
+    InfixOperator,
     MPMathFunction,
     PrefixOperator,
     SympyFunction,
@@ -107,7 +107,7 @@ def eval(self, n, evaluation):
         )
 
 
-class Divide(BinaryOperator):
+class Divide(InfixOperator):
     """
     <url>
     :Division:
@@ -219,7 +219,7 @@ def eval_int(self, x: Integer, evaluation):
         return Integer(-x.value)
 
 
-class Plus(BinaryOperator, SympyFunction):
+class Plus(InfixOperator, SympyFunction):
     """
     <url>
     :Addition:
@@ -345,7 +345,7 @@ def eval(self, items, evaluation):
         return eval_Plus(*items_tuple)
 
 
-class Power(BinaryOperator, MPMathFunction):
+class Power(InfixOperator, MPMathFunction):
     """
     <url>
     :Exponentiation:
@@ -525,7 +525,7 @@ class Sqrt(SympyFunction):
     summary_text = "square root"
 
 
-class Subtract(BinaryOperator):
+class Subtract(InfixOperator):
     """
     <url>
     :Subtraction:
@@ -559,7 +559,7 @@ class Subtract(BinaryOperator):
     summary_text = "subtract"
 
 
-class Times(BinaryOperator, SympyFunction):
+class Times(InfixOperator, SympyFunction):
     """
     <url>
     :Multiplication:
diff --git a/mathics/builtin/assignments/assign_binaryop.py b/mathics/builtin/assignments/assign_binaryop.py
@@ -17,10 +17,10 @@
 
 
 from mathics.core.attributes import A_HOLD_FIRST, A_PROTECTED, A_READ_PROTECTED
-from mathics.core.builtin import BinaryOperator, PostfixOperator, PrefixOperator
+from mathics.core.builtin import InfixOperator, PostfixOperator, PrefixOperator
 
 
-class AddTo(BinaryOperator):
+class AddTo(InfixOperator):
     """
     <url>:WMA link:https://reference.wolfram.com/language/ref/AddTo.html</url>
 
@@ -78,7 +78,7 @@ class Decrement(PostfixOperator):
     )
 
 
-class DivideBy(BinaryOperator):
+class DivideBy(InfixOperator):
     """
     <url>:WMA link:https://reference.wolfram.com/language/ref/DivideBy.html</url>
 
@@ -202,7 +202,7 @@ class PreDecrement(PrefixOperator):
     summary_text = "decrease the value by one and assigns that returning the new value"
 
 
-class SubtractFrom(BinaryOperator):
+class SubtractFrom(InfixOperator):
     """
     <url>:WMA link:
     https://reference.wolfram.com/language/ref/SubtractFrom.html</url>
@@ -230,7 +230,7 @@ class SubtractFrom(BinaryOperator):
     summary_text = "subtract a value and assins that returning the new value"
 
 
-class TimesBy(BinaryOperator):
+class TimesBy(InfixOperator):
     """
     <url>:WMA link:https://reference.wolfram.com/language/ref/TimesBy.html</url>
 
diff --git a/mathics/builtin/assignments/assignment.py b/mathics/builtin/assignments/assignment.py
@@ -17,7 +17,7 @@
     A_PROTECTED,
     A_SEQUENCE_HOLD,
 )
-from mathics.core.builtin import BinaryOperator, Builtin
+from mathics.core.builtin import Builtin, InfixOperator
 from mathics.core.symbols import SymbolNull
 from mathics.core.systemsymbols import SymbolFailed
 from mathics.eval.pymathics import PyMathicsLoadException, eval_LoadModule
@@ -94,7 +94,7 @@ def eval(self, module, evaluation):
         return module
 
 
-class Set(BinaryOperator, _SetOperator):
+class Set(InfixOperator, _SetOperator):
     """
     <url>:WMA link:https://reference.wolfram.com/language/ref/Set.html</url>
 
@@ -338,7 +338,7 @@ def eval(self, f, lhs, rhs, evaluation):
             return SymbolFailed
 
 
-class UpSet(BinaryOperator, _SetOperator):
+class UpSet(InfixOperator, _SetOperator):
     """
     <url>:WMA link:
          https://reference.wolfram.com/language/ref/UpSet.html</url>
diff --git a/mathics/builtin/exp_structure/general.py b/mathics/builtin/exp_structure/general.py
@@ -4,7 +4,7 @@
 """
 
 from mathics.core.atoms import Integer
-from mathics.core.builtin import BinaryOperator, Builtin, Predefined
+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
@@ -14,7 +14,7 @@
 from mathics.eval.parts import python_levelspec, walk_levels
 
 
-class MapApply(BinaryOperator):
+class MapApply(InfixOperator):
     """
     <url>
     :WMA link:
diff --git a/mathics/builtin/files_io/files.py b/mathics/builtin/files_io/files.py
@@ -15,8 +15,8 @@
 from mathics.core.atoms import Integer, Integer3, String, SymbolString
 from mathics.core.attributes import A_PROTECTED, A_READ_PROTECTED
 from mathics.core.builtin import (
-    BinaryOperator,
     Builtin,
+    InfixOperator,
     MessageException,
     Predefined,
     PrefixOperator,
@@ -511,7 +511,7 @@ class OpenAppend(_OpenAction):
     )
 
 
-class Put(BinaryOperator):
+class Put(InfixOperator):
     """
     <url>:WMA link:https://reference.wolfram.com/language/ref/Put.html</url>
 
@@ -615,7 +615,7 @@ def eval_default(self, exprs, filename, evaluation):
         return expr
 
 
-class PutAppend(BinaryOperator):
+class PutAppend(InfixOperator):
     """
     <url>
     :WMA link:
diff --git a/mathics/builtin/functional/apply_fns_to_lists.py b/mathics/builtin/functional/apply_fns_to_lists.py
@@ -16,7 +16,7 @@
 
 from mathics.builtin.list.constructing import List
 from mathics.core.atoms import Integer, Integer3
-from mathics.core.builtin import BinaryOperator, Builtin
+from mathics.core.builtin import Builtin, InfixOperator
 from mathics.core.convert.expression import to_mathics_list
 from mathics.core.evaluation import Evaluation
 from mathics.core.exceptions import (
@@ -31,7 +31,7 @@
 from mathics.eval.parts import python_levelspec, walk_levels
 
 
-class Apply(BinaryOperator):
+class Apply(InfixOperator):
     """
     <dl>
       <dt>'Apply[$f$, $expr$]'
@@ -103,7 +103,7 @@ def callback(level):
         return result
 
 
-class Map(BinaryOperator):
+class Map(InfixOperator):
     """
     <dl>
       <dt>'Map[$f$, $expr$]' or '$f$ /@ $expr$'
diff --git a/mathics/builtin/list/eol.py b/mathics/builtin/list/eol.py
@@ -18,7 +18,7 @@
     A_PROTECTED,
     A_READ_PROTECTED,
 )
-from mathics.core.builtin import BinaryOperator, Builtin
+from mathics.core.builtin import Builtin, InfixOperator
 from mathics.core.convert.expression import to_mathics_list
 from mathics.core.convert.python import from_python
 from mathics.core.evaluation import Evaluation
@@ -1537,7 +1537,7 @@ def cond(element):
         return items.filter(items.head, cond, evaluation)
 
 
-class Span(BinaryOperator):
+class Span(InfixOperator):
     """
     <url>:WMA link:https://reference.wolfram.com/language/ref/Span.html</url>
 
diff --git a/mathics/builtin/messages.py b/mathics/builtin/messages.py
@@ -8,7 +8,7 @@
 
 from mathics.core.atoms import String
 from mathics.core.attributes import A_HOLD_ALL, A_HOLD_FIRST, A_LOCKED, A_PROTECTED
-from mathics.core.builtin import BinaryOperator, Builtin, Predefined
+from mathics.core.builtin import Builtin, InfixOperator, Predefined
 from mathics.core.evaluation import Evaluation, Message as EvaluationMessage
 from mathics.core.expression import Expression
 from mathics.core.list import ListExpression
@@ -299,7 +299,7 @@ def check_message(expr) -> bool:
     return False
 
 
-class MessageName(BinaryOperator):
+class MessageName(InfixOperator):
     """
     <url>:WMA link:https://reference.wolfram.com/language/ref/MessageName.html</url>
 
diff --git a/mathics/builtin/no_meaning.py b/mathics/builtin/no_meaning.py
@@ -9,10 +9,10 @@
 """
 
 from mathics.core.attributes import A_NO_ATTRIBUTES
-from mathics.core.builtin import BinaryOperator
+from mathics.core.builtin import InfixOperator
 
 
-class Star(BinaryOperator):
+class Star(InfixOperator):
     r"""
     Star <url>
     :WML link:
diff --git a/mathics/builtin/patterns/composite.py b/mathics/builtin/patterns/composite.py
@@ -7,7 +7,7 @@
 from typing import Optional as OptionalType, Tuple, Union
 
 from mathics.core.attributes import A_HOLD_ALL, A_HOLD_FIRST, A_PROTECTED
-from mathics.core.builtin import BinaryOperator, Builtin, PatternObject, PostfixOperator
+from mathics.core.builtin import Builtin, InfixOperator, PatternObject, PostfixOperator
 from mathics.core.element import BaseElement, EvalMixin
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression, SymbolVerbatim
@@ -23,7 +23,7 @@ class _StopGeneratorExcept(StopGenerator):
     pass
 
 
-class Alternatives(BinaryOperator, PatternObject):
+class Alternatives(InfixOperator, PatternObject):
     """
     <url>
     :WMA link:
diff --git a/mathics/builtin/patterns/defaults.py b/mathics/builtin/patterns/defaults.py
@@ -7,7 +7,7 @@
 
 from typing import Optional as OptionalType
 
-from mathics.core.builtin import BinaryOperator, PatternObject
+from mathics.core.builtin import InfixOperator, PatternObject
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
 from mathics.core.pattern import BasePattern
@@ -17,7 +17,7 @@
 sort_order = "mathics.builtin.rules-and-patterns.patttern-defaults"
 
 
-class Optional(BinaryOperator, PatternObject):
+class Optional(InfixOperator, PatternObject):
     """
 
     <url>:WMA link:https://reference.wolfram.com/language/ref/Optional.html</url>
diff --git a/mathics/builtin/patterns/restrictions.py b/mathics/builtin/patterns/restrictions.py
@@ -8,7 +8,7 @@
 
 from mathics.core.atoms import Integer, Number, Rational, Real, String
 from mathics.core.attributes import A_HOLD_REST, A_PROTECTED
-from mathics.core.builtin import BinaryOperator, PatternObject, Test
+from mathics.core.builtin import InfixOperator, PatternObject, Test
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
 from mathics.core.pattern import BasePattern
@@ -18,7 +18,7 @@
 sort_order = "mathics.builtin.rules-and-patterns.restrictions"
 
 
-class Condition(BinaryOperator, PatternObject):
+class Condition(InfixOperator, PatternObject):
     """
     <url>
     :WMA link:
@@ -82,7 +82,7 @@ def yield_match(new_vars_dict, rest):
         self.pattern.match(expression, pattern_context)
 
 
-class PatternTest(BinaryOperator, PatternObject):
+class PatternTest(InfixOperator, PatternObject):
     """
 
     <url>
diff --git a/mathics/builtin/patterns/rules.py b/mathics/builtin/patterns/rules.py
@@ -71,7 +71,7 @@
 
 from mathics.core.atoms import Integer, Integer0, Integer2, Number
 from mathics.core.attributes import A_HOLD_REST, A_PROTECTED, A_SEQUENCE_HOLD
-from mathics.core.builtin import AtomBuiltin, BinaryOperator, Builtin, PatternError
+from mathics.core.builtin import AtomBuiltin, Builtin, InfixOperator, PatternError
 from mathics.core.element import BaseElement
 from mathics.core.evaluation import Evaluation
 from mathics.core.exceptions import InvalidLevelspecError
@@ -242,7 +242,7 @@ def eval_levelspec(self, expr, rules, ls, evaluation, options):
         return None
 
 
-class ReplaceAll(BinaryOperator):
+class ReplaceAll(InfixOperator):
     """
     <url>
     :WMA link:
@@ -395,7 +395,7 @@ def eval(
         return ListExpression(*list_result)
 
 
-class ReplaceRepeated(BinaryOperator):
+class ReplaceRepeated(InfixOperator):
     """
 
     <url>
@@ -483,7 +483,7 @@ def eval_list(
         return result
 
 
-class Rule_(BinaryOperator):
+class Rule_(InfixOperator):
     """
 
     <url>:WMA link:https://reference.wolfram.com/language/ref/Rule_.html</url>
@@ -518,7 +518,7 @@ def eval_rule(self, elems, evaluation):
         return None
 
 
-class RuleDelayed(BinaryOperator):
+class RuleDelayed(InfixOperator):
     """
     <url>:WMA link:https://reference.wolfram.com/language/ref/RuleDelayed.html</url>
 
diff --git a/mathics/builtin/procedural.py b/mathics/builtin/procedural.py
@@ -24,7 +24,7 @@
     A_PROTECTED,
     A_READ_PROTECTED,
 )
-from mathics.core.builtin import BinaryOperator, Builtin, IterationFunction
+from mathics.core.builtin import Builtin, InfixOperator, IterationFunction
 from mathics.core.convert.python import from_python
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
@@ -184,7 +184,7 @@ def eval(self, expr, failexpr, evaluation):
             return failexpr
 
 
-class CompoundExpression(BinaryOperator):
+class CompoundExpression(InfixOperator):
     """
     <url>:WMA link:
     https://reference.wolfram.com/language/ref/CompoundExpression.html</url>
diff --git a/mathics/builtin/string/operations.py b/mathics/builtin/string/operations.py
@@ -21,7 +21,7 @@
     A_PROTECTED,
     A_READ_PROTECTED,
 )
-from mathics.core.builtin import BinaryOperator, Builtin
+from mathics.core.builtin import Builtin, InfixOperator
 from mathics.core.convert.python import from_python
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import BoxError, Expression, string_list
@@ -299,7 +299,7 @@ def eval(self, strsource, strnew, pos, evaluation):
             return String(self._insert(py_strsource, py_strnew, listpos, evaluation))
 
 
-class StringJoin(BinaryOperator):
+class StringJoin(InfixOperator):
     """
     <url>:WMA link:https://reference.wolfram.com/language/ref/StringJoin.html</url>
 
diff --git a/mathics/builtin/string/patterns.py b/mathics/builtin/string/patterns.py
diff --git a/mathics/builtin/tensors.py b/mathics/builtin/tensors.py
diff --git a/mathics/builtin/testing_expressions/equality_inequality.py b/mathics/builtin/testing_expressions/equality_inequality.py
diff --git a/mathics/builtin/testing_expressions/logic.py b/mathics/builtin/testing_expressions/logic.py
diff --git a/mathics/core/builtin.py b/mathics/core/builtin.py
