Skip to content

Commit 0aa656b

Browse files
authored
parser: fix parameter collision for generated @[flag] enum methods, with modules named flag (#21844)
1 parent 304aa9f commit 0aa656b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

vlib/v/parser/parser.v

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4142,13 +4142,13 @@ fn (mut p Parser) enum_decl() ast.EnumDecl {
41424142
p.codegen('
41434143
//
41444144
@[inline] ${pubfn} ( e &${enum_name}) is_empty() bool { return ${senum_type}(*e) == 0 }
4145-
@[inline] ${pubfn} ( e &${enum_name}) has(flag ${enum_name}) bool { return (${senum_type}(*e) & (${senum_type}(flag))) != 0 }
4146-
@[inline] ${pubfn} ( e &${enum_name}) all(flag ${enum_name}) bool { return (${senum_type}(*e) & (${senum_type}(flag))) == ${senum_type}(flag) }
4147-
@[inline] ${pubfn} (mut e ${enum_name}) set(flag ${enum_name}) { unsafe{ *e = ${enum_name}(${senum_type}(*e) | (${senum_type}(flag))) } }
4145+
@[inline] ${pubfn} ( e &${enum_name}) has(flag_ ${enum_name}) bool { return (${senum_type}(*e) & (${senum_type}(flag_))) != 0 }
4146+
@[inline] ${pubfn} ( e &${enum_name}) all(flag_ ${enum_name}) bool { return (${senum_type}(*e) & (${senum_type}(flag_))) == ${senum_type}(flag_) }
4147+
@[inline] ${pubfn} (mut e ${enum_name}) set(flag_ ${enum_name}) { unsafe{ *e = ${enum_name}(${senum_type}(*e) | (${senum_type}(flag_))) } }
41484148
@[inline] ${pubfn} (mut e ${enum_name}) set_all() { unsafe{ *e = ${enum_name}(${all_bits_set_value}) } }
4149-
@[inline] ${pubfn} (mut e ${enum_name}) clear(flag ${enum_name}) { unsafe{ *e = ${enum_name}(${senum_type}(*e) & ~(${senum_type}(flag))) } }
4149+
@[inline] ${pubfn} (mut e ${enum_name}) clear(flag_ ${enum_name}) { unsafe{ *e = ${enum_name}(${senum_type}(*e) & ~(${senum_type}(flag_))) } }
41504150
@[inline] ${pubfn} (mut e ${enum_name}) clear_all() { unsafe{ *e = ${enum_name}(0) } }
4151-
@[inline] ${pubfn} (mut e ${enum_name}) toggle(flag ${enum_name}) { unsafe{ *e = ${enum_name}(${senum_type}(*e) ^ (${senum_type}(flag))) } }
4151+
@[inline] ${pubfn} (mut e ${enum_name}) toggle(flag_ ${enum_name}) { unsafe{ *e = ${enum_name}(${senum_type}(*e) ^ (${senum_type}(flag_))) } }
41524152
//
41534153
')
41544154
}

0 commit comments

Comments
 (0)