diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2015-04-02 10:24:17 +0200 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2015-04-02 10:24:17 +0200 |
| commit | 945f985aba4d957241899e56c26211a88977eca0 (patch) | |
| tree | 6475c9e483c7d2115d26fc0c81a724c5ade93494 /miasm2/core/interval.py | |
| parent | b66f021a35ea48c1242b9dc80aa922b510cd7a01 (diff) | |
| download | miasm-945f985aba4d957241899e56c26211a88977eca0.tar.gz miasm-945f985aba4d957241899e56c26211a88977eca0.zip | |
Interval: fix contains; updt reg tests
Diffstat (limited to 'miasm2/core/interval.py')
| -rw-r--r-- | miasm2/core/interval.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/miasm2/core/interval.py b/miasm2/core/interval.py index 1f6eb739..66445674 100644 --- a/miasm2/core/interval.py +++ b/miasm2/core/interval.py @@ -100,20 +100,20 @@ class interval(object): o = "[]" return o - def __contains__(self, i): - if isinstance(i, interval): - for x in self.intervals: - is_out = True - for y in i.intervals: - if cmp_interval(x, y) in [INT_EQ, INT_B_IN_A]: - is_out = False + def __contains__(self, other): + if isinstance(other, interval): + for intervalB in other.intervals: + is_in = False + for intervalA in self.intervals: + if cmp_interval(intervalA, intervalB) in [INT_EQ, INT_B_IN_A]: + is_in = True break - if is_out: + if not is_in: return False return True else: - for x in self.intervals: - if x[0] <= i <= x[1]: + for intervalA in self.intervals: + if intervalA[0] <= other <= intervalA[1]: return True return False |