add __length_hint__ support for set iterators

- fix (c) headers

Author: cosminbasca

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates.
+ * 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
+ * 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),
+ * 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,

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;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorBuiltins.java

@@ -192,57 +192,62 @@ public Object __iter__(PythonBuiltinObject self) {
     @GenerateNodeFactory
     public abstract static class LengthHintNode extends PythonUnaryBuiltinNode {
         @Specialization
-        public int next(PIntArrayIterator self) {
+        public int lengthHint(PIntArrayIterator self) {
             return self.array.len() - self.index;
         }
 
         @Specialization
-        public int next(PIntegerSequenceIterator self) {
+        public int lengthHint(PIntegerSequenceIterator self) {
             return self.sequence.length() - self.index;
         }
 
         @Specialization
-        public int next(PRangeIterator self) {
+        public int lengthHint(PRangeIterator self) {
             return self.getStop() - self.getStart();
         }
 
         @Specialization
-        public int next(PRangeReverseIterator self) {
+        public int lengthHint(PRangeReverseIterator self) {
             return self.getStart() - self.getStop();
         }
 
         @Specialization
-        public double next(PDoubleArrayIterator self) {
+        public double lengthHint(PDoubleArrayIterator self) {
             return self.array.len() - self.index;
         }
 
         @Specialization
-        public double next(PDoubleSequenceIterator self) {
+        public double lengthHint(PDoubleSequenceIterator self) {
             return self.sequence.length() - self.index;
         }
 
         @Specialization
-        public long next(PLongArrayIterator self) {
+        public long lengthHint(PLongArrayIterator self) {
             return self.array.len() - self.index;
         }
 
         @Specialization
-        public long next(PLongSequenceIterator self) {
+        public long lengthHint(PLongSequenceIterator self) {
             return self.sequence.length() - self.index;
         }
 
+        @Specialization
+        public long lengthHint(PBaseSetIterator self) {
+            return self.getSet().size() - self.getIndex();
+        }
+
         @Specialization(guards = "self.isPSequence()")
-        public Object next(PSequenceIterator self) {
+        public Object lengthHint(PSequenceIterator self) {
             return self.getPSequence().len() - self.index;
         }
 
         @Specialization
-        public Object next(PStringIterator self) {
+        public Object lengthHint(PStringIterator self) {
             return self.value.length() - self.index;
         }
 
         @Specialization(guards = "!self.isPSequence()")
-        public Object next(PSequenceIterator self,
+        public Object lengthHint(PSequenceIterator self,
                         @Cached("create(__LEN__)") LookupAndCallUnaryNode callLen,
                         @Cached("create(__SUB__, __RSUB__)") LookupAndCallBinaryNode callSub) {
             return callSub.executeObject(callLen.executeObject(self.getObject()), self.index);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/PBaseSetIterator.java

@@ -30,8 +30,14 @@
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 
 public final class PBaseSetIterator extends PJavaIteratorIterator<Object> {
+    private final PBaseSet set;
 
     public PBaseSetIterator(PythonClass clazz, PBaseSet set) {
         super(clazz, set.getDictStorage().keys().iterator());
+        this.set = set;
+    }
+
+    public PBaseSet getSet() {
+        return set;
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/HiddenAttributes.java

@@ -1,20 +1,22 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates.
+ * 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
+ * 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),
+ * 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,

mx.graalpython/copyrights/overrides

@@ -499,7 +499,6 @@ graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/JavaType
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCore.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java,zippy.copyright
-graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonParseResult.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonParser.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/BreakException.java,zippy.copyright
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/ContinueException.java,zippy.copyright