More tuple declarations/conversions

Author: rocky

mathics/builtin/patterns.py

@@ -1030,7 +1030,7 @@ def match(self, yield_func, expression, vars, evaluation, **kwargs):
                 yield_func(vars, None)
 
     def get_match_candidates(
-        self, elements, expression, attributes, evaluation, vars={}
+        self, elements: tuple, expression, attributes, evaluation, vars={}
     ):
         existing = vars.get(self.varname, None)
         if existing is None:

mathics/core/builtin.py

@@ -10,7 +10,7 @@
 import re
 from functools import lru_cache, total_ordering
 from itertools import chain
-from typing import Any, Callable, Dict, Iterable, List, Optional, Union, cast
+from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Union, cast
 
 import mpmath
 import sympy
@@ -1122,8 +1122,8 @@ def get_lookup_name(self) -> str:
         return self.get_name()
 
     def get_match_candidates(
-        self, elements, expression, attributes, evaluation, vars={}
-    ):
+        self, elements: Tuple[BaseElement], expression, attributes, evaluation, vars={}
+    ) -> Tuple[BaseElement]:
         return elements
 
     def get_match_count(self, vars={}):

mathics/core/pattern.py

@@ -261,7 +261,7 @@ def get_match_candidates(
         evaluation: Evaluation,
         vars: dict = {},
     ):
-        return []
+        return tuple()
 
     def get_match_candidates_count(
         self,
@@ -715,7 +715,7 @@ def match_element(
 
         match_count = element.get_match_count(vars)
         element_candidates = element.get_match_candidates(
-            rest_expression[1],  # element.candidates,
+            tuple(rest_expression[1]),  # element.candidates,
             expression,
             attributes,
             evaluation,