Remove deprecated use of MatchExpr

1 files changed, 17 insertions, 17 deletions

diff --git a/test/expression/simplifications.py b/test/expression/simplifications.py
index d4553495..60c328dc 100644
--- a/test/expression/simplifications.py
+++ b/test/expression/simplifications.py
@@ -387,28 +387,28 @@ e2 = ExprMem((a & ExprInt(0xFFFFFFFC, 32)) + b, 32)
 e3 = (a ^ b ^ ((a ^ b) & (b ^ (b - a))) ^ (b - a)).canonize()
 
 match_tests = [
-    (MatchExpr(ExprInt(12, 32), a, [a]), {a: ExprInt(12, 32)}),
-    (MatchExpr(x, a, [a]), {a: x}),
-    (MatchExpr(x + y, a, [a]), {a: x + y}),
-    (MatchExpr(x + y, a + y, [a]), {a: x}),
-    (MatchExpr(x + y, x + a, [a]), {a: y}),
-    (MatchExpr(x + y, a + b, [a, b]), {a: x, b: y}),
-    (MatchExpr(x + ExprInt(12, 32), a + b, [a, b]), {a: x, b: ExprInt(12, 32)}),
-    (MatchExpr(ExprMem(x), a, [a]), {a: ExprMem(x)}),
-    (MatchExpr(ExprMem(x), ExprMem(a), [a]), {a: x}),
-    (MatchExpr(x[0:8], a, [a]), {a: x[0:8]}),
-    (MatchExpr(x[0:8], a[0:8], [a]), {a: x}),
-    (MatchExpr(ExprCond(x, y, z), a, [a]), {a: ExprCond(x, y, z)}),
-    (MatchExpr(ExprCond(x, y, z),
+    (match_expr(ExprInt(12, 32), a, [a]), {a: ExprInt(12, 32)}),
+    (match_expr(x, a, [a]), {a: x}),
+    (match_expr(x + y, a, [a]), {a: x + y}),
+    (match_expr(x + y, a + y, [a]), {a: x}),
+    (match_expr(x + y, x + a, [a]), {a: y}),
+    (match_expr(x + y, a + b, [a, b]), {a: x, b: y}),
+    (match_expr(x + ExprInt(12, 32), a + b, [a, b]), {a: x, b: ExprInt(12, 32)}),
+    (match_expr(ExprMem(x), a, [a]), {a: ExprMem(x)}),
+    (match_expr(ExprMem(x), ExprMem(a), [a]), {a: x}),
+    (match_expr(x[0:8], a, [a]), {a: x[0:8]}),
+    (match_expr(x[0:8], a[0:8], [a]), {a: x}),
+    (match_expr(ExprCond(x, y, z), a, [a]), {a: ExprCond(x, y, z)}),
+    (match_expr(ExprCond(x, y, z),
                ExprCond(a, b, c), [a, b, c]),
      {a: x, b: y, c: z}),
-    (MatchExpr(ExprCompose(x[:8], y[:8]), a, [a]),
+    (match_expr(ExprCompose(x[:8], y[:8]), a, [a]),
      {a: ExprCompose(x[:8], y[:8])}),
-    (MatchExpr(ExprCompose(x[:8], y[:8]),
+    (match_expr(ExprCompose(x[:8], y[:8]),
                ExprCompose(a[:8], b[:8]), [a, b]),
      {a: x, b: y}),
-    (MatchExpr(e1, e2, [b]), {b: ExprInt(0x10, 32)}),
-    (MatchExpr(e3,
+    (match_expr(e1, e2, [b]), {b: ExprInt(0x10, 32)}),
+    (match_expr(e3,
                (((jra ^ jrb) & (jrb ^ jrint1))
                 ^ jra ^ jrb ^ jrint1).canonize(),
                [jra, jrb, jrint1]),