Skip to content

Commit c60c85b

Browse files
qunaibitqunaibit
committed
Refactor PIBytesLike to PBytesLike
1 parent 274b1ce commit c60c85b

20 files changed

+127
-127
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import com.oracle.graal.python.builtins.objects.array.PArray;
5757
import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
5858
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
59-
import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
59+
import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
6060
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
6161
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.ToByteArrayNodeGen;
6262
import com.oracle.graal.python.builtins.objects.ints.PInt;
@@ -120,7 +120,7 @@ PBytes doString(String data) {
120120
}
121121

122122
@Specialization
123-
PBytes doBytesLike(VirtualFrame frame, PIBytesLike data,
123+
PBytes doBytesLike(VirtualFrame frame, PBytesLike data,
124124
@Cached("create()") BytesNodes.ToBytesNode toBytesNode) {
125125
return factory().createBytes(b64decode(toBytesNode.execute(frame, data)));
126126
}
@@ -275,22 +275,22 @@ private PBytes b2a(byte[] data, boolean newline) {
275275
}
276276

277277
@Specialization(guards = "isNoValue(newline)")
278-
PBytes b2aBytesLike(PIBytesLike data, @SuppressWarnings("unused") PNone newline) {
278+
PBytes b2aBytesLike(PBytesLike data, @SuppressWarnings("unused") PNone newline) {
279279
return b2aBytesLike(data, 1);
280280
}
281281

282282
@Specialization
283-
PBytes b2aBytesLike(PIBytesLike data, long newline) {
283+
PBytes b2aBytesLike(PBytesLike data, long newline) {
284284
return b2a(getToByteArrayNode().execute(data.getSequenceStorage()), newline != 0);
285285
}
286286

287287
@Specialization
288-
PBytes b2aBytesLike(PIBytesLike data, PInt newline) {
288+
PBytes b2aBytesLike(PBytesLike data, PInt newline) {
289289
return b2a(getToByteArrayNode().execute(data.getSequenceStorage()), !newline.isZero());
290290
}
291291

292292
@Specialization(limit = "1")
293-
PBytes b2aBytesLike(VirtualFrame frame, PIBytesLike data, Object newline,
293+
PBytes b2aBytesLike(VirtualFrame frame, PBytesLike data, Object newline,
294294
@CachedLibrary("newline") PythonObjectLibrary lib) {
295295
return (PBytes) getRecursiveNode().execute(frame, data, asPInt(newline, lib));
296296
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
import com.oracle.graal.python.builtins.objects.bytes.BytesUtils;
108108
import com.oracle.graal.python.builtins.objects.bytes.PByteArray;
109109
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
110-
import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
110+
import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
111111
import com.oracle.graal.python.builtins.objects.cell.PCell;
112112
import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
113113
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.PCallCapiFunction;
@@ -913,7 +913,7 @@ Object floatFromString(VirtualFrame frame, Object cls, String arg) {
913913
return factoryCreateFloat(cls, value);
914914
}
915915

916-
private double convertBytesToDouble(VirtualFrame frame, PIBytesLike arg) {
916+
private double convertBytesToDouble(VirtualFrame frame, PBytesLike arg) {
917917
return convertStringToDouble(frame, createString(getByteArray(frame, arg)), arg);
918918
}
919919

@@ -998,8 +998,8 @@ static boolean isHandledType(PythonObjectLibrary lib, Object o) {
998998
// These types are handled only if the object doesn't implement __float__/__index__
999999
if (obj instanceof PString) {
10001000
return convertStringToDouble(frame, ((PString) obj).getValue(), obj);
1001-
} else if (obj instanceof PIBytesLike) {
1002-
return convertBytesToDouble(frame, (PIBytesLike) obj);
1001+
} else if (obj instanceof PBytesLike) {
1002+
return convertBytesToDouble(frame, (PBytesLike) obj);
10031003
} else if (lib.isBuffer(obj)) {
10041004
try {
10051005
return convertStringToDouble(frame, createString(lib.getBufferBytes(obj)), obj);
@@ -1046,7 +1046,7 @@ protected static boolean isSubtypeOfFloat(VirtualFrame frame, IsSubtypeNode isSu
10461046
return isSubtypeNode.execute(frame, cls, PythonBuiltinClassType.PFloat);
10471047
}
10481048

1049-
private byte[] getByteArray(VirtualFrame frame, PIBytesLike pByteArray) {
1049+
private byte[] getByteArray(VirtualFrame frame, PBytesLike pByteArray) {
10501050
if (toByteArrayNode == null) {
10511051
CompilerDirectives.transferToInterpreterAndInvalidate();
10521052
toByteArrayNode = insert(BytesNodes.ToBytesNode.create());
@@ -1398,13 +1398,13 @@ Object createIntError(VirtualFrame frame, Object cls, String number, Object base
13981398
// PIBytesLike
13991399

14001400
@Specialization
1401-
Object parseBytesError(VirtualFrame frame, Object cls, PIBytesLike arg, int base) {
1401+
Object parseBytesError(VirtualFrame frame, Object cls, PBytesLike arg, int base) {
14021402
checkBase(base);
14031403
return stringToInt(frame, cls, toString(frame, arg), base, arg);
14041404
}
14051405

14061406
@Specialization(guards = "isNoValue(base)")
1407-
Object parseBytesError(VirtualFrame frame, Object cls, PIBytesLike arg, @SuppressWarnings("unused") PNone base) {
1407+
Object parseBytesError(VirtualFrame frame, Object cls, PBytesLike arg, @SuppressWarnings("unused") PNone base) {
14081408
return parseBytesError(frame, cls, arg, 10);
14091409
}
14101410

@@ -1552,7 +1552,7 @@ private Object callTrunc(VirtualFrame frame, Object obj) {
15521552
return callTruncNode.executeObject(frame, obj);
15531553
}
15541554

1555-
private String toString(VirtualFrame frame, PIBytesLike pByteArray) {
1555+
private String toString(VirtualFrame frame, PBytesLike pByteArray) {
15561556
if (toByteArrayNode == null) {
15571557
CompilerDirectives.transferToInterpreterAndInvalidate();
15581558
toByteArrayNode = insert(BytesNodes.ToBytesNode.create());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
import com.oracle.graal.python.builtins.objects.PNone;
8686
import com.oracle.graal.python.builtins.objects.bytes.BytesUtils;
8787
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
88-
import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
88+
import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
8989
import com.oracle.graal.python.builtins.objects.code.PCode;
9090
import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes;
9191
import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
@@ -1551,7 +1551,7 @@ public int ord(PString pchr,
15511551
}
15521552

15531553
@Specialization
1554-
public long ord(VirtualFrame frame, PIBytesLike chr,
1554+
public long ord(VirtualFrame frame, PBytesLike chr,
15551555
@Cached CastToJavaLongExactNode castNode,
15561556
@Cached SequenceStorageNodes.LenNode lenNode,
15571557
@Cached SequenceStorageNodes.GetItemNode getItemNode) {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
6363
import com.oracle.graal.python.builtins.objects.bytes.BytesUtils;
6464
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
65-
import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
65+
import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
6666
import com.oracle.graal.python.builtins.objects.common.HashingStorage;
6767
import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
6868
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
@@ -316,28 +316,28 @@ abstract static class CodecsDecodeNode extends EncodeBaseNode {
316316
@Child private CoerceToBooleanNode castToBooleanNode;
317317

318318
@Specialization
319-
Object decode(VirtualFrame frame, PIBytesLike bytes, @SuppressWarnings("unused") PNone encoding, @SuppressWarnings("unused") PNone errors, Object finalData) {
319+
Object decode(VirtualFrame frame, PBytesLike bytes, @SuppressWarnings("unused") PNone encoding, @SuppressWarnings("unused") PNone errors, Object finalData) {
320320
ByteBuffer decoded = getBytes(bytes);
321321
String string = decodeBytes(decoded, "utf-8", "strict", castToBoolean(frame, finalData));
322322
return factory().createTuple(new Object[]{string, decoded.position()});
323323
}
324324

325325
@Specialization(guards = {"isString(encoding)"})
326-
Object decode(VirtualFrame frame, PIBytesLike bytes, Object encoding, @SuppressWarnings("unused") PNone errors, Object finalData) {
326+
Object decode(VirtualFrame frame, PBytesLike bytes, Object encoding, @SuppressWarnings("unused") PNone errors, Object finalData) {
327327
ByteBuffer decoded = getBytes(bytes);
328328
String string = decodeBytes(decoded, castToString(encoding), "strict", castToBoolean(frame, finalData));
329329
return factory().createTuple(new Object[]{string, decoded.position()});
330330
}
331331

332332
@Specialization(guards = {"isString(errors)"})
333-
Object decode(VirtualFrame frame, PIBytesLike bytes, @SuppressWarnings("unused") PNone encoding, Object errors, Object finalData) {
333+
Object decode(VirtualFrame frame, PBytesLike bytes, @SuppressWarnings("unused") PNone encoding, Object errors, Object finalData) {
334334
ByteBuffer decoded = getBytes(bytes);
335335
String string = decodeBytes(decoded, "utf-8", castToString(errors), castToBoolean(frame, finalData));
336336
return factory().createTuple(new Object[]{string, decoded.position()});
337337
}
338338

339339
@Specialization(guards = {"isString(encoding)", "isString(errors)"})
340-
Object decode(VirtualFrame frame, PIBytesLike bytes, Object encoding, Object errors, Object finalData) {
340+
Object decode(VirtualFrame frame, PBytesLike bytes, Object encoding, Object errors, Object finalData) {
341341
ByteBuffer decoded = getBytes(bytes);
342342
String string = decodeBytes(decoded, castToString(encoding), castToString(errors), castToBoolean(frame, finalData));
343343
return factory().createTuple(new Object[]{string, decoded.position()});
@@ -368,7 +368,7 @@ String decodeBytes(ByteBuffer byteBuffer, String encoding, String errors, boolea
368368
return String.valueOf(decoded.flip());
369369
}
370370

371-
private ByteBuffer getBytes(PIBytesLike bytesLike) {
371+
private ByteBuffer getBytes(PBytesLike bytesLike) {
372372
if (toByteArrayNode == null) {
373373
CompilerDirectives.transferToInterpreterAndInvalidate();
374374
toByteArrayNode = insert(GetInternalByteArrayNodeGen.create());
@@ -407,13 +407,13 @@ abstract static class RawDecodeNode extends EncodeBaseNode {
407407
@Child private GetInternalByteArrayNode toByteArrayNode;
408408

409409
@Specialization
410-
Object decode(PIBytesLike bytes, @SuppressWarnings("unused") PNone errors) {
410+
Object decode(PBytesLike bytes, @SuppressWarnings("unused") PNone errors) {
411411
String string = decodeBytes(getBytesBuffer(bytes), "strict");
412412
return factory().createTuple(new Object[]{string, string.length()});
413413
}
414414

415415
@Specialization(guards = {"isString(errors)"})
416-
Object decode(PIBytesLike bytes, Object errors,
416+
Object decode(PBytesLike bytes, Object errors,
417417
@Cached CastToJavaStringNode castStr) {
418418
String profiledErrors;
419419
try {
@@ -426,7 +426,7 @@ Object decode(PIBytesLike bytes, Object errors,
426426
return factory().createTuple(new Object[]{string, string.length()});
427427
}
428428

429-
private ByteBuffer getBytesBuffer(PIBytesLike bytesLike) {
429+
private ByteBuffer getBytesBuffer(PBytesLike bytesLike) {
430430
if (toByteArrayNode == null) {
431431
CompilerDirectives.transferToInterpreterAndInvalidate();
432432
toByteArrayNode = insert(GetInternalByteArrayNodeGen.create());

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import com.oracle.graal.python.builtins.objects.PNone;
6161
import com.oracle.graal.python.builtins.objects.PythonAbstractObjectFactory.PInteropGetAttributeNodeGen;
6262
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
63-
import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
63+
import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
6464
import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.AsPythonObjectNodeGen;
6565
import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContext;
6666
import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyInitObject;
@@ -528,7 +528,7 @@ public Object run(PythonObject moduleSpec) {
528528
public abstract static class SourceHashNode extends PythonBinaryBuiltinNode {
529529
@Specialization
530530
@TruffleBoundary
531-
PBytes run(long magicNumber, PIBytesLike source) {
531+
PBytes run(long magicNumber, PBytesLike source) {
532532
byte[] hash = new byte[Long.BYTES];
533533
long hashCode = magicNumber ^ source.hashCode();
534534
for (int i = 0; i < hash.length; i++) {
@@ -538,7 +538,7 @@ PBytes run(long magicNumber, PIBytesLike source) {
538538
}
539539

540540
@Specialization
541-
PBytes run(PInt magicNumber, PIBytesLike source) {
541+
PBytes run(PInt magicNumber, PBytesLike source) {
542542
return run(magicNumber.longValue(), source);
543543
}
544544
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
import com.oracle.graal.python.builtins.objects.PNone;
5959
import com.oracle.graal.python.builtins.objects.bytes.BytesNodes.ToBytesNode;
6060
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
61-
import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
61+
import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
6262
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
6363
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.ToByteArrayNodeGen;
6464
import com.oracle.graal.python.builtins.objects.ints.PInt;
@@ -476,7 +476,7 @@ abstract static class InflaterDecompress extends PythonTernaryBuiltinNode {
476476
@Child private ToBytesNode toBytes = ToBytesNode.create();
477477

478478
@Specialization
479-
Object decompress(VirtualFrame frame, InflaterWrapper stream, PIBytesLike pb, int maxLen) {
479+
Object decompress(VirtualFrame frame, InflaterWrapper stream, PBytesLike pb, int maxLen) {
480480
int maxLength = maxLen == 0 ? Integer.MAX_VALUE : maxLen;
481481

482482
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -492,7 +492,7 @@ Object decompress(VirtualFrame frame, InflaterWrapper stream, PIBytesLike pb, in
492492
}
493493

494494
@Specialization
495-
Object decompress(VirtualFrame frame, InflaterWrapper stream, PIBytesLike pb, long maxLen,
495+
Object decompress(VirtualFrame frame, InflaterWrapper stream, PBytesLike pb, long maxLen,
496496
@Cached CastToJavaIntExactNode castInt) {
497497
return decompress(frame, stream, pb, castInt.execute(maxLen));
498498
}
@@ -546,13 +546,13 @@ private static byte[] compress(byte[] input, int level) {
546546
}
547547

548548
@Specialization
549-
public PBytes doitNone(PIBytesLike data, @SuppressWarnings("unused") PNone level) {
549+
public PBytes doitNone(PBytesLike data, @SuppressWarnings("unused") PNone level) {
550550
byte[] array = getToArrayNode().execute(data.getSequenceStorage());
551551
return factory().createBytes(compress(array, -1));
552552
}
553553

554554
@Specialization
555-
public PBytes doitLong(PIBytesLike data, long level,
555+
public PBytes doitLong(PBytesLike data, long level,
556556
@Cached("createBinaryProfile()") ConditionProfile wrongLevelProfile) {
557557
if (wrongLevelProfile.profile(level < -1 || 9 < level)) {
558558
throw raise(ZLibError, ErrorMessages.BAD_COMPRESSION_LEVEL);
@@ -605,18 +605,18 @@ private byte[] decompress(byte[] data, @SuppressWarnings("unused") long wbits, i
605605
}
606606

607607
@Specialization
608-
public PBytes doit(PIBytesLike data, @SuppressWarnings("unused") PNone wbits, @SuppressWarnings("unused") PNone bufsize) {
608+
public PBytes doit(PBytesLike data, @SuppressWarnings("unused") PNone wbits, @SuppressWarnings("unused") PNone bufsize) {
609609
byte[] array = getToArrayNode().execute(data.getSequenceStorage());
610610
return factory().createBytes(decompress(array, MAX_WBITS, DEF_BUF_SIZE));
611611
}
612612

613613
@Specialization
614-
public PBytes decompress(PIBytesLike data, byte wbits, int bufsize) {
614+
public PBytes decompress(PBytesLike data, byte wbits, int bufsize) {
615615
return decompress(data, (long) wbits, bufsize);
616616
}
617617

618618
@Specialization
619-
public PBytes decompress(PIBytesLike data, long wbits, int bufsize) {
619+
public PBytes decompress(PBytesLike data, long wbits, int bufsize) {
620620
// checking bufsize
621621
if (bufSizeProfile.profile(bufsize < 0)) {
622622
throw raise(ZLibError, ErrorMessages.MUST_BE_NON_NEGATIVE, "bufsize");
@@ -626,7 +626,7 @@ public PBytes decompress(PIBytesLike data, long wbits, int bufsize) {
626626
}
627627

628628
@Specialization(limit = "1")
629-
public PBytes decompress(VirtualFrame frame, PIBytesLike data, long wbits, Object bufsize,
629+
public PBytes decompress(VirtualFrame frame, PBytesLike data, long wbits, Object bufsize,
630630
@Cached("create()") DecompressNode recursiveNode,
631631
@CachedLibrary("bufsize") PythonObjectLibrary lib) {
632632
if (!lib.canBePInt(bufsize)) {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/ByteArrayBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected Object doGeneric(Object self, Object idx) {
100100
@GenerateNodeFactory
101101
public abstract static class IAddNode extends PythonBinaryBuiltinNode {
102102
@Specialization
103-
public PByteArray add(PByteArray self, PIBytesLike other,
103+
public PByteArray add(PByteArray self, PBytesLike other,
104104
@Cached SequenceNodes.GetSequenceStorageNode getStorage,
105105
@Cached("create()") SequenceStorageNodes.ConcatNode concatNode) {
106106
SequenceStorage res = concatNode.execute(self.getSequenceStorage(), getStorage.execute(other));
@@ -211,7 +211,7 @@ public PNone clear(VirtualFrame frame, PByteArray byteArray,
211211
@GenerateNodeFactory
212212
public abstract static class SplitLinesNode extends BytesBuiltins.SplitLinesNode {
213213
@Override
214-
protected PIBytesLike createElement(byte[] bytes) {
214+
protected PBytesLike createElement(byte[] bytes) {
215215
return factory().createByteArray(bytes);
216216
}
217217
}

0 commit comments

Comments
 (0)