minor - adjusting dictXXXiterator class, enum and method names to the iterators correct class name

tomasstupka · tomasstupka · commit f53e228fec1a · 2020-06-12T12:13:11.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java
@@ -70,10 +70,10 @@ public enum PythonBuiltinClassType implements LazyPythonClass {
     PComplex("complex", BuiltinNames.BUILTINS),
     PDict("dict", BuiltinNames.BUILTINS),
     PDictKeysView(BuiltinNames.DICT_KEYS),
-    PDictItemsIterator(BuiltinNames.DICT_ITEMITERATOR),
+    PDictItemIterator(BuiltinNames.DICT_ITEMITERATOR),
     PDictItemsView(BuiltinNames.DICT_ITEMS),
-    PDictKeysIterator(BuiltinNames.DICT_KEYITERATOR),
-    PDictValuesIterator(BuiltinNames.DICT_VALUEITERATOR),
+    PDictKeyIterator(BuiltinNames.DICT_KEYITERATOR),
+    PDictValueIterator(BuiltinNames.DICT_VALUEITERATOR),
     PDictValuesView(BuiltinNames.DICT_VALUES),
     PEllipsis("ellipsis"),
     PEnumerate("enumerate", BuiltinNames.BUILTINS),
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java
@@ -2686,7 +2686,7 @@ public Object dictKeys(Object args, Object kwargs) {
         }
     }
 
-    @Builtin(name = DICT_KEYITERATOR, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PDictKeysIterator, isPublic = false)
+    @Builtin(name = DICT_KEYITERATOR, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PDictKeyIterator, isPublic = false)
     @GenerateNodeFactory
     public abstract static class DictKeysIteratorTypeNode extends PythonBuiltinNode {
         @SuppressWarnings("unused")
@@ -2706,7 +2706,7 @@ public Object dictKeys(Object args, Object kwargs) {
         }
     }
 
-    @Builtin(name = DICT_VALUEITERATOR, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PDictValuesIterator, isPublic = false)
+    @Builtin(name = DICT_VALUEITERATOR, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PDictValueIterator, isPublic = false)
     @GenerateNodeFactory
     public abstract static class DictValuesIteratorTypeNode extends PythonBuiltinNode {
         @SuppressWarnings("unused")
@@ -2726,7 +2726,7 @@ public Object dictKeys(Object args, Object kwargs) {
         }
     }
 
