WIP - towards sorting out autoloading operators

Author: rocky

mathics/builtin/no_meaning.py

@@ -13,6 +13,7 @@
 
 from sys import modules
 
+import mathics.core.parser.operators
 from mathics.core.builtin import (
     OPERATOR_DATA,
     NoMeaningInfixOperator,
@@ -49,6 +50,9 @@
                 },
             },
         )
+        if affix == "infix":
+            # FIXME get precedence from JSON. Value 100 is a hack for now.
+            mathics.core.parser.operators.flat_binary_ops[operator_name] = 100
 
         # Put the newly-created Builtin class inside this module.
         setattr(modules[__name__], operator_name, generated_operator_class)

mathics/core/load_builtin.py

@@ -17,6 +17,7 @@
 from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple
 
 from mathics.core.convert.sympy import mathics_to_sympy, sympy_to_mathics
+from mathics.core.parser.operators import calculate_operator_information
 from mathics.core.pattern import pattern_objects
 from mathics.core.symbols import Symbol
 from mathics.eval.makeboxes import builtins_precedence
@@ -133,6 +134,8 @@ def definition_contribute(definitions):
     # All builtins are loaded. Create dummy builtin definitions for
     # any remaining operators that don't have them. This allows
     # operators like \[Cup] to behave correctly.
+
+    calculate_operator_information()
     for operator in all_operator_names:
         if not definitions.have_definition(ensure_context(operator)):
             op = ensure_context(operator)

mathics/core/parser/operators.py

@@ -163,28 +163,51 @@
 
 # binary_ops = left_binary_ops V right_binary_ops V flat_binary_ops V nonassoc_binary_ops
 binary_ops = {}
-for ops in (left_binary_ops, right_binary_ops, flat_binary_ops, nonassoc_binary_ops):
-    for op, prec in ops.items():
-        binary_ops[op] = prec
-
-all_op_collections = (
-    prefix_ops,
-    postfix_ops,
-    left_binary_ops,
-    right_binary_ops,
-    flat_binary_ops,
-    ternary_ops,
-    nonassoc_binary_ops,
-    misc_ops,
-)
 
 # all ops - check they're disjoint
 all_ops = defaultdict(lambda: 670)
 
-for ops in all_op_collections:
-    for op, prec in ops.items():
-        if op in all_ops:
-            raise AssertionError
-        all_ops[op] = prec
+# Set below
+all_operator_names = []
 
-all_operator_names = list(all_ops.keys())
+
+def calculate_operator_information():
+    global binary_ops
+    global all_ops
+    global all_operator_names
+
+    all_operator_names = []
+
+    for ops in (
+        left_binary_ops,
+        right_binary_ops,
+        flat_binary_ops,
+        nonassoc_binary_ops,
+    ):
+        for op, prec in ops.items():
+            binary_ops[op] = prec
+
+    all_op_collections = (
+        prefix_ops,
+        postfix_ops,
+        left_binary_ops,
+        right_binary_ops,
+        flat_binary_ops,
+        ternary_ops,
+        nonassoc_binary_ops,
+        misc_ops,
+    )
+
+    for ops in all_op_collections:
+        for op, prec in ops.items():
+            all_ops[op] = prec
+
+    all_operator_names = list(all_ops.keys())
+
+
+# Calculating operator information is also done
+# after loading in Builtin operators with no-meaning.
+# However we also need to do this before reading that module in.
+# This is a mess!
+
+calculate_operator_information()