Skip to content

Commit b4bbedc

Browse files
fangererfangerer
committed
Adjust modifiers
1 parent 9dac9e3 commit b4bbedc

25 files changed

+78
-78
lines changed

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/AbstractBufferedIOBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ abstract class AbstractBufferedIOBuiltins extends PythonBuiltins {
7878

7979
public abstract static class BufferedInitNode extends PNodeWithRaise {
8080

81-
@Child BufferedIONodes.RawTellNode rawTellNode = BufferedIONodesFactory.RawTellNodeGen.create(true);
81+
@Child private BufferedIONodes.RawTellNode rawTellNode = BufferedIONodesFactory.RawTellNodeGen.create(true);
8282

8383
public abstract void execute(VirtualFrame frame, PBuffered self, int bufferSize, PythonObjectFactory factory);
8484

@@ -94,7 +94,7 @@ void bufferSizeError(PBuffered self, int bufferSize, PythonObjectFactory factory
9494
throw raise(ValueError, BUF_SIZE_POS);
9595
}
9696

97-
public static void init(PBuffered self, int bufferSize, PythonObjectFactory factory) {
97+
private static void init(PBuffered self, int bufferSize, PythonObjectFactory factory) {
9898
self.initBuffer(bufferSize);
9999
self.setLock(factory.createLock());
100100
self.setOwner(0);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedIOMixinBuiltins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
import com.oracle.truffle.api.profiles.ConditionProfile;
105105

106106
@CoreFunctions(extendClasses = {PBufferedReader, PBufferedWriter, PBufferedRandom})
107-
public class BufferedIOMixinBuiltins extends AbstractBufferedIOBuiltins {
107+
public final class BufferedIOMixinBuiltins extends AbstractBufferedIOBuiltins {
108108
@Override
109109
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
110110
return BufferedIOMixinBuiltinsFactory.getFactories();

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedRandomBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
import com.oracle.truffle.api.nodes.Node;
5959

6060
@CoreFunctions(extendClasses = PBufferedRandom)
61-
public class BufferedRandomBuiltins extends AbstractBufferedIOBuiltins {
61+
public final class BufferedRandomBuiltins extends AbstractBufferedIOBuiltins {
6262
@Override
6363
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
6464
return BufferedRandomBuiltinsFactory.getFactories();
@@ -96,7 +96,7 @@ static void doInit(VirtualFrame frame, PBuffered self, Object raw, int bufferSiz
9696
@GenerateNodeFactory
9797
public abstract static class InitNode extends BaseInitNode {
9898

99-
@Child BufferedRandomInit init = BufferedRandomBuiltinsFactory.BufferedRandomInitNodeGen.create();
99+
@Child private BufferedRandomInit init = BufferedRandomBuiltinsFactory.BufferedRandomInitNodeGen.create();
100100

101101
@Override
102102
protected final void init(VirtualFrame frame, PBuffered self, Object raw, int bufferSize) {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedReaderBuiltins.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848

4949
import com.oracle.graal.python.builtins.Builtin;
5050
import com.oracle.graal.python.builtins.CoreFunctions;
51+
import com.oracle.graal.python.builtins.modules.io.BufferedReaderBuiltinsFactory.BufferedReaderInitNodeGen;
5152
import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
5253
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
5354
import com.oracle.graal.python.nodes.object.GetClassNode;
@@ -61,7 +62,7 @@
6162
import com.oracle.truffle.api.nodes.Node;
6263

6364
@CoreFunctions(extendClasses = PBufferedReader)
64-
public class BufferedReaderBuiltins extends AbstractBufferedIOBuiltins {
65+
public final class BufferedReaderBuiltins extends AbstractBufferedIOBuiltins {
6566
@Override
6667
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
6768
return BufferedReaderBuiltinsFactory.getFactories();
@@ -94,7 +95,6 @@ public static void internalInit(PBuffered self, PFileIO raw, int bufferSize, Pyt
9495
BufferedInitNode.internalInit(self, bufferSize, factory, posixSupport, posixLib);
9596
self.resetRead();
9697
self.setOK(true);
97-
9898
}
9999
}
100100

@@ -103,7 +103,7 @@ public static void internalInit(PBuffered self, PFileIO raw, int bufferSize, Pyt
103103
@GenerateNodeFactory
104104
public abstract static class InitNode extends BaseInitNode {
105105

106-
@Child BufferedReaderInit init = BufferedReaderBuiltinsFactory.BufferedReaderInitNodeGen.create();
106+
@Child private BufferedReaderInit init = BufferedReaderInitNodeGen.create();
107107

108108
@Override
109109
protected final void init(VirtualFrame frame, PBuffered self, Object raw, int bufferSize) {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedReaderMixinBuiltins.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
import com.oracle.truffle.api.profiles.ConditionProfile;
9898

9999
@CoreFunctions(extendClasses = {PBufferedReader, PBufferedRandom})
100-
public class BufferedReaderMixinBuiltins extends AbstractBufferedIOBuiltins {
100+
public final class BufferedReaderMixinBuiltins extends AbstractBufferedIOBuiltins {
101101
@Override
102102
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
103103
return BufferedReaderMixinBuiltinsFactory.getFactories();
@@ -107,7 +107,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
107107
* implementation of cpython/Modules/_io/bufferedio.c:_bufferedreader_raw_read
108108
*/
109109

110-
protected static final byte[] BLOCKED = new byte[0];
110+
private static final byte[] BLOCKED = new byte[0];
111111

112112
abstract static class RawReadNode extends PNodeWithRaise {
113113

@@ -200,7 +200,7 @@ static Object doit(VirtualFrame frame, PBuffered self,
200200
@GenerateNodeFactory
201201
abstract static class ReadNode extends PythonBinaryWithInitErrorClinicBuiltinNode {
202202

203-
@Child BufferedIONodes.CheckIsClosedNode checkIsClosedNode = BufferedIONodesFactory.CheckIsClosedNodeGen.create(READ);
203+
@Child private CheckIsClosedNode checkIsClosedNode = CheckIsClosedNodeGen.create(READ);
204204

205205
@Override
206206
protected ArgumentClinicProvider getArgumentClinic() {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedWriterBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import com.oracle.truffle.api.nodes.Node;
6060

6161
@CoreFunctions(extendClasses = PBufferedWriter)
62-
public class BufferedWriterBuiltins extends AbstractBufferedIOBuiltins {
62+
public final class BufferedWriterBuiltins extends AbstractBufferedIOBuiltins {
6363
@Override
6464
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
6565
return BufferedWriterBuiltinsFactory.getFactories();
@@ -103,7 +103,7 @@ public static void internalInit(PBuffered self, PFileIO raw, int bufferSize, Pyt
103103
@GenerateNodeFactory
104104
public abstract static class InitNode extends BaseInitNode {
105105

106-
@Child BufferedWriterInit init = BufferedWriterBuiltinsFactory.BufferedWriterInitNodeGen.create();
106+
@Child private BufferedWriterInit init = BufferedWriterInitNodeGen.create();
107107

108108
@Override
109109
protected final void init(VirtualFrame frame, PBuffered self, Object raw, int bufferSize) {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedWriterMixinBuiltins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
import com.oracle.truffle.api.library.CachedLibrary;
6666

6767
@CoreFunctions(extendClasses = {PBufferedWriter, PBufferedRandom})
68-
public class BufferedWriterMixinBuiltins extends AbstractBufferedIOBuiltins {
68+
public final class BufferedWriterMixinBuiltins extends AbstractBufferedIOBuiltins {
6969
@Override
7070
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
7171
return BufferedWriterMixinBuiltinsFactory.getFactories();

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/FileIOBuiltins.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
import com.oracle.truffle.api.profiles.ConditionProfile;
157157

158158
@CoreFunctions(extendClasses = PythonBuiltinClassType.PFileIO)
159-
public class FileIOBuiltins extends PythonBuiltins {
159+
public final class FileIOBuiltins extends PythonBuiltins {
160160

161161
/*
162162
* We are limited to max primitive array size, Integer.MAX_VALUE, the jdk can offer. CPython
@@ -172,7 +172,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
172172
return FileIOBuiltinsFactory.getFactories();
173173
}
174174

175-
static class FDReleaseCallback implements AsyncHandler.AsyncAction {
175+
static final class FDReleaseCallback implements AsyncHandler.AsyncAction {
176176
private final OwnFD fd;
177177

178178
public FDReleaseCallback(OwnFD fd) {
@@ -207,7 +207,7 @@ public abstract static class FileIOInit extends PNodeWithRaise {
207207

208208
public abstract void execute(VirtualFrame frame, PFileIO self, Object nameobj, IONodes.IOMode mode, boolean closefd, Object opener);
209209

210-
static void errorCleanup(VirtualFrame frame, PFileIO self, boolean fdIsOwn,
210+
private static void errorCleanup(VirtualFrame frame, PFileIO self, boolean fdIsOwn,
211211
PosixModuleBuiltins.CloseNode posixClose) {
212212
if (!fdIsOwn) {
213213
self.setClosed();
@@ -216,7 +216,7 @@ static void errorCleanup(VirtualFrame frame, PFileIO self, boolean fdIsOwn,
216216
}
217217
}
218218

219-
int open(VirtualFrame frame, String name, int flags, int mode,
219+
private int open(VirtualFrame frame, String name, int flags, int mode,
220220
PythonContext ctxt,
221221
PosixSupportLibrary posixLib,
222222
BranchProfile errorProfile) {
@@ -285,12 +285,12 @@ public static void internalInit(PFileIO self, String name, int fd, String mode)
285285
WriteAttributeToObjectNode.getUncached().execute(self, NAME, name);
286286
}
287287

288-
protected Object getPosixSupport() {
289-
return PythonContext.get(this).getPosixSupport();
288+
protected final Object getPosixSupport() {
289+
return getContext().getPosixSupport();
290290
}
291291

292292
@Specialization(guards = {"!isBadMode(mode)", "!isInvalidMode(mode)"})
293-
public void doInit(VirtualFrame frame, PFileIO self, Object nameobj, IONodes.IOMode mode, boolean closefd, Object opener,
293+
void doInit(VirtualFrame frame, PFileIO self, Object nameobj, IONodes.IOMode mode, boolean closefd, Object opener,
294294
@CachedLibrary("getPosixSupport()") PosixSupportLibrary posixLib,
295295
@Cached CallNode callOpener,
296296
@Cached PyIndexCheckNode indexCheckNode,
@@ -420,14 +420,14 @@ public void doInit(VirtualFrame frame, PFileIO self, Object nameobj, IONodes.IOM
420420
}
421421

422422
@Specialization(guards = "isInvalidMode(mode)")
423-
public void invalidMode(@SuppressWarnings("unused") PFileIO self, @SuppressWarnings("unused") Object nameobj, IONodes.IOMode mode, @SuppressWarnings("unused") boolean closefd,
423+
void invalidMode(@SuppressWarnings("unused") PFileIO self, @SuppressWarnings("unused") Object nameobj, IONodes.IOMode mode, @SuppressWarnings("unused") boolean closefd,
424424
@SuppressWarnings("unused") Object opener) {
425425
throw raise(ValueError, INVALID_MODE_S, mode.mode);
426426
}
427427

428428
@SuppressWarnings("unused")
429429
@Specialization(guards = "isBadMode(mode)")
430-
public void badMode(PFileIO self, Object nameobj, IONodes.IOMode mode, boolean closefd, Object opener) {
430+
void badMode(PFileIO self, Object nameobj, IONodes.IOMode mode, boolean closefd, Object opener) {
431431
throw raise(ValueError, BAD_MODE);
432432
}
433433

@@ -439,15 +439,15 @@ protected PConstructAndRaiseNode getConstructAndRaiseNode() {
439439
return constructAndRaiseNode;
440440
}
441441

442-
final PException raiseOSErrorFromPosixException(VirtualFrame frame, PosixSupportLibrary.PosixException e) {
442+
private PException raiseOSErrorFromPosixException(VirtualFrame frame, PosixSupportLibrary.PosixException e) {
443443
return getConstructAndRaiseNode().raiseOSError(frame, e.getErrorCode(), e.getMessage(), null, null);
444444
}
445445

446-
final PException raiseOSError(VirtualFrame frame, OSErrorEnum oserror, String filename) {
446+
private PException raiseOSError(VirtualFrame frame, OSErrorEnum oserror, String filename) {
447447
return getConstructAndRaiseNode().raiseOSError(frame, oserror, filename);
448448
}
449449

450-
final PException raiseOSErrorFromPosixException(VirtualFrame frame, PosixSupportLibrary.PosixException e, Object filename1) {
450+
private PException raiseOSErrorFromPosixException(VirtualFrame frame, PosixSupportLibrary.PosixException e, Object filename1) {
451451
return getConstructAndRaiseNode().raiseOSError(frame, e.getErrorCode(), e.getMessage(), filename1, null);
452452
}
453453
}
@@ -781,7 +781,7 @@ static Object tell(VirtualFrame frame, PFileIO self,
781781
return seekNode.execute(frame, self, 0, SEEK_CUR);
782782
}
783783

784-
public static long internalTell(PFileIO self,
784+
static long internalTell(PFileIO self,
785785
Object posixSupport,
786786
PosixSupportLibrary posixLib) throws PosixSupportLibrary.PosixException {
787787
return SeekNode.internalSeek(self, 0, SEEK_CUR, posixSupport, posixLib);
@@ -1025,7 +1025,7 @@ static Object doit(PFileIO self) {
10251025
@GenerateNodeFactory
10261026
abstract static class ModeNode extends PythonUnaryBuiltinNode {
10271027

1028-
public static String modeString(PFileIO self) {
1028+
static String modeString(PFileIO self) {
10291029
if (self.isCreated()) {
10301030
return self.isReadable() ? "xb+" : "xb";
10311031
}
@@ -1052,7 +1052,7 @@ static Object doit(PFileIO self, @SuppressWarnings("unused") PNone v) {
10521052
}
10531053

10541054
@Specialization(guards = "!isNoValue(v)")
1055-
Object doit(VirtualFrame frame, PFileIO self, Object v,
1055+
static Object doit(VirtualFrame frame, PFileIO self, Object v,
10561056
@Cached PyNumberAsSizeNode asSizeNode) {
10571057
self.setBlksize(asSizeNode.executeExact(frame, v));
10581058
return PNone.NONE;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/IOBaseBuiltins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
import com.oracle.truffle.api.profiles.ConditionProfile;
122122

123123
@CoreFunctions(extendClasses = PythonBuiltinClassType.PIOBase)
124-
public class IOBaseBuiltins extends PythonBuiltins {
124+
public final class IOBaseBuiltins extends PythonBuiltins {
125125

126126
// taken from usr/include/stdio.h
127127
public static final int BUFSIZ = 8192;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/IOBaseDictBuiltins.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
@CoreFunctions(extendClasses = {PIOBase, PFileIO, PStringIO, PTextIOWrapper, PBytesIO,
7070
PBufferedReader, PBufferedWriter, PBufferedRandom, PBufferedRWPair})
71-
public class IOBaseDictBuiltins extends AbstractBufferedIOBuiltins {
71+
public final class IOBaseDictBuiltins extends AbstractBufferedIOBuiltins {
7272
@Override
7373
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
7474
return IOBaseDictBuiltinsFactory.getFactories();
@@ -82,13 +82,13 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
8282
public abstract static class DictNode extends PythonBinaryBuiltinNode {
8383

8484
@Specialization(guards = "isNoValue(none)")
85-
protected Object doit(PythonObject self, @SuppressWarnings("unused") PNone none,
85+
static Object doit(PythonObject self, @SuppressWarnings("unused") PNone none,
8686
@Cached GetOrCreateDictNode getDict) {
8787
return getDict.execute(self);
8888
}
8989

9090
@Specialization
91-
protected Object setDict(PythonObject self, @SuppressWarnings("unused") Object d) {
91+
Object setDict(PythonObject self, @SuppressWarnings("unused") Object d) {
9292
throw raise(PythonBuiltinClassType.AssertionError, "attribute '__dict__' of '%p' objects is not writable", self);
9393
}
9494
}

0 commit comments

Comments
 (0)