-    @Builtin(name = DICT_ITEMITERATOR, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PDictItemsIterator, isPublic = false)
+    @Builtin(name = DICT_ITEMITERATOR, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PDictItemIterator, isPublic = false)
     @GenerateNodeFactory
     public abstract static class DictItemsIteratorTypeNode extends PythonBuiltinNode {
         @SuppressWarnings("unused")
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java
@@ -350,7 +350,7 @@ Object run(VirtualFrame frame, PDict self, Object key,
     public abstract static class IterNode extends PythonUnaryBuiltinNode {
         @Specialization
         Object run(PDict self) {
-            return factory().createDictKeysIterator(self);
+            return factory().createDictKeyIterator(self);
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictItemsIteratorBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictItemsIteratorBuiltins.java
@@ -35,7 +35,7 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage.DictEntry;
-import com.oracle.graal.python.builtins.objects.dict.PDictView.PDictItemsIterator;
+import com.oracle.graal.python.builtins.objects.dict.PDictView.PDictItemIterator;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
@@ -47,7 +47,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-@CoreFunctions(extendClasses = PythonBuiltinClassType.PDictItemsIterator)
+@CoreFunctions(extendClasses = PythonBuiltinClassType.PDictItemIterator)
 public final class DictItemsIteratorBuiltins extends PythonBuiltins {
 
     @Override
@@ -59,7 +59,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @GenerateNodeFactory
     public abstract static class NextNode extends PythonUnaryBuiltinNode {
         @Specialization
-        Object run(PDictItemsIterator self,
+        Object run(PDictItemIterator self,
                         @Cached("createBinaryProfile()") ConditionProfile profile) {
             if (profile.profile(hasNext(self))) {
                 DictEntry value = next(self);
@@ -69,12 +69,12 @@ Object run(PDictItemsIterator self,
         }
 
         @TruffleBoundary
-        private static DictEntry next(PDictItemsIterator self) {
+        private static DictEntry next(PDictItemIterator self) {
             return self.getIterator().next();
         }
 
         @TruffleBoundary
-        private static boolean hasNext(PDictItemsIterator self) {
+        private static boolean hasNext(PDictItemIterator self) {
             return self.getIterator().hasNext();
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictKeysIteratorBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictKeysIteratorBuiltins.java
@@ -34,7 +34,7 @@
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
-import com.oracle.graal.python.builtins.objects.dict.PDictView.PDictKeysIterator;
+import com.oracle.graal.python.builtins.objects.dict.PDictView.PDictKeyIterator;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
@@ -45,7 +45,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-@CoreFunctions(extendClasses = PythonBuiltinClassType.PDictKeysIterator)
+@CoreFunctions(extendClasses = PythonBuiltinClassType.PDictKeyIterator)
 public final class DictKeysIteratorBuiltins extends PythonBuiltins {
 
     @Override
@@ -57,7 +57,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @GenerateNodeFactory
     public abstract static class NextNode extends PythonUnaryBuiltinNode {
         @Specialization
-        Object run(PDictKeysIterator self,
+        Object run(PDictKeyIterator self,
                         @Cached("createBinaryProfile()") ConditionProfile profile) {
             if (profile.profile(self.getIterator().hasNext())) {
                 return self.getIterator().next();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictValuesBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictValuesBuiltins.java
@@ -77,7 +77,7 @@ public abstract static class IterNode extends PythonUnaryBuiltinNode {
         Object doPDictValuesView(PDictValuesView self,
                         @Cached HashingCollectionNodes.GetDictStorageNode getStore,
                         @CachedLibrary("getStore.execute(self.getWrappedDict())") HashingStorageLibrary lib) {
-            return factory().createDictValuesIterator(lib.values(getStore.execute(self.getWrappedDict())).iterator());
+            return factory().createDictValueIterator(lib.values(getStore.execute(self.getWrappedDict())).iterator());
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictValuesIteratorBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictValuesIteratorBuiltins.java
@@ -34,7 +34,7 @@
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
-import com.oracle.graal.python.builtins.objects.dict.PDictView.PDictValuesIterator;
+import com.oracle.graal.python.builtins.objects.dict.PDictView.PDictValueIterator;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
@@ -45,7 +45,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-@CoreFunctions(extendClasses = PythonBuiltinClassType.PDictValuesIterator)
+@CoreFunctions(extendClasses = PythonBuiltinClassType.PDictValueIterator)
 public final class DictValuesIteratorBuiltins extends PythonBuiltins {
 
     @Override
@@ -57,7 +57,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @GenerateNodeFactory
     public abstract static class NextNode extends PythonUnaryBuiltinNode {
         @Specialization
-        Object run(PDictValuesIterator self,
+        Object run(PDictValueIterator self,
                         @Cached("createBinaryProfile()") ConditionProfile profile) {
             if (profile.profile(self.getIterator().hasNext())) {
                 return self.getIterator().next();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictViewBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictViewBuiltins.java
@@ -120,14 +120,14 @@ Object len(PDictView self) {
     public abstract static class IterNode extends PythonUnaryBuiltinNode {
         @Specialization
         Object getKeysViewIter(PDictKeysView self) {
-            return factory().createDictKeysIterator(self.getWrappedDict());
+            return factory().createDictKeyIterator(self.getWrappedDict());
         }
 
         @Specialization(limit = "getCallSiteInlineCacheMaxDepth()")
         Object getItemsViewIter(PDictItemsView self,
                         @Cached HashingCollectionNodes.GetDictStorageNode getStore,
                         @CachedLibrary("getStore.execute(self.getWrappedDict())") HashingStorageLibrary lib) {
-            return factory().createDictItemsIterator(lib.entries(getStore.execute(self.getWrappedDict())).iterator());
+            return factory().createDictItemIterator(lib.entries(getStore.execute(self.getWrappedDict())).iterator());
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/PDictView.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/PDictView.java
@@ -70,8 +70,8 @@ public int size() {
     // the keys
     //
     // -----------------------------------------------------------------------------------------------------------------
-    public static final class PDictKeysIterator extends PHashingStorageIterator<Object> {
-        public PDictKeysIterator(Object clazz, DynamicObject storage, PHashingCollection dict) {
+    public static final class PDictKeyIterator extends PHashingStorageIterator<Object> {
+        public PDictKeyIterator(Object clazz, DynamicObject storage, PHashingCollection dict) {
             super(clazz, storage, dict.keys().iterator());
         }
     }
@@ -88,8 +88,8 @@ public PDictKeysView(Object clazz, DynamicObject storage, PHashingCollection dic
     // the values
     //
     // -----------------------------------------------------------------------------------------------------------------
-    public static final class PDictValuesIterator extends PHashingStorageIterator<Object> {
-        public PDictValuesIterator(Object clazz, DynamicObject storage, HashingStorageIterator<Object> iterator) {
+    public static final class PDictValueIterator extends PHashingStorageIterator<Object> {
+        public PDictValueIterator(Object clazz, DynamicObject storage, HashingStorageIterator<Object> iterator) {
             super(clazz, storage, iterator);
         }
     }
@@ -106,8 +106,8 @@ public PDictValuesView(Object clazz, DynamicObject storage, PHashingCollection d
     // the items
     //
     // -----------------------------------------------------------------------------------------------------------------
-    public static final class PDictItemsIterator extends PHashingStorageIterator<DictEntry> {
-        public PDictItemsIterator(Object clazz, DynamicObject storage, HashingStorageIterator<DictEntry> iterator) {
+    public static final class PDictItemIterator extends PHashingStorageIterator<DictEntry> {
+        public PDictItemIterator(Object clazz, DynamicObject storage, HashingStorageIterator<DictEntry> iterator) {
             super(clazz, storage, iterator);
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/mappingproxy/MappingproxyBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/mappingproxy/MappingproxyBuiltins.java
@@ -88,7 +88,7 @@ Object doPMappingproxy(PMappingproxy self, Object mapping) {
     public abstract static class IterNode extends PythonUnaryBuiltinNode {
         @Specialization
         Object run(PMappingproxy self) {
-            return factory().createDictKeysIterator(self);
+            return factory().createDictKeyIterator(self);
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java
@@ -53,8 +53,11 @@
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.dict.PDictView;
+import com.oracle.graal.python.builtins.objects.dict.PDictView.PDictItemIterator;
 import com.oracle.graal.python.builtins.objects.dict.PDictView.PDictItemsView;
+import com.oracle.graal.python.builtins.objects.dict.PDictView.PDictKeyIterator;
 import com.oracle.graal.python.builtins.objects.dict.PDictView.PDictKeysView;
+import com.oracle.graal.python.builtins.objects.dict.PDictView.PDictValueIterator;
 import com.oracle.graal.python.builtins.objects.dict.PDictView.PDictValuesView;
 import com.oracle.graal.python.builtins.objects.enumerate.PEnumerate;
 import com.oracle.graal.python.builtins.objects.exception.PBaseException;
@@ -760,16 +763,16 @@ public PBaseSetIterator createBaseSetIterator(PBaseSet set, HashingStorageIterat
         return trace(new PBaseSetIterator(PythonBuiltinClassType.PIterator, PythonBuiltinClassType.PIterator.newInstance(), set, iterator));
     }
 
-    public PDictView.PDictItemsIterator createDictItemsIterator(HashingStorageIterator<DictEntry> iterator) {
-        return trace(new PDictView.PDictItemsIterator(PythonBuiltinClassType.PDictItemsIterator, PythonBuiltinClassType.PDictItemsIterator.newInstance(), iterator));
+    public PDictItemIterator createDictItemIterator(HashingStorageIterator<DictEntry> iterator) {
+        return trace(new PDictItemIterator(PythonBuiltinClassType.PDictItemIterator, PythonBuiltinClassType.PDictItemIterator.newInstance(), iterator));
     }
 
-    public PDictView.PDictKeysIterator createDictKeysIterator(PHashingCollection dict) {
-        return trace(new PDictView.PDictKeysIterator(PythonBuiltinClassType.PDictKeysIterator, PythonBuiltinClassType.PDictKeysIterator.newInstance(), dict));
+    public PDictKeyIterator createDictKeyIterator(PHashingCollection dict) {
+        return trace(new PDictKeyIterator(PythonBuiltinClassType.PDictKeyIterator, PythonBuiltinClassType.PDictKeyIterator.newInstance(), dict));
     }
 
-    public PDictView.PDictValuesIterator createDictValuesIterator(HashingStorageIterator<Object> iterator) {
-        return trace(new PDictView.PDictValuesIterator(PythonBuiltinClassType.PDictValuesIterator, PythonBuiltinClassType.PDictValuesIterator.newInstance(), iterator));
+    public PDictValueIterator createDictValueIterator(HashingStorageIterator<Object> iterator) {
+        return trace(new PDictValueIterator(PythonBuiltinClassType.PDictValueIterator, PythonBuiltinClassType.PDictValueIterator.newInstance(), iterator));
     }
 
     public Object createSentinelIterator(Object callable, Object sentinel) {

Original file line number	Diff line number	Diff line change
`@@ -2686,7 +2686,7 @@ public Object dictKeys(Object args, Object kwargs) {`
`2686`	`2686`	`}`
`2687`	`2687`	`}`
`2688`	`2688`
`2689`		`- @Builtin(name = DICT_KEYITERATOR, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PDictKeysIterator, isPublic = false)`
	`2689`	`+ @Builtin(name = DICT_KEYITERATOR, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PDictKeyIterator, isPublic = false)`
`2690`	`2690`	`@GenerateNodeFactory`
`2691`	`2691`	`public abstract static class DictKeysIteratorTypeNode extends PythonBuiltinNode {`
`2692`	`2692`	`@SuppressWarnings("unused")`
`@@ -2706,7 +2706,7 @@ public Object dictKeys(Object args, Object kwargs) {`
`2706`	`2706`	`}`
`2707`	`2707`	`}`
`2708`	`2708`
`2709`		`- @Builtin(name = DICT_VALUEITERATOR, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PDictValuesIterator, isPublic = false)`
	`2709`	`+ @Builtin(name = DICT_VALUEITERATOR, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PDictValueIterator, isPublic = false)`
`2710`	`2710`	`@GenerateNodeFactory`
`2711`	`2711`	`public abstract static class DictValuesIteratorTypeNode extends PythonBuiltinNode {`
`2712`	`2712`	`@SuppressWarnings("unused")`
`@@ -2726,7 +2726,7 @@ public Object dictKeys(Object args, Object kwargs) {`
`2726`	`2726`	`}`
`2727`	`2727`	`}`
`2728`	`2728`
`2729`		`- @Builtin(name = DICT_ITEMITERATOR, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PDictItemsIterator, isPublic = false)`
	`2729`	`+ @Builtin(name = DICT_ITEMITERATOR, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PDictItemIterator, isPublic = false)`
`2730`	`2730`	`@GenerateNodeFactory`
`2731`	`2731`	`public abstract static class DictItemsIteratorTypeNode extends PythonBuiltinNode {`
`2732`	`2732`	`@SuppressWarnings("unused")`
Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ Object run(VirtualFrame frame, PDict self, Object key,`
`350`	`350`	`public abstract static class IterNode extends PythonUnaryBuiltinNode {`
`351`	`351`	`@Specialization`
`352`	`352`	`Object run(PDict self) {`
`353`		`- return factory().createDictKeysIterator(self);`
	`353`	`+ return factory().createDictKeyIterator(self);`
`354`	`354`	`}`
`355`	`355`	`}`
`356`	`356`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public abstract static class IterNode extends PythonUnaryBuiltinNode {`
`77`	`77`	`Object doPDictValuesView(PDictValuesView self,`
`78`	`78`	`@Cached HashingCollectionNodes.GetDictStorageNode getStore,`
`79`	`79`	`@CachedLibrary("getStore.execute(self.getWrappedDict())") HashingStorageLibrary lib) {`
`80`		`- return factory().createDictValuesIterator(lib.values(getStore.execute(self.getWrappedDict())).iterator());`
	`80`	`+ return factory().createDictValueIterator(lib.values(getStore.execute(self.getWrappedDict())).iterator());`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -120,14 +120,14 @@ Object len(PDictView self) {`
`120`	`120`	`public abstract static class IterNode extends PythonUnaryBuiltinNode {`
`121`	`121`	`@Specialization`
`122`	`122`	`Object getKeysViewIter(PDictKeysView self) {`
`123`		`- return factory().createDictKeysIterator(self.getWrappedDict());`
	`123`	`+ return factory().createDictKeyIterator(self.getWrappedDict());`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`@Specialization(limit = "getCallSiteInlineCacheMaxDepth()")`
`127`	`127`	`Object getItemsViewIter(PDictItemsView self,`
`128`	`128`	`@Cached HashingCollectionNodes.GetDictStorageNode getStore,`
`129`	`129`	`@CachedLibrary("getStore.execute(self.getWrappedDict())") HashingStorageLibrary lib) {`
`130`		`- return factory().createDictItemsIterator(lib.entries(getStore.execute(self.getWrappedDict())).iterator());`
	`130`	`+ return factory().createDictItemIterator(lib.entries(getStore.execute(self.getWrappedDict())).iterator());`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ public int size() {`
`70`	`70`	`// the keys`
`71`	`71`	`//`
`72`	`72`	`// -----------------------------------------------------------------------------------------------------------------`
`73`		`- public static final class PDictKeysIterator extends PHashingStorageIterator<Object> {`
`74`		`- public PDictKeysIterator(Object clazz, DynamicObject storage, PHashingCollection dict) {`
	`73`	`+ public static final class PDictKeyIterator extends PHashingStorageIterator<Object> {`
	`74`	`+ public PDictKeyIterator(Object clazz, DynamicObject storage, PHashingCollection dict) {`
`75`	`75`	`super(clazz, storage, dict.keys().iterator());`
`76`	`76`	`}`
`77`	`77`	`}`
`@@ -88,8 +88,8 @@ public PDictKeysView(Object clazz, DynamicObject storage, PHashingCollection dic`
`88`	`88`	`// the values`
`89`	`89`	`//`
`90`	`90`	`// -----------------------------------------------------------------------------------------------------------------`
`91`		`- public static final class PDictValuesIterator extends PHashingStorageIterator<Object> {`
`92`		`- public PDictValuesIterator(Object clazz, DynamicObject storage, HashingStorageIterator<Object> iterator) {`
	`91`	`+ public static final class PDictValueIterator extends PHashingStorageIterator<Object> {`
	`92`	`+ public PDictValueIterator(Object clazz, DynamicObject storage, HashingStorageIterator<Object> iterator) {`
`93`	`93`	`super(clazz, storage, iterator);`
`94`	`94`	`}`
`95`	`95`	`}`
`@@ -106,8 +106,8 @@ public PDictValuesView(Object clazz, DynamicObject storage, PHashingCollection d`
`106`	`106`	`// the items`
`107`	`107`	`//`
`108`	`108`	`// -----------------------------------------------------------------------------------------------------------------`
`109`		`- public static final class PDictItemsIterator extends PHashingStorageIterator<DictEntry> {`
`110`		`- public PDictItemsIterator(Object clazz, DynamicObject storage, HashingStorageIterator<DictEntry> iterator) {`
	`109`	`+ public static final class PDictItemIterator extends PHashingStorageIterator<DictEntry> {`
	`110`	`+ public PDictItemIterator(Object clazz, DynamicObject storage, HashingStorageIterator<DictEntry> iterator) {`
`111`	`111`	`super(clazz, storage, iterator);`
`112`	`112`	`}`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ Object doPMappingproxy(PMappingproxy self, Object mapping) {`
`88`	`88`	`public abstract static class IterNode extends PythonUnaryBuiltinNode {`
`89`	`89`	`@Specialization`
`90`	`90`	`Object run(PMappingproxy self) {`
`91`		`- return factory().createDictKeysIterator(self);`
	`91`	`+ return factory().createDictKeyIterator(self);`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`