Skip to content

Commit c7da800

Browse files
committed
restoring mathics-title
1 parent b392036 commit c7da800

File tree

3 files changed

+455
-693
lines changed

3 files changed

+455
-693
lines changed

mathics/builtin/patterns.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,10 +1005,10 @@ def __repr__(self):
10051005
def get_match_count(self, vars={}):
10061006
return self.pattern.get_match_count(vars)
10071007

1008-
def match(self, yield_func, expression, vars_dict, evaluation, **kwargs):
1009-
existing = vars_dict.get(self.varname, None)
1008+
def match(self, yield_func, expression, vars, evaluation, **kwargs):
1009+
existing = vars.get(self.varname, None)
10101010
if existing is None:
1011-
new_vars = vars_dict.copy()
1011+
new_vars = vars.copy()
10121012
new_vars[self.varname] = expression
10131013
# for vars_2, rest in self.pattern.match(
10141014
# expression, new_vars, evaluation):
@@ -1021,24 +1021,22 @@ def match(self, yield_func, expression, vars_dict, evaluation, **kwargs):
10211021
self.pattern.match(yield_func, expression, new_vars, evaluation)
10221022
else:
10231023
if existing.sameQ(expression):
1024-
yield_func(vars_dict, None)
1024+
yield_func(vars, None)
10251025

10261026
def get_match_candidates(
1027-
self, elements: tuple, expression, attributes, evaluation, vars_dict=None
1027+
self, elements: tuple, expression, attributes, evaluation, vars={}
10281028
):
1029-
if vars_dict is None:
1030-
vars_dict = {}
1031-
existing = vars_dict.get(self.varname, None)
1029+
existing = vars.get(self.varname, None)
10321030
if existing is None:
10331031
return self.pattern.get_match_candidates(
1034-
elements, expression, attributes, evaluation, vars_dict
1032+
elements, expression, attributes, evaluation, vars
10351033
)
10361034
else:
10371035
# Treat existing variable as verbatim
10381036
verbatim_expr = Expression(SymbolVerbatim, existing)
10391037
verbatim = Verbatim(verbatim_expr)
10401038
return verbatim.get_match_candidates(
1041-
elements, expression, attributes, evaluation, vars_dict
1039+
elements, expression, attributes, evaluation, vars
10421040
)
10431041

10441042

0 commit comments

Comments
 (0)