Skip to content

Fix 'when' keyword parsing to respect 'use feature switch' #114

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

Merged
fglock merged 1 commit into from
Dec 31, 2025
Merged

Fix 'when' keyword parsing to respect 'use feature switch' #114

Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions src/main/java/org/perlonjava/parser/ListParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,11 @@ static boolean isListTerminator(Parser parser, LexerToken token) {
return false;
}

// Special case: and/or/xor before => should be treated as barewords, not terminators
if (token.text.equals("and") || token.text.equals("or") || token.text.equals("xor")) {
// Special case: and/or/xor/when before => should be treated as barewords, not terminators
if (token.text.equals("and") || token.text.equals("or") || token.text.equals("xor") || token.text.equals("when")) {
// Look ahead to see if => follows
int saveIndex = parser.tokenIndex;
TokenUtils.consume(parser); // consume and/or/xor
TokenUtils.consume(parser); // consume and/or/xor/when
LexerToken nextToken = TokenUtils.peek(parser);
parser.tokenIndex = saveIndex; // restore
if (nextToken.text.equals("=>")) {
Expand Down Expand Up @@ -297,8 +297,8 @@ public static boolean looksLikeEmptyList(Parser parser) {
// Check if this is a list terminator, but we need to restore position for the check
boolean isTerminator = false;
if (ParserTables.LIST_TERMINATORS.contains(token.text)) {
// Special case: check if and/or/xor followed by =>
if (token.text.equals("and") || token.text.equals("or") || token.text.equals("xor")) {
// Special case: check if and/or/xor/when followed by =>
if (token.text.equals("and") || token.text.equals("or") || token.text.equals("xor") || token.text.equals("when")) {
if (nextToken.text.equals("=>")) {
isTerminator = false; // Not a terminator, it's a hash key
} else {
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/org/perlonjava/parser/StatementResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,17 @@ public static Node parseStatement(Parser parser, String label) {

case "while", "until" -> StatementParser.parseWhileStatement(parser, label);

case "given" -> StatementParser.parseGivenStatement(parser);
case "given" -> parser.ctx.symbolTable.isFeatureCategoryEnabled("switch")
? StatementParser.parseGivenStatement(parser)
: null;

case "when" -> StatementParser.parseWhenStatement(parser);
case "when" -> parser.ctx.symbolTable.isFeatureCategoryEnabled("switch")
? StatementParser.parseWhenStatement(parser)
: null;

case "default" -> StatementParser.parseDefaultStatement(parser);
case "default" -> parser.ctx.symbolTable.isFeatureCategoryEnabled("switch")
? StatementParser.parseDefaultStatement(parser)
: null;

case "try" -> parser.ctx.symbolTable.isFeatureCategoryEnabled("try")
? StatementParser.parseTryStatement(parser)
Expand Down