[GR-10520] test_set unittets

PullRequest: graalpython/93

Author: cosminbasca

graalpython/com.oracle.graal.python.test/src/tests/test_bytes.py

@@ -448,3 +448,8 @@ def test_find():
     assert b.find(i, 6) == 7
     assert b.find(i, 1, 3) == 1
     assert b.find(w, 1, 3) == -1
+
+
+def test_same_id():
+    empty_ids = set([id(bytes()) for i in range(100)])
+    assert len(empty_ids) == 1

graalpython/com.oracle.graal.python.test/src/tests/test_generators.py

@@ -168,3 +168,13 @@ def f():
 
 if sys.version_info.minor == 4 and sys.version_info.micro < 3:
     del ExceptionTest
+
+
+def test_generator_starargs():
+    def func(*args):
+        return set(args)
+
+    lst = [x for x in range(10)]
+    gen = (x for x in range(10))
+    assert func(*lst) == set(lst)
+    assert func(*gen) == set(lst)

graalpython/com.oracle.graal.python.test/src/tests/test_set.py

@@ -126,7 +126,10 @@ def test_difference():
 def test_difference_update():
     word = 'simsalabim'
     otherword = 'madagascar'
+    letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
     s = set(word)
+    d = dict.fromkeys(word)
+
 
     retval = s.difference_update(otherword)
     assert retval == None
@@ -176,3 +179,76 @@ def test_sub_and_super():
         assert set('abc').issuperset('a')
         assert not set('a').issubset('cbs')
         assert not set('cbs').issuperset('a')
+
+
+def test_intersection():
+    word = 'simsalabim'
+    otherword = 'madagascar'
+    letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+    s = set(word)
+    d = dict.fromkeys(word)
+
+    i = s.intersection(otherword)
+    for c in letters:
+        assert (c in i) == (c in d and c in otherword)
+
+    assert s == set(word)
+    # assert type(i) == set
+    assert_raises(PassThru, s.intersection, check_pass_thru())
+
+    for C in set, frozenset, dict.fromkeys, str, list, tuple:
+        assert set('abcba').intersection(C('cdc')) == set('cc')
+        assert set('abcba').intersection(C('efgfe')) == set('')
+        assert set('abcba').intersection(C('ccb')) == set('bc')
+        assert set('abcba').intersection(C('ef')) == set('')
+        assert set('abcba').intersection(C('cbcf'), C('bag')) == set('b')
+
+    # TODO: currently the id function behaves a bit differently than the one in cPython
+    # s = set('abcba')
+    # z = s.intersection()
+    # if set == frozenset():
+    #     assert id(s) == id(z)
+    # else:
+    #     assert id(s) != id(z)
+
+
+def test_same_id():
+    empty_ids = set([id(frozenset()) for i in range(100)])
+    assert len(empty_ids) == 1
+
+
+def test_rich_compare():
+    class TestRichSetCompare:
+        def __gt__(self, some_set):
+            self.gt_called = True
+            return False
+        def __lt__(self, some_set):
+            self.lt_called = True
+            return False
+        def __ge__(self, some_set):
+            self.ge_called = True
+            return False
+        def __le__(self, some_set):
+            self.le_called = True
+            return False
+
+    # This first tries the builtin rich set comparison, which doesn't know
+    # how to handle the custom object. Upon returning NotImplemented, the
+    # corresponding comparison on the right object is invoked.
+    myset = {1, 2, 3}
+
+    myobj = TestRichSetCompare()
+    myset < myobj
+    assert myobj.gt_called
+
+    myobj = TestRichSetCompare()
+    myset > myobj
+    assert myobj.lt_called
+
+    myobj = TestRichSetCompare()
+    myset <= myobj
+    assert myobj.ge_called
+
+    myobj = TestRichSetCompare()
+    myset >= myobj
+    assert myobj.le_called

graalpython/com.oracle.graal.python.test/src/tests/test_tuple.py

@@ -3,7 +3,6 @@
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 import seq_tests
-import unittest
 #import pickle
 from compare import CompareTest
 
@@ -374,3 +373,8 @@ def test_slice(self):
         t1 = tuple(range (1, 22, 2))
         s = slice(2, 6)
         self.assertEqual(t1[s], (5, 7, 9, 11))
