implements PR014

This commit is contained in:
2026-03-24 13:42:21 +00:00
parent c0bccba092
commit 4f32913577
5 changed files with 95 additions and 11 deletions
@@ -416,7 +416,14 @@ public final class PbsAst {
Span span();
}
public enum WildcardSwitchKind {
DEFAULT,
UNDERSCORE,
RECOVERY
}
public record WildcardSwitchPattern(
WildcardSwitchKind kind,
Span span) implements SwitchPattern {
}
@@ -522,12 +522,16 @@ final class PbsExprParser {
private PbsAst.SwitchPattern parseSwitchPattern() {
if (cursor.match(PbsTokenKind.DEFAULT)) {
return new PbsAst.WildcardSwitchPattern(span(cursor.previous().start(), cursor.previous().end()));
return new PbsAst.WildcardSwitchPattern(
PbsAst.WildcardSwitchKind.DEFAULT,
span(cursor.previous().start(), cursor.previous().end()));
}
if (cursor.check(PbsTokenKind.IDENTIFIER) && "_".equals(cursor.peek().lexeme())) {
final var wildcard = cursor.advance();
return new PbsAst.WildcardSwitchPattern(span(wildcard.start(), wildcard.end()));
return new PbsAst.WildcardSwitchPattern(
PbsAst.WildcardSwitchKind.UNDERSCORE,
span(wildcard.start(), wildcard.end()));
}
if (cursor.check(PbsTokenKind.IDENTIFIER)
@@ -545,7 +549,9 @@ final class PbsExprParser {
final var token = cursor.peek();
report(token, ParseErrors.E_PARSE_INVALID_SWITCH_FORM, "Invalid switch pattern");
cursor.advance();
return new PbsAst.WildcardSwitchPattern(span(token.start(), token.end()));
return new PbsAst.WildcardSwitchPattern(
PbsAst.WildcardSwitchKind.RECOVERY,
span(token.start(), token.end()));
}
private PbsAst.Expression parseLiteralPatternExpression() {
@@ -850,17 +850,37 @@ final class PbsFlowExpressionAnalyzer {
final var seenPatterns = new HashSet<String>();
boolean hasWildcard = false;
PbsAst.WildcardSwitchKind wildcardKind = null;
int wildcardCount = 0;
TypeView armType = null;
for (final var arm : switchExpr.arms()) {
final var patternKey = switchPatternKey(arm.pattern());
if (arm.pattern() instanceof PbsAst.WildcardSwitchPattern) {
if (arm.pattern() instanceof PbsAst.WildcardSwitchPattern wildcardPattern) {
hasWildcard = true;
} else if (!seenPatterns.add(patternKey)) {
p.studio.compiler.source.diagnostics.Diagnostics.error(diagnostics,
PbsSemanticsErrors.E_SEM_SWITCH_DUPLICATE_PATTERN.name(),
"Duplicate switch pattern",
arm.pattern().span());
if (wildcardPattern.kind() != PbsAst.WildcardSwitchKind.RECOVERY) {
wildcardCount++;
if (wildcardCount == 1) {
wildcardKind = wildcardPattern.kind();
} else if (wildcardKind != wildcardPattern.kind()) {
p.studio.compiler.source.diagnostics.Diagnostics.error(diagnostics,
PbsSemanticsErrors.E_SEM_SWITCH_DUPLICATE_PATTERN.name(),
"Switch wildcard arms cannot mix 'default' and '_'",
arm.pattern().span());
} else {
p.studio.compiler.source.diagnostics.Diagnostics.error(diagnostics,
PbsSemanticsErrors.E_SEM_SWITCH_DUPLICATE_PATTERN.name(),
"Duplicate switch wildcard pattern",
arm.pattern().span());
}
}
} else {
final var patternKey = switchPatternKey(arm.pattern());
if (!seenPatterns.add(patternKey)) {
p.studio.compiler.source.diagnostics.Diagnostics.error(diagnostics,
PbsSemanticsErrors.E_SEM_SWITCH_DUPLICATE_PATTERN.name(),
"Duplicate switch pattern",
arm.pattern().span());
}
}
final var patternType = switchPatternType(arm.pattern(), model, diagnostics);