Skip to content

Fix set comparisons #908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2015
Merged

Fix set comparisons #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/runtime/dict.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Box* dictCopy(BoxedDict* self) {
raiseExcHelper(TypeError, "descriptor 'copy' requires a 'dict' object but received a '%s'", getTypeName(self));

BoxedDict* r = new BoxedDict();
r->d.insert(self->d.begin(), self->d.end());
r->d = self->d;
return r;
}

Expand Down Expand Up @@ -576,11 +576,11 @@ Box* dictEq(BoxedDict* self, Box* _rhs) {
if (self->d.size() != rhs->d.size())
return False;

for (const auto& p : *self) {
for (const auto& p : self->d) {
auto it = rhs->d.find(p.first);
if (it == rhs->d.end())
return False;
if (!nonzero(compare(p.second, it->second, AST_TYPE::Eq)))
if (!PyEq()(p.second, it->second))
return False;
}

Expand Down
77 changes: 57 additions & 20 deletions src/runtime/set.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,9 @@ static Box* setIssubset(BoxedSet* self, Box* container) {
assert(PyAnySet_Check(container));

BoxedSet* rhs = static_cast<BoxedSet*>(container);
if (self->s.size() > rhs->s.size())
return False;

for (auto e : self->s) {
if (rhs->s.find(e) == rhs->s.end())
return False;
Expand All @@ -421,13 +424,7 @@ static Box* setIssuperset(BoxedSet* self, Box* container) {
container = makeNewSet(set_cls, container);
}
assert(PyAnySet_Check(container));

BoxedSet* rhs = static_cast<BoxedSet*>(container);
for (auto e : rhs->s) {
if (self->s.find(e) == self->s.end())
return False;
}
return True;
return setIssubset((BoxedSet*)container, self);
}

static Box* setIsdisjoint(BoxedSet* self, Box* container) {
Expand Down Expand Up @@ -473,7 +470,7 @@ Box* setCopy(BoxedSet* self) {
RELEASE_ASSERT(PyAnySet_Check(self), "");

BoxedSet* rtn = new BoxedSet();
rtn->s.insert(self->s.begin(), self->s.end());
rtn->s = self->s;
return rtn;
}

Expand All @@ -497,24 +494,56 @@ Box* setContains(BoxedSet* self, Box* v) {
Box* setEq(BoxedSet* self, BoxedSet* rhs) {
RELEASE_ASSERT(PyAnySet_Check(self), "");
if (!PyAnySet_Check(rhs))
return NotImplemented;
return False;

if (self->s.size() != rhs->s.size())
return False;

for (auto e : self->s) {
if (!rhs->s.count(e))
return False;
}
return True;
return setIssubset(self, rhs);
}

Box* setNe(BoxedSet* self, BoxedSet* rhs) {
Box* r = setEq(self, rhs);
if (r->cls == bool_cls)
return boxBool(r == False);
assert(r == NotImplemented);
return r;
assert(r->cls == bool_cls);
return boxBool(r == False);
}

Box* setLe(BoxedSet* self, BoxedSet* rhs) {
RELEASE_ASSERT(PyAnySet_Check(self), "");
if (!PyAnySet_Check(rhs))
raiseExcHelper(TypeError, "can only compare to a set");

return setIssubset(self, rhs);
}

Box* setLt(BoxedSet* self, BoxedSet* rhs) {
RELEASE_ASSERT(PyAnySet_Check(self), "");
if (!PyAnySet_Check(rhs))
raiseExcHelper(TypeError, "can only compare to a set");

if (self->s.size() >= rhs->s.size())
return False;

return setIssubset(self, rhs);
}

Box* setGe(BoxedSet* self, BoxedSet* rhs) {
RELEASE_ASSERT(PyAnySet_Check(self), "");
if (!PyAnySet_Check(rhs))
raiseExcHelper(TypeError, "can only compare to a set");

return setIssuperset(self, rhs);
}

Box* setGt(BoxedSet* self, BoxedSet* rhs) {
RELEASE_ASSERT(PyAnySet_Check(self), "");
if (!PyAnySet_Check(rhs))
raiseExcHelper(TypeError, "can only compare to a set");

if (self->s.size() <= rhs->s.size())
return False;

return setIssuperset(self, rhs);
}

Box* setNonzero(BoxedSet* self) {
Expand Down Expand Up @@ -627,10 +656,18 @@ void setupSet() {
set_cls->giveAttr("__contains__", new BoxedFunction(boxRTFunction((void*)setContains, BOXED_BOOL, 2)));
frozenset_cls->giveAttr("__contains__", set_cls->getattr(internStringMortal("__contains__")));

set_cls->giveAttr("__eq__", new BoxedFunction(boxRTFunction((void*)setEq, UNKNOWN, 2)));
set_cls->giveAttr("__eq__", new BoxedFunction(boxRTFunction((void*)setEq, BOXED_BOOL, 2)));
frozenset_cls->giveAttr("__eq__", set_cls->getattr(internStringMortal("__eq__")));
set_cls->giveAttr("__ne__", new BoxedFunction(boxRTFunction((void*)setNe, UNKNOWN, 2)));
set_cls->giveAttr("__ne__", new BoxedFunction(boxRTFunction((void*)setNe, BOXED_BOOL, 2)));
frozenset_cls->giveAttr("__ne__", set_cls->getattr(internStringMortal("__ne__")));
set_cls->giveAttr("__le__", new BoxedFunction(boxRTFunction((void*)setLe, BOXED_BOOL, 2)));
frozenset_cls->giveAttr("__le__", set_cls->getattr(internStringMortal("__le__")));
set_cls->giveAttr("__lt__", new BoxedFunction(boxRTFunction((void*)setLt, BOXED_BOOL, 2)));
frozenset_cls->giveAttr("__lt__", set_cls->getattr(internStringMortal("__lt__")));
set_cls->giveAttr("__ge__", new BoxedFunction(boxRTFunction((void*)setGe, BOXED_BOOL, 2)));
frozenset_cls->giveAttr("__ge__", set_cls->getattr(internStringMortal("__ge__")));
set_cls->giveAttr("__gt__", new BoxedFunction(boxRTFunction((void*)setGt, BOXED_BOOL, 2)));
frozenset_cls->giveAttr("__gt__", set_cls->getattr(internStringMortal("__gt__")));

set_cls->giveAttr("__nonzero__", new BoxedFunction(boxRTFunction((void*)setNonzero, BOXED_BOOL, 1)));
frozenset_cls->giveAttr("__nonzero__", set_cls->getattr(internStringMortal("__nonzero__")));
Expand Down
8 changes: 6 additions & 2 deletions test/tests/set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,12 @@ class MyFrozenset(frozenset):

for s1 in set(range(5)), frozenset(range(5)):
for s2 in compare_to:
print type(s2), sorted(s2), s1.issubset(s2), s1.issuperset(s2), s1 == s2, s1 != s2, sorted(s1.difference(s2)), s1.isdisjoint(s2), sorted(s1.union(s2)), sorted(s1.intersection(s2))

print type(s2), sorted(s2), s1.issubset(s2), s1.issuperset(s2), sorted(s1.difference(s2)), s1.isdisjoint(s2), sorted(s1.union(s2)), sorted(s1.intersection(s2))
print s1 == s2, s1 != s2
try:
print s1 < s2, s1 <= s2, s1 > s2, s1 >= s2
except Exception as e:
print e
f = float('nan')
s = set([f])
print f in s, f == list(s)[0]
Expand Down