Skip to content

Commit 230d0ec

Browse files
committed
style fixes
1 parent df80be8 commit 230d0ec

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import static com.oracle.graal.python.nodes.StringLiterals.T_EXT_DYLIB;
5252
import static com.oracle.graal.python.nodes.StringLiterals.T_EXT_PYD;
5353
import static com.oracle.graal.python.nodes.StringLiterals.T_EXT_SO;
54-
import static com.oracle.graal.python.nodes.StringLiterals.T_EXT_SU;
5554
import static com.oracle.graal.python.nodes.StringLiterals.T_HPY_SUFFIX;
5655
import static com.oracle.graal.python.nodes.StringLiterals.T_LITTLE;
5756
import static com.oracle.graal.python.nodes.StringLiterals.T_NAME;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltinRegistry.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ private PythonCextBuiltinRegistry() {
5656
// This can be re-generated using the 'mx python-capi-forwards' command or
5757
// by executing the main class CApiCodeGen
5858

59-
//@formatter:off
59+
// @formatter:off
60+
// Checkstyle: stop
6061
public static final CApiBuiltinExecutable PyByteArray_Resize = new CApiBuiltinExecutable("PyByteArray_Resize", CApiCallPath.Direct, ArgDescriptor.Int, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.Py_ssize_t}, 0);
6162
public static final CApiBuiltinExecutable PyBytes_FromObject = new CApiBuiltinExecutable("PyBytes_FromObject", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject}, 1);
6263
public static final CApiBuiltinExecutable PyBytes_Size = new CApiBuiltinExecutable("PyBytes_Size", CApiCallPath.Direct, ArgDescriptor.Py_ssize_t, new ArgDescriptor[]{ArgDescriptor.PyObject}, 2);
@@ -2398,6 +2399,6 @@ public static CApiBuiltinExecutable getSlot(String key) {
23982399
}
23992400
return null;
24002401
}
2401-
//@formatter:on
2402+
// @formatter:on
24022403
// {{end CAPI_BUILTINS}}
24032404
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextModuleBuiltins.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiTernaryBuiltinNode;
6666
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiUnaryBuiltinNode;
6767
import com.oracle.graal.python.builtins.modules.cext.PythonCextMethodBuiltins.CFunctionNewExMethodNode;
68-
import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
6968
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor;
7069
import com.oracle.graal.python.builtins.objects.module.PythonModule;
7170
import com.oracle.graal.python.builtins.objects.object.ObjectBuiltins;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiCodeGen.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,8 @@ private static boolean generateCApiHeader(List<CApiBuiltinDesc> javaBuiltins) th
429429
private static boolean generateBuiltinRegistry(List<CApiBuiltinDesc> javaBuiltins) throws IOException {
430430
ArrayList<String> lines = new ArrayList<>();
431431

432-
lines.add(" //@formatter:off");
432+
lines.add(" // @formatter:off");
433+
lines.add(" // Checkstyle: stop");
433434
for (var builtin : javaBuiltins) {
434435
String argString = Arrays.stream(builtin.arguments).map(b -> "ArgDescriptor." + b).collect(Collectors.joining(", "));
435436
lines.add(" public static final CApiBuiltinExecutable " + builtin.name + " = new CApiBuiltinExecutable(\"" + builtin.name + "\", CApiCallPath." + builtin.call + ", ArgDescriptor." +
@@ -468,7 +469,7 @@ private static boolean generateBuiltinRegistry(List<CApiBuiltinDesc> javaBuiltin
468469
lines.add(" }");
469470
lines.add(" return null;");
470471
lines.add(" }");
471-
lines.add(" //@formatter:on");
472+
lines.add(" // @formatter:on");
472473

473474
return writeGenerated(Path.of("com.oracle.graal.python", "src", "com", "oracle", "graal", "python", "builtins", "modules", "cext", "PythonCextBuiltinRegistry.java"), lines);
474475
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import java.util.ArrayList;
5353
import java.util.Arrays;
5454
import java.util.HashMap;
55-
import java.util.HashSet;
5655
import java.util.Map;
5756
import java.util.Objects;
5857
import java.util.WeakHashMap;
@@ -79,8 +78,8 @@
7978
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.HandleTester;
8079
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.JavaStringToTruffleString;
8180
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.NativeToPythonNode;
82-
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.PythonToNativeTransfer;
8381
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.PythonToNativeNewRefNode;
82+
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.PythonToNativeTransfer;
8483
import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.CheckFunctionResultNode;
8584
import com.oracle.graal.python.builtins.objects.cext.common.CExtContext;
8685
import com.oracle.graal.python.builtins.objects.cext.common.LoadCExtException.ApiInitException;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -163,7 +163,6 @@ public abstract class StringLiterals {
163163
public static final TruffleString T_HPY_SUFFIX = tsLiteral(".hpy.so");
164164
public static final TruffleString T_EXT_SO = tsLiteral(".so");
165165
public static final TruffleString T_EXT_DYLIB = tsLiteral(".dylib");
166-
public static final TruffleString T_EXT_SU = tsLiteral(".su");
167166
public static final TruffleString T_EXT_PYD = tsLiteral(".pyd");
168167

169168
public static final TruffleString T_NATIVE = tsLiteral("native");

0 commit comments

Comments
 (0)