Skip to content

Fix nested \Q sequences in string parsing #147

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

Closed
fglock wants to merge 1 commit into from
Closed

Fix nested \Q sequences in string parsing #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 19 additions & 6 deletions src/main/java/org/perlonjava/parser/StringDoubleQuoted.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,13 @@ protected void parseEscapeSequence() {
}
inQuotemeta = false;
} else {
// Everything else is literal, including the backslash
currentSegment.append("\\");
// Everything else is literal, but \Q is ignored completely in quotemeta mode
if (!token.text.startsWith("Q")) {
// For anything other than \Q, append the backslash literally
currentSegment.append("\\");
}
// Always consume the character after the backslash
TokenUtils.consumeChar(parser);
}
return;
}
Expand Down Expand Up @@ -398,8 +403,12 @@ private void parseDoubleQuotedEscapesRegex() {
// Quotemeta modifier
case "Q" -> {
flushCurrentSegment();
inQuotemeta = true;
caseModifiers.push(new CaseModifier("Q", false));
// \Q is idempotent - don't nest multiple \Q sequences
if (!inQuotemeta) {
inQuotemeta = true;
caseModifiers.push(new CaseModifier("Q", false));
}
// If already in quotemeta mode, just ignore additional \Q
}

// Unknown escape - treat as literal character
Expand Down Expand Up @@ -479,8 +488,12 @@ private void parseDoubleQuotedEscapes() {
// Quotemeta modifier
case "Q" -> {
flushCurrentSegment();
inQuotemeta = true;
caseModifiers.push(new CaseModifier("Q", false));
// \Q is idempotent - don't nest multiple \Q sequences
if (!inQuotemeta) {
inQuotemeta = true;
caseModifiers.push(new CaseModifier("Q", false));
}
// If already in quotemeta mode, just ignore additional \Q
}

// Other escape sequences
Expand Down