[pypy-commit] pypy set-strategies: renamed not_comparable to more convenient not_contain_equal_elements

l.diekmann noreply at buildbot.pypy.org
Thu Nov 10 13:52:29 CET 2011


Author: Lukas Diekmann <lukas.diekmann at uni-duesseldorf.de>
Branch: set-strategies
Changeset: r49260:d62d426fd752
Date: 2011-11-03 15:42 +0100
http://bitbucket.org/pypy/pypy/changeset/d62d426fd752/

Log:	renamed not_comparable to more convenient not_contain_equal_elements

diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -506,7 +506,7 @@
         if self is w_other.strategy:
             strategy = w_set.strategy
             storage = self._difference_unwrapped(w_set, w_other)
-        elif not_comparable(self.space, w_set.strategy, w_other.strategy):
+        elif not_contain_equal_elements(self.space, w_set, w_other):
             strategy = w_set.strategy
             storage = w_set.sstorage
         else:
@@ -894,14 +894,14 @@
 
 # some helper functions
 
-def not_comparable(space, strategy1, strategy2):
-    # add all strategies here that cannot be compared. this way is safer than
-    # adding only types that can be compared. else we get wrong results if
-    # someone adds new strategies and forgets to define them here. since this
-    # is only a fastpath we want to avoid possible errors
+def not_contain_equal_elements(space, w_set, w_other):
+    strategy1 = w_set.strategy
+    strategy2 = w_other.strategy
+    # add strategies here for which elements from sets with theses strategies are never equal.
     if strategy1 is space.fromcache(StringSetStrategy) and strategy2 is space.fromcache(IntegerSetStrategy):
         return True
     if strategy1 is space.fromcache(EmptySetStrategy) or strategy2 is space.fromcache(EmptySetStrategy):
+        # an empty set and another set will never have any equal element
         return True
     return False
 


More information about the pypy-commit mailing list