Fix style

Author: Adam Hrbac

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

@@ -202,7 +202,6 @@
 import com.oracle.graal.python.nodes.builtins.ListNodes;
 import com.oracle.graal.python.nodes.builtins.ListNodes.ConstructListNode;
 import com.oracle.graal.python.nodes.bytecode.GetAIterNode;
-import com.oracle.graal.python.nodes.bytecode.GetANextNode;
 import com.oracle.graal.python.nodes.bytecode.PBytecodeRootNode;
 import com.oracle.graal.python.nodes.call.CallDispatchNode;
 import com.oracle.graal.python.nodes.call.CallNode;
@@ -2590,15 +2589,15 @@ class InitializeBuildClass {
 
     @Builtin(name = "anext", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
-    public static abstract class ANext extends PythonUnaryBuiltinNode {
+    public abstract static class ANext extends PythonUnaryBuiltinNode {
         @Specialization
         public Object doGeneric(VirtualFrame frame, Object asyncIter,
-                                @Bind("this") Node inliningTarget,
-                                @Cached(parameters = "ANext") LookupSpecialMethodSlotNode getANext,
-                                @Cached InlinedGetClassNode getAsyncIterType,
-                                @Cached PRaiseNode raiseNoANext,
-                                @Cached CallUnaryMethodNode callANext,
-                                @Cached TypeNodes.GetNameNode getName) {
+                        @Bind("this") Node inliningTarget,
+                        @Cached(parameters = "ANext") LookupSpecialMethodSlotNode getANext,
+                        @Cached InlinedGetClassNode getAsyncIterType,
+                        @Cached PRaiseNode raiseNoANext,
+                        @Cached CallUnaryMethodNode callANext,
+                        @Cached TypeNodes.GetNameNode getName) {
             // TODO: two argument anext
             Object type = getAsyncIterType.execute(inliningTarget, asyncIter);
             Object getter = getANext.execute(frame, type, asyncIter);
@@ -2611,10 +2610,10 @@ public Object doGeneric(VirtualFrame frame, Object asyncIter,
 
     @Builtin(name = "aiter", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
-    public static abstract class AIter extends PythonUnaryBuiltinNode {
+    public abstract static class AIter extends PythonUnaryBuiltinNode {
         @Specialization
         public Object doGeneric(VirtualFrame frame, Object arg,
-                                @Cached GetAIterNode aiter) {
+                        @Cached(neverDefault = true) GetAIterNode aiter) {
             return aiter.execute(frame, arg);
         }
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, 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

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/asyncio/AsyncGenSendBuiltins.java

@@ -79,7 +79,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
 
     @Builtin(name = J___AWAIT__, minNumOfPositionalArgs = 1, declaresExplicitSelf = true)
     @GenerateNodeFactory
-    public static abstract class Await extends PythonUnaryBuiltinNode {
+    public abstract static class Await extends PythonUnaryBuiltinNode {
         @Specialization
         public Object doAwait(PAsyncGenASend self) {
             return self;
@@ -88,7 +88,7 @@ public Object doAwait(PAsyncGenASend self) {
 
     @Builtin(name = J___NEXT__, minNumOfPositionalArgs = 1, declaresExplicitSelf = true)
     @GenerateNodeFactory
-    public static abstract class Next extends PythonUnaryBuiltinNode {
+    public abstract static class Next extends PythonUnaryBuiltinNode {
         @Specialization
         public Object next(VirtualFrame frame, PAsyncGenASend self,
                         @Cached Send send) {
@@ -98,7 +98,7 @@ public Object next(VirtualFrame frame, PAsyncGenASend self,
 
     @Builtin(name = "send", minNumOfPositionalArgs = 2, declaresExplicitSelf = true)
     @GenerateNodeFactory
-    public static abstract class Send extends PythonBinaryBuiltinNode {
+    public abstract static class Send extends PythonBinaryBuiltinNode {
         @Specialization
         public Object send(VirtualFrame frame, PAsyncGenASend self, Object sent,
                         @Bind("this") Node inliningTarget,
@@ -146,9 +146,9 @@ public Object send(VirtualFrame frame, PAsyncGenASend self, Object sent,
      */
 
     static PException handleAGError(PAsyncGen self, PException exception,
-                                    Node inliningTarget,
-                                    BuiltinClassProfiles.IsBuiltinObjectProfile isStopAsyncIteration,
-                                    BuiltinClassProfiles.IsBuiltinObjectProfile isGeneratorExit) {
+                    Node inliningTarget,
+                    BuiltinClassProfiles.IsBuiltinObjectProfile isStopAsyncIteration,
+                    BuiltinClassProfiles.IsBuiltinObjectProfile isGeneratorExit) {
         if (isStopAsyncIteration.profileException(inliningTarget, exception, PythonBuiltinClassType.StopAsyncIteration) ||
                         isGeneratorExit.profileException(inliningTarget, exception, PythonBuiltinClassType.GeneratorExit)) {
             self.markClosed();
@@ -171,7 +171,7 @@ static Object unwrapAGYield(PAsyncGen self, Object result,
 
     @Builtin(name = "throw", minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 4, declaresExplicitSelf = true)
     @GenerateNodeFactory
-    public static abstract class Throw extends PythonBuiltinNode {
+    public abstract static class Throw extends PythonBuiltinNode {
         public abstract Object execute(VirtualFrame frame, PAsyncGenASend self, Object arg1, Object arg2, Object arg3);
 
         @Specialization
@@ -206,7 +206,7 @@ public Object doThrow(VirtualFrame frame, PAsyncGenASend self, Object arg1, Obje
 
     @Builtin(name = J___ITER__, minNumOfPositionalArgs = 1, declaresExplicitSelf = true)
     @GenerateNodeFactory
-    public static abstract class Iter extends PythonUnaryBuiltinNode {
+    public abstract static class Iter extends PythonUnaryBuiltinNode {
         @Specialization
         public Object iter(PAsyncGenASend self) {
             return self;
@@ -215,7 +215,7 @@ public Object iter(PAsyncGenASend self) {
 
     @Builtin(name = "close", minNumOfPositionalArgs = 1, declaresExplicitSelf = true)
     @GenerateNodeFactory
-    public static abstract class Close extends PythonUnaryBuiltinNode {
+    public abstract static class Close extends PythonUnaryBuiltinNode {
         @Specialization
         public Object close(PAsyncGenASend self) {
             self.setState(AwaitableState.CLOSED);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/asyncio/AsyncGenThrowBuiltins.java

@@ -1,3 +1,43 @@
+/*
+ * Copyright (c) 2023, 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.objects.asyncio;
 
 import static com.oracle.graal.python.builtins.objects.asyncio.PAsyncGenASend.AwaitableState;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/asyncio/CoroutineWrapperBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, 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
@@ -109,7 +109,7 @@ public Object doThrow(VirtualFrame frame, PCoroutineWrapper self, Object typ, Ob
     public abstract static class CloseNode extends PythonBuiltinNode {
         @Specialization
         public Object doThrow(VirtualFrame frame, PCoroutineWrapper self,
-                              @Cached CommonGeneratorBuiltins.CloseNode closeNode) {
+                        @Cached CommonGeneratorBuiltins.CloseNode closeNode) {
             return closeNode.execute(frame, self.coroutine);
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/asyncio/GetAwaitableNode.java

@@ -53,7 +53,6 @@
 import com.oracle.graal.python.nodes.object.InlinedGetClassNode;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/asyncio/PAsyncGenASend.java

@@ -42,7 +42,6 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
-import com.oracle.graal.python.builtins.objects.generator.PGenerator;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.runtime.PAsyncGen;
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/asyncio/PAsyncGenAThrow.java

@@ -40,14 +40,13 @@
  */
 package com.oracle.graal.python.builtins.objects.asyncio;
 
+import static com.oracle.graal.python.builtins.objects.asyncio.PAsyncGenASend.AwaitableState;
+
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
-import com.oracle.graal.python.builtins.objects.generator.PGenerator;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.runtime.PAsyncGen;
 
-import static com.oracle.graal.python.builtins.objects.asyncio.PAsyncGenASend.AwaitableState;
-
 public final class PAsyncGenAThrow extends PythonBuiltinObject {
     public final PAsyncGen receiver;
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/asyncio/PAsyncGenWrappedValue.java

@@ -42,9 +42,7 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
-import com.oracle.graal.python.builtins.objects.generator.PGenerator;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
-import com.oracle.truffle.api.object.Shape;
 
 public class PAsyncGenWrappedValue extends PythonBuiltinObject {
     // TODO: consider whether a freelist makes sense

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/CoroutineBuiltins.java

@@ -64,13 +64,14 @@ public class CoroutineBuiltins extends PythonBuiltins {
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
         return CoroutineBuiltinsFactory.getFactories();
     }
+
     @Builtin(name = "cr_code", isGetter = true, minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     public abstract static class GetCode extends PythonUnaryBuiltinNode {
         @Specialization
         public Object getCode(PGenerator self,
-                              @Bind("this") Node inliningTarget,
-                              @Cached InlinedConditionProfile hasCodeProfile) {
+                        @Bind("this") Node inliningTarget,
+                        @Cached InlinedConditionProfile hasCodeProfile) {
             return self.getOrCreateCode(inliningTarget, hasCodeProfile, factory());
         }
     }
@@ -90,7 +91,7 @@ public Object getAwait(PGenerator self) {
     public abstract static class GetFrame extends PythonUnaryBuiltinNode {
         @Specialization
         public Object getFrame(VirtualFrame frame, PGenerator self,
-                               @Cached GeneratorBuiltins.GetFrameNode getFrame) {
+                        @Cached GeneratorBuiltins.GetFrameNode getFrame) {
             return getFrame.execute(frame, self);
         }
     }