8 files changed, 18 insertions, 18 deletions
diff --git a/miasm2/ir/analysis.py b/miasm2/ir/analysis.py
index d49f6b4e..9158aceb 100644
--- a/miasm2/ir/analysis.py
+++ b/miasm2/ir/analysis.py
@@ -4,7 +4,7 @@ import warnings
 import logging
 
 from miasm2.ir.ir import IntermediateRepresentation, AssignBlock
-from miasm2.expression.expression import ExprOp, ExprAff
+from miasm2.expression.expression import ExprOp, ExprAssign
 from miasm2.analysis.data_flow import dead_simp as new_dead_simp_imp
 
 
@@ -45,8 +45,8 @@ class ira(IntermediateRepresentation):
 
         call_assignblk = AssignBlock(
             [
-                ExprAff(self.ret_reg, ExprOp('call_func_ret', addr, self.sp)),
-                ExprAff(self.sp, ExprOp('call_func_stack', addr, self.sp))
+                ExprAssign(self.ret_reg, ExprOp('call_func_ret', addr, self.sp)),
+                ExprAssign(self.sp, ExprOp('call_func_stack', addr, self.sp))
             ],
             instr
         )
diff --git a/miasm2/ir/ir.py b/miasm2/ir/ir.py
index db47d4ef..a77ce992 100644
--- a/miasm2/ir/ir.py
+++ b/miasm2/ir/ir.py
@@ -58,7 +58,7 @@ class AssignBlock(object):
 
     def __init__(self, irs=None, instr=None):
         """Create a new AssignBlock
-        @irs: (optional) sequence of ExprAff, or dictionnary dst (Expr) -> src
+        @irs: (optional) sequence of ExprAssign, or dictionnary dst (Expr) -> src
               (Expr)
         @instr: (optional) associate an instruction with this AssignBlock
 
@@ -66,7 +66,7 @@ class AssignBlock(object):
         if irs is None:
             irs = []
         self._instr = instr
-        self._assigns = {} # ExprAff.dst -> ExprAff.src
+        self._assigns = {} # ExprAssign.dst -> ExprAssign.src
 
         # Concurrent assignments are handled in _set
         if hasattr(irs, "iteritems"):
@@ -250,10 +250,10 @@ class AssignBlock(object):
             out.append("%s = %s" % (dst, src))
         return "\n".join(out)
 
-    def dst2ExprAff(self, dst):
-        """Return an ExprAff corresponding to @dst equation
+    def dst2ExprAssign(self, dst):
+        """Return an ExprAssign corresponding to @dst equation
         @dst: Expr instance"""
-        return m2_expr.ExprAff(dst, self[dst])
+        return m2_expr.ExprAssign(dst, self[dst])
 
     def simplify(self, simplifier):
         """
diff --git a/miasm2/ir/translators/C.py b/miasm2/ir/translators/C.py
index 71f42636..1146dce6 100644
--- a/miasm2/ir/translators/C.py
+++ b/miasm2/ir/translators/C.py
@@ -77,7 +77,7 @@ class TranslatorC(Translator):
         value, int_size = int_size_to_bn(offset, 64)
         return 'bignum_from_string("%s", %d)' % (value, int_size)
 
-    def from_ExprAff(self, expr):
+    def from_ExprAssign(self, expr):
         new_dst = self.from_expr(expr.dst)
         new_src = self.from_expr(expr.src)
         return "%s = %s" % (new_dst, new_src)
diff --git a/miasm2/ir/translators/miasm.py b/miasm2/ir/translators/miasm.py
index b390eb51..d8509d24 100644
--- a/miasm2/ir/translators/miasm.py
+++ b/miasm2/ir/translators/miasm.py
@@ -30,8 +30,8 @@ class TranslatorMiasm(Translator):
         args = ["%s" % self.from_expr(arg) for arg in expr.args]
         return "ExprCompose(%s)" % ", ".join(args)
 
-    def from_ExprAff(self, expr):
-        return "ExprAff(%s, %s)" % (self.from_expr(expr.dst),
+    def from_ExprAssign(self, expr):
+        return "ExprAssign(%s, %s)" % (self.from_expr(expr.dst),
                                     self.from_expr(expr.src))
 
     def from_ExprMem(self, expr):
diff --git a/miasm2/ir/translators/python.py b/miasm2/ir/translators/python.py
index e05f5e4d..c6eb0ba8 100644
--- a/miasm2/ir/translators/python.py
+++ b/miasm2/ir/translators/python.py
@@ -74,7 +74,7 @@ class TranslatorPython(Translator):
 
         raise NotImplementedError("Unknown operator: %s" % expr.op)
 
-    def from_ExprAff(self, expr):
+    def from_ExprAssign(self, expr):
         return "%s = %s" % tuple(map(self.from_expr, (expr.dst, expr.src)))
 
 
diff --git a/miasm2/ir/translators/smt2.py b/miasm2/ir/translators/smt2.py
index f285c92a..408eb53f 100644
--- a/miasm2/ir/translators/smt2.py
+++ b/miasm2/ir/translators/smt2.py
@@ -278,7 +278,7 @@ class TranslatorSMT2(Translator):
 
         return res
 
-    def from_ExprAff(self, expr):
+    def from_ExprAssign(self, expr):
         src = self.from_expr(expr.src)
         dst = self.from_expr(expr.dst)
         return smt2_assert(smt2_eq(src, dst))
diff --git a/miasm2/ir/translators/translator.py b/miasm2/ir/translators/translator.py
index 557fdabe..a56c6a62 100644
--- a/miasm2/ir/translators/translator.py
+++ b/miasm2/ir/translators/translator.py
@@ -83,9 +83,9 @@ class Translator(object):
         """
         raise NotImplementedError("Abstract method")
 
-    def from_ExprAff(self, expr):
-        """Translate an ExprAff
-        @expr: ExprAff to translate
+    def from_ExprAssign(self, expr):
+        """Translate an ExprAssign
+        @expr: ExprAssign to translate
         """
         raise NotImplementedError("Abstract method")
 
@@ -111,7 +111,7 @@ class Translator(object):
                     m2_expr.ExprSlice: self.from_ExprSlice,
                     m2_expr.ExprOp: self.from_ExprOp,
                     m2_expr.ExprMem: self.from_ExprMem,
-                    m2_expr.ExprAff: self.from_ExprAff,
+                    m2_expr.ExprAssign: self.from_ExprAssign,
                     m2_expr.ExprCond: self.from_ExprCond
                     }
         for target, handler in handlers.iteritems():
diff --git a/miasm2/ir/translators/z3_ir.py b/miasm2/ir/translators/z3_ir.py
index a481acd7..97a0397a 100644
--- a/miasm2/ir/translators/z3_ir.py
+++ b/miasm2/ir/translators/z3_ir.py
@@ -239,7 +239,7 @@ class TranslatorZ3(Translator):
 
         return res
 
-    def from_ExprAff(self, expr):
+    def from_ExprAssign(self, expr):
         src = self.from_expr(expr.src)
         dst = self.from_expr(expr.dst)
         return (src == dst)