Skip to content

fix: flush of the pending high surrogate #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Boris (dzodkin33) wants to merge 2 commits into
base: elide-25.1.x
Choose a base branch
from
+13 −1
Open

fix: flush of the pending high surrogate #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e30a85
fix: flush of the pending high surrogate
dzodkin33 Jul 12, 2026
77501a5
chore: fmt
dzodkin33 Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,8 @@ public void postInitialize(Python3Core core) {
PosixSupportLibrary posixLib = PosixSupportLibrary.getUncached();
Object posixSupport = core.getContext().getPosixSupport();
PythonModule posix = PythonLanguage.getPythonOS() == PythonOS.PLATFORM_WIN32
? core.lookupBuiltinModule(T_NT) : core.lookupBuiltinModule(T_POSIX);
? core.lookupBuiltinModule(T_NT)
: core.lookupBuiltinModule(T_POSIX);

if (posixLib.getBackend(posixSupport).toJavaStringUncached().equals("java")) {
posix.setAttribute(toTruffleStringUncached("geteuid"), PNone.NO_VALUE);
Expand Down
11 changes: 11 additions & 0 deletions ...e.graal.python/src/com/oracle/graal/python/builtins/modules/json/JSONScannerBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,6 +880,9 @@ private static TruffleString parseStringUnicodeSlowpath(VirtualFrame frame, Boun
while (idx < length) {
int c = codePointAtIndexNode.execute(string, idx++);
if (c == '"') {
if (highSurrogate != 0) {
appendCodePointNode.execute(builder, highSurrogate, 1, true);
}
// we reached the end of the string literal
nextIdx.value = idx;
return builderToStringNode.execute(builder);
Expand Down Expand Up @@ -934,6 +937,10 @@ private static TruffleString parseStringUnicodeSlowpath(VirtualFrame frame, Boun
}
if (isLowSurrogate(c) && highSurrogate != 0) {
c = Character.toCodePoint(highSurrogate, (char) c);
highSurrogate = 0;
} else if (highSurrogate != 0) {
appendCodePointNode.execute(builder, highSurrogate, 1, true);
highSurrogate = 0;
}
if (isHighSurrogate(c)) {
highSurrogate = (char) c;
Expand All @@ -946,6 +953,10 @@ private static TruffleString parseStringUnicodeSlowpath(VirtualFrame frame, Boun
if (strict && c < 0x20) {
throw decodeError(frame, boundaryCallData, inliningTarget, errorProfile, raisingNode, string, idx - 1, ErrorMessages.INVALID_CTRL_CHARACTER_AT);
}
if (highSurrogate != 0) {
appendCodePointNode.execute(builder, highSurrogate, 1, true);
highSurrogate = 0;
}
appendCodePointNode.execute(builder, c, 1, true);
}
}
Expand Down
Loading