add delete set item unittest

Franziska Geiger · Franziska Geiger · commit 715b2cd0c52c · 2019-05-07T17:32:02.000+02:00
- add missing specialization for set delete
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_set.py b/graalpython/com.oracle.graal.python.test/src/tests/test_set.py
@@ -272,3 +272,15 @@ def test_pop():
     except BaseException as e:
         assert type(e) == KeyError, "expected KeyError, got %s" % type(e)
 
+
+def test_set_delete():
+    s = {1, 2, 3}
+    assert s == {1, 2, 3}
+    s.discard(3)
+    assert s == {1, 2}
+
+    # string keys
+    s = {'a', 'b', 'c'}
+    assert s == {'a', 'b', 'c'}
+    s.discard('c')
+    assert s == {'a', 'b'}
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorageNodes.java
@@ -74,6 +74,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.builtins.objects.set.PSet;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.nodes.PGuards;
@@ -1320,11 +1321,21 @@ protected boolean doDynamicObjectString(@SuppressWarnings("unused") PDict contai
             return storage.remove(key, DEFAULT_EQIVALENCE);
         }
 
+        @Specialization
+        protected boolean doDynamicObjectString(@SuppressWarnings("unused") PSet container, DynamicObjectStorage storage, String key) {
+            return storage.remove(key, DEFAULT_EQIVALENCE);
+        }
+
         @Specialization(guards = "wrappedString(key)")
         protected boolean doDynamicObjectPString(@SuppressWarnings("unused") PDict container, DynamicObjectStorage storage, PString key) {
             return storage.remove(key.getValue(), DEFAULT_EQIVALENCE);
         }
 
+        @Specialization(guards = "wrappedString(key)")
+        protected boolean doDynamicObjectPString(@SuppressWarnings("unused") PSet container, DynamicObjectStorage storage, PString key) {
+            return storage.remove(key.getValue(), DEFAULT_EQIVALENCE);
+        }
+
         @SuppressWarnings("unused")
         @Specialization(guards = "!isJavaString(key)")
         protected boolean doDynamicObject(PHashingCollection container, DynamicObjectStorage storage, Object key) {
