Skip to content

Commit

Permalink
parser: allow static method call on match branch (#22507)
Browse files Browse the repository at this point in the history
  • Loading branch information
felipensp authored Oct 13, 2024
1 parent da3112e commit 6064c6f
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
9 changes: 5 additions & 4 deletions vlib/v/parser/if_match.v
Original file line number Diff line number Diff line change
Expand Up @@ -234,12 +234,13 @@ fn (mut p Parser) is_match_sumtype_type() bool {
is_option := p.tok.kind == .question
name_tok := if is_option { p.peek_tok } else { p.tok }
next_tok_kind := if is_option { p.peek_token(2).kind } else { p.peek_tok.kind }
next_next_tok := if is_option { p.peek_token(3) } else { p.peek_token(2) }

next_next_idx := if is_option { 3 } else { 2 }
next_next_tok := p.peek_token(next_next_idx)
return name_tok.kind == .name && !(name_tok.lit == 'C' && next_tok_kind == .dot)
&& (((ast.builtin_type_names_matcher.matches(name_tok.lit) || name_tok.lit[0].is_capital())
&& next_tok_kind != .lpar) || (next_tok_kind == .dot && next_next_tok.lit.len > 0
&& next_next_tok.lit[0].is_capital()))
&& next_tok_kind != .lpar && !(next_tok_kind == .dot && next_next_tok.kind == .name
&& p.peek_token(next_next_idx + 1).kind == .lpar)) || (next_tok_kind == .dot
&& next_next_tok.lit.len > 0 && next_next_tok.lit[0].is_capital()))
}

fn (mut p Parser) match_expr() ast.MatchExpr {
Expand Down
17 changes: 17 additions & 0 deletions vlib/v/tests/fns/static_call_on_match_test.v
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
struct User {}

fn User.is_ok() bool {
return true
}

fn test_main() {
a := match true {
User.is_ok() {
1
}
else {
2
}
}
assert a == 1
}

0 comments on commit 6064c6f

Please sign in to comment.