From 44b8b29096b8beaf2c6e26adb6894c27bce5656d Mon Sep 17 00:00:00 2001 From: Fabrice Desclaux Date: Wed, 23 Sep 2015 10:09:29 +0200 Subject: Expression: move is_func_call to expr scr --- miasm2/expression/expression.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'miasm2/expression/expression.py') diff --git a/miasm2/expression/expression.py b/miasm2/expression/expression.py index 2b51ef61..c82aec2b 100644 --- a/miasm2/expression/expression.py +++ b/miasm2/expression/expression.py @@ -517,9 +517,6 @@ class ExprAff(Expr): else: return self._dst.get_w() - def is_function_call(self): - return isinstance(self.src, ExprOp) and self.src.op.startswith('call') - def _exprhash(self): return hash((EXPRAFF, hash(self._dst), hash(self._src))) @@ -821,6 +818,9 @@ class ExprOp(Expr): return True return False + def is_function_call(self): + return self._op.startswith('call') + def is_associative(self): "Return True iff current operation is associative" return (self._op in ['+', '*', '^', '&', '|']) -- cgit 1.4.1