Skip to content

Commit cb42f32

Browse files
authored
v.token: make is_assign() contain .decl_assign (#21805)
1 parent 35e6a40 commit cb42f32

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

cmd/tools/vdoc/highlight.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ fn color_highlight(code string, tb &ast.Table) string {
138138
else {
139139
if token.is_key(tok.lit) || token.is_decl(tok.kind) {
140140
tok_typ = .keyword
141-
} else if tok.kind == .decl_assign || tok.kind.is_assign() || tok.is_unary()
142-
|| tok.kind.is_relational() || tok.kind.is_infix() || tok.kind.is_postfix() {
141+
} else if tok.kind.is_assign() || tok.is_unary() || tok.kind.is_relational()
142+
|| tok.kind.is_infix() || tok.kind.is_postfix() {
143143
tok_typ = .operator
144144
}
145145
}

cmd/tools/vdoc/html.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,8 @@ fn html_highlight(code string, tb &ast.Table) string {
444444
else {
445445
if token.is_key(tok.lit) || token.is_decl(tok.kind) {
446446
tok_typ = .keyword
447-
} else if tok.kind == .decl_assign || tok.kind.is_assign() || tok.is_unary()
448-
|| tok.kind.is_relational() || tok.kind.is_infix() || tok.kind.is_postfix() {
447+
} else if tok.kind.is_assign() || tok.is_unary() || tok.kind.is_relational()
448+
|| tok.kind.is_infix() || tok.kind.is_postfix() {
449449
tok_typ = .operator
450450
}
451451
}

vlib/v/parser/for.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn (mut p Parser) for_stmt() ast.Stmt {
3030
}
3131
p.close_scope()
3232
return for_stmt
33-
} else if p.peek_tok.kind in [.decl_assign, .assign, .semicolon]
33+
} else if p.peek_tok.kind == .semicolon
3434
|| (p.peek_tok.kind in [.inc, .dec] && p.peek_token(2).kind in [.semicolon, .comma])
3535
|| p.peek_tok.kind.is_assign() || p.tok.kind == .semicolon
3636
|| (p.peek_tok.kind == .comma && p.peek_token(2).kind != .key_mut
@@ -47,7 +47,7 @@ fn (mut p Parser) for_stmt() ast.Stmt {
4747
mut has_inc := false
4848
mut is_multi := p.peek_tok.kind == .comma && p.peek_token(2).kind != .key_mut
4949
&& p.peek_token(3).kind != .key_in
50-
if p.peek_tok.kind in [.assign, .decl_assign] || p.peek_tok.kind.is_assign() || is_multi {
50+
if p.peek_tok.kind.is_assign() || is_multi {
5151
init = p.assign_stmt()
5252
has_init = true
5353
} else if p.peek_tok.kind in [.inc, .dec] {

vlib/v/parser/parser.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2156,7 +2156,7 @@ fn (mut p Parser) parse_multi_expr(is_top_level bool) ast.Stmt {
21562156
return p.error('expecting `:=` (e.g. `mut x :=`)')
21572157
}
21582158
// TODO: remove translated
2159-
if p.tok.kind in [.assign, .decl_assign] || p.tok.kind.is_assign() {
2159+
if p.tok.kind.is_assign() {
21602160
return p.partial_assign_stmt(left)
21612161
} else if !p.pref.translated && !p.is_translated && !p.pref.is_fmt && !p.pref.is_vet
21622162
&& tok.kind !in [.key_if, .key_match, .key_lock, .key_rlock, .key_select] {

vlib/v/token/token.v

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ pub enum AtKind {
186186
location
187187
}
188188

189-
pub const assign_tokens = [Kind.assign, .plus_assign, .minus_assign, .mult_assign, .div_assign,
190-
.xor_assign, .mod_assign, .or_assign, .and_assign, .right_shift_assign, .left_shift_assign,
191-
.unsigned_right_shift_assign, .boolean_and_assign, .boolean_or_assign]
189+
pub const assign_tokens = [Kind.assign, .decl_assign, .plus_assign, .minus_assign, .mult_assign,
190+
.div_assign, .xor_assign, .mod_assign, .or_assign, .and_assign, .right_shift_assign,
191+
.left_shift_assign, .unsigned_right_shift_assign, .boolean_and_assign, .boolean_or_assign]
192192

193193
pub const valid_at_tokens = ['@VROOT', '@VMODROOT', '@VEXEROOT', '@FN', '@METHOD', '@MOD', '@STRUCT',
194194
'@VEXE', '@FILE', '@LINE', '@COLUMN', '@VHASH', '@VCURRENTHASH', '@VMOD_FILE', '@VMODHASH',

0 commit comments

Comments
 (0)