mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 14:32:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

fix comptime ident

Browse source
This commit is contained in:
kbkpbot 2025-08-23 08:16:53 +08:00
parent 0129566b1d
commit 165185681a
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
vlib/v/checker/comptime.v
View file

@ -784,7 +784,7 @@ fn (mut c Checker) evaluate_once_comptime_if_attribute(mut node ast.Attr) bool {
return node.ct_skip return node.ct_skip
} }
fn (mut c Checker) comptime_if_to_ifdef(name string) !string { fn (mut c Checker) comptime_if_to_ifdef(name string, is_comptime_option bool) !string {
match name { match name {
// platforms/os-es: // platforms/os-es:
'windows' { 'windows' {
@ -965,9 +965,11 @@ fn (mut c Checker) comptime_if_to_ifdef(name string) !string {
return '__FAST_MATH__' return '__FAST_MATH__'
} }
else { else {
if name in c.pref.compile_defines_all { if is_comptime_option
|| (c.pref.compile_defines_all.len > 0 && name in c.pref.compile_defines_all) {
return 'CUSTOM_DEFINE_${name}' return 'CUSTOM_DEFINE_${name}'
} }
return error('bad os ifdef name "${name}"') // should never happen, caught in the checker
} }
} }
return error('none') return error('none')
@ -1103,11 +1105,13 @@ fn (mut c Checker) comptime_if_cond(mut cond ast.Expr, mut sb strings.Builder) (
should_record_ident = true should_record_ident = true
is_user_ident = true is_user_ident = true
ident_name = cname ident_name = cname
sb.write_string('defined(CUSTOM_DEFINE_${cname})') ifdef := c.comptime_if_to_ifdef(cname, true) or {
if cname in c.pref.compile_defines { c.error(err.msg(), cond.pos)
return true, false return false, false
} }
return false, false sb.write_string('defined(${ifdef})')
is_true = cname in c.pref.compile_defines
return is_true, false
} }
ast.InfixExpr { ast.InfixExpr {
match cond.op { match cond.op {
@ -1651,7 +1655,7 @@ fn (mut c Checker) comptime_if_cond(mut cond ast.Expr, mut sb strings.Builder) (
c.error('invalid \$if condition: unknown indent `${cname}`', cond.pos) c.error('invalid \$if condition: unknown indent `${cname}`', cond.pos)
return false, false return false, false
} }
if ifdef := c.comptime_if_to_ifdef(cname) { if ifdef := c.comptime_if_to_ifdef(cname, false) {
sb.write_string('defined(${ifdef})') sb.write_string('defined(${ifdef})')
} else { } else {
sb.write_string('${is_true}') sb.write_string('${is_true}')