From 0698cd3820a70182c362ba113849fe8ca5e0e032 Mon Sep 17 00:00:00 2001
From: ajax <devnull@localhost>
Date: Thu, 12 Jun 2014 18:40:55 +0200
Subject: Simplifications_cond: Fix size issue, add constructor

I could have use a child class of ExprOp specific for conditions, but
I prefer to keep a better modularity by just using "<s", "<u" as a new op

I don't add the size issue in expression/expression.py (such as 'parity')
because we don't want dependencies from this file to
expression/simplifications_cond (for TOK_*)
---
 test/expression/simplifications.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'test/expression')

diff --git a/test/expression/simplifications.py b/test/expression/simplifications.py
index 9a4fbe8c..057ff1c7 100644
--- a/test/expression/simplifications.py
+++ b/test/expression/simplifications.py
@@ -4,7 +4,7 @@
 from pdb import pm
 from miasm2.expression.expression import *
 from miasm2.expression.simplifications import expr_simp, ExpressionSimplifier
-from miasm2.expression.simplifications_cond import TOK_INF_SIGNED, TOK_INF_UNSIGNED
+from miasm2.expression.simplifications_cond import ExprOp_inf_signed, ExprOp_inf_unsigned
 
 # Define example objects
 a = ExprId('a')
@@ -178,11 +178,11 @@ for e, e_check in to_test[:]:
 
 to_test = [
     (((a - b) ^ ((a ^ b) & ((a - b) ^ a))).msb(),
-     ExprOp(TOK_INF_SIGNED, a, b)),
+     ExprOp_inf_signed(a, b)),
     ((((a - b) ^ ((a ^ b) & ((a - b) ^ a))) ^ a ^ b).msb(),
-     ExprOp(TOK_INF_UNSIGNED, a, b)),
-    (ExprOp(TOK_INF_UNSIGNED, ExprInt32(-1), ExprInt32(3)), ExprInt1(0)),
-    (ExprOp(TOK_INF_SIGNED, ExprInt32(-1), ExprInt32(3)), ExprInt1(1)),
+     ExprOp_inf_unsigned(a, b)),
+    (ExprOp_inf_unsigned(ExprInt32(-1), ExprInt32(3)), ExprInt1(0)),
+    (ExprOp_inf_signed(ExprInt32(-1), ExprInt32(3)), ExprInt1(1)),
 ]
 
 expr_simp_cond = ExpressionSimplifier()
-- 
cgit 1.4.1