Skip to content

Commit 6d6d514

Browse files
committed
Address review comments
1 parent fc161cc commit 6d6d514

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -774,11 +774,10 @@ abstract static class PyUnicodeSplit extends PythonQuaternaryBuiltinNode {
774774
@Specialization
775775
Object split(VirtualFrame frame, Object module, Object string, Object sep, Object maxsplit,
776776
@Cached StringBuiltins.SplitNode splitNode,
777-
@Cached ToNewRefNode toSulongNode,
778777
@Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
779778
@Cached GetNativeNullNode getNativeNullNode) {
780779
try {
781-
return toSulongNode.execute(splitNode.execute(frame, string, sep, maxsplit));
780+
return splitNode.execute(frame, string, sep, maxsplit);
782781
} catch (PException e) {
783782
transformExceptionToNativeNode.execute(frame, e);
784783
return getNativeNullNode.execute(module);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2506,12 +2506,7 @@ public String doString(VirtualFrame frame, Object self, PSlice slice,
25062506
@Cached CoerceToIntSlice sliceCast,
25072507
@Cached ComputeIndices compute,
25082508
@Cached StrGetItemNodeWithSlice getItemNodeWithSlice) {
2509-
String str;
2510-
try {
2511-
str = castToJavaString.execute(self);
2512-
} catch (CannotCastException e) {
2513-
throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, __GETITEM__, "str", self);
2514-
}
2509+
String str = castToString(self, castToJavaString);
25152510
SliceInfo info = compute.execute(frame, sliceCast.execute(slice), str.length());
25162511
return getItemNodeWithSlice.execute(str, info);
25172512
}
@@ -2520,12 +2515,7 @@ public String doString(VirtualFrame frame, Object self, PSlice slice,
25202515
public String doString(VirtualFrame frame, Object self, Object idx,
25212516
@Cached CastToJavaStringNode castToJavaString,
25222517
@Cached PyNumberAsSizeNode asSizeNode) {
2523-
String str;
2524-
try {
2525-
str = castToJavaString.execute(self);
2526-
} catch (CannotCastException e) {
2527-
throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, __GETITEM__, "str", self);
2528-
}
2518+
String str = castToString(self, castToJavaString);
25292519
int index = asSizeNode.executeExact(frame, idx);
25302520
if (index < 0) {
25312521
index += str.length();
@@ -2541,6 +2531,14 @@ private static String charAtToString(String primary, int index) {
25412531
char character = primary.charAt(index);
25422532
return String.valueOf(character);
25432533
}
2534+
2535+
private String castToString(Object self, CastToJavaStringNode castToJavaString) {
2536+
try {
2537+
return castToJavaString.execute(self);
2538+
} catch (CannotCastException e) {
2539+
throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, __GETITEM__, "str", self);
2540+
}
2541+
}
25442542
}
25452543

25462544
@Builtin(name = __ITER__, minNumOfPositionalArgs = 1)

0 commit comments

Comments
 (0)