+
+
+def test_same_id():
+    empty_ids = set([id(tuple()) for i in range(100)])
+    assert len(empty_ids) == 1

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonImmutableBuiltinType.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.builtins;
+
+public enum PythonImmutableBuiltinType {
+    PFrozenSet,
+    PTuple,
+    PBytes
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -171,7 +171,7 @@ protected List<com.oracle.truffle.api.dsl.NodeFactory<? extends PythonBuiltinBas
     @GenerateNodeFactory
     public abstract static class BytesNode extends PythonBuiltinNode {
 
-        @Specialization
+        @Specialization(guards = "isNoValue(source)")
         public PBytes bytes(PythonClass cls, @SuppressWarnings("unused") PNone source, @SuppressWarnings("unused") PNone encoding, @SuppressWarnings("unused") PNone errors) {
             return factory().createBytes(cls, new byte[0]);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -53,6 +53,7 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.SETATTR;
 import static com.oracle.graal.python.nodes.BuiltinNames.SUM;
 import static com.oracle.graal.python.nodes.BuiltinNames.__BREAKPOINT__;
+import static com.oracle.graal.python.nodes.HiddenAttributes.ID_KEY;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INSTANCECHECK__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__LEN__;
@@ -74,6 +75,7 @@
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.builtins.PythonImmutableBuiltinType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
@@ -87,6 +89,7 @@
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.builtins.objects.set.PFrozenSet;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
@@ -144,7 +147,6 @@
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
-import com.oracle.truffle.api.object.HiddenKey;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.Source;
 
@@ -637,8 +639,6 @@ public abstract static class IdNode extends PythonBuiltinNode {
          * The next available global id. We reserve space for all integers to be their own id +
          * offset.
          */
-        private static long GLOBAL_ID = Integer.MAX_VALUE * 2 + 4L;
-        private static HiddenKey idKey = new HiddenKey("object_id");
 
         @Child private ReadAttributeFromObjectNode readId = null;
         @Child private WriteAttributeToObjectNode writeId = null;
@@ -690,7 +690,28 @@ int doId(double value) {
             return Double.hashCode(value);
         }
 
-        @Specialization(guards = {"!isPInt(obj)", "!isPString(obj)", "!isPFloat(obj)"})
+        @Specialization(guards = "isEmpty(value)")
+        Object doEmptyTuple(PTuple value) {
+            return getId(value, PythonImmutableBuiltinType.PTuple);
+        }
+
+        @Specialization(guards = "isEmpty(value)")
+        Object doEmptyBytes(PBytes value) {
+            return getId(value, PythonImmutableBuiltinType.PBytes);
+        }
+
+        @Specialization(guards = "isEmpty(value)")
+        Object doEmptyFrozenSet(PFrozenSet value) {
+            return getId(value, PythonImmutableBuiltinType.PFrozenSet);
+        }
+
+        protected boolean isEmptyImmutableBuiltin(Object object) {
+            return (object instanceof PTuple && PGuards.isEmpty((PTuple) object)) ||
+                            (object instanceof PBytes && PGuards.isEmpty((PBytes) object)) ||
+                            (object instanceof PFrozenSet && PGuards.isEmpty((PFrozenSet) object));
+        }
+
+        @Specialization(guards = {"!isPInt(obj)", "!isPString(obj)", "!isPFloat(obj)", "!isEmptyImmutableBuiltin(obj)"})
         Object doId(PythonObject obj) {
             return getId(obj);
         }
@@ -701,15 +722,23 @@ Object doId(Object obj) {
         }
 
         private Object getId(PythonObject obj) {
+            return getId(obj, null);
+        }
+
+        private Object getId(PythonObject obj, PythonImmutableBuiltinType immutableType) {
             if (readId == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 readId = insert(ReadAttributeFromObjectNode.create());
                 writeId = insert(WriteAttributeToObjectNode.create());
             }
-            Object id = readId.execute(obj, idKey);
+            Object id = readId.execute(obj, ID_KEY);
             if (id == NO_VALUE) {
-                id = GLOBAL_ID++;
-                writeId.execute(obj, idKey, id);
+                if (immutableType != null) {
+                    id = getContext().getEmptyImmutableObjectGlobalId(immutableType);
+                } else {
+                    id = getContext().getNextGlobalId();
+                }
+                writeId.execute(obj, ID_KEY, id);
             }
             return id;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorage.java

@@ -234,8 +234,25 @@ public void addAll(HashingStorage other, Equivalence eq) {
 
     public abstract Iterable<Object> keys();
 
+    private Object[] iteratorAsArray(Iterable<Object> iterable) {
+        Object[] items = new Object[this.length()];
+        int i = 0;
+        for (Object item : iterable) {
+            items[i++] = item;
+        }
+        return items;
+    }
+
+    public Object[] keysAsArray() {
+        return iteratorAsArray(keys());
+    }
+
     public abstract Iterable<Object> values();
 
+    public Object[] valuesAsArray() {
+        return iteratorAsArray(values());
+    }
+
     public abstract Iterable<DictEntry> entries();
 
     public abstract void clear();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/PJavaIteratorIterator.java

@@ -34,6 +34,7 @@
 public abstract class PJavaIteratorIterator<T> extends PythonBuiltinObject {
 
     private final Iterator<T> iterator;
+    private int index;
 
     public PJavaIteratorIterator(PythonClass clazz, Iterator<T> iterator) {
         super(clazz);
@@ -47,11 +48,16 @@ public Iterator<T> getIterator() {
     @TruffleBoundary
     public final Object next() {
         assert hasNext();
+        index++;
         return iterator.next();
     }
 
     @TruffleBoundary
     public final boolean hasNext() {
         return iterator.hasNext();
     }
+
+    public int getIndex() {
+        return index;
+    }
 }