Merge pull request #957 from Mathics3/fix_956

fix #956
Mathics3 · Jan 9, 2024 · 4589e04 · 4589e04
2 parents bfaf356 + 826bedb
commit 4589e04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/mathics/builtin/procedural.py b/mathics/builtin/procedural.py
@@ -486,7 +486,7 @@ def eval(self, expr, rules, evaluation):
             evaluation.message("Switch", "argct", "Switch", len(rules) + 1)
             return
         for pattern, value in zip(rules[::2], rules[1::2]):
-            if match(expr, pattern, evaluation):
+            if match(expr, pattern.evaluate(evaluation), evaluation):
                 return value.evaluate(evaluation)
         # return unevaluated Switch when no pattern matches
 

diff --git a/test/builtin/test_procedural.py b/test/builtin/test_procedural.py
@@ -88,6 +88,12 @@ def test_nestwhile(str_expr, str_expected):
         ("res", None, "Null", None),
         ("res=CompoundExpression[]", None, "Null", None),
         ("res", None, "Null", None),
+        (
+            "{MatchQ[Infinity,Infinity],Switch[Infinity,Infinity,True,_,False]}",
+            None,
+            "{True, True}",
+            "Issue #956",
+        ),
         (
             "Clear[f];Clear[g];Clear[h];Clear[i];Clear[n];Clear[res];Clear[z]; ",
             None,