@@ -550,7 +550,7 @@ fn (mut c Checker) eval_comptime_const_expr(expr ast.Expr, nlevel int) ?ast.Comp
550
550
for i in 0 .. expr.branches.len {
551
551
mut branch := expr.branches[i]
552
552
if ! expr.has_else || i < expr.branches.len - 1 {
553
- if c.comptime_if_branch (mut branch.cond, branch.pos) == .eval {
553
+ if c.comptime_if_cond (mut branch.cond, branch.pos) == .eval {
554
554
last_stmt := branch.stmts.last ()
555
555
if last_stmt is ast.ExprStmt {
556
556
return c.eval_comptime_const_expr (last_stmt.expr, nlevel + 1 )
@@ -665,7 +665,7 @@ fn (mut c Checker) evaluate_once_comptime_if_attribute(mut node ast.Attr) bool {
665
665
}
666
666
}
667
667
c.inside_ct_attr = true
668
- node.ct_skip = if c.comptime_if_branch (mut node.ct_expr, node.pos) == .skip {
668
+ node.ct_skip = if c.comptime_if_cond (mut node.ct_expr, node.pos) == .skip {
669
669
true
670
670
} else {
671
671
false
@@ -681,9 +681,9 @@ enum ComptimeBranchSkipState {
681
681
unknown
682
682
}
683
683
684
- // comptime_if_branch checks the condition of a compile-time `if` branch. It returns `true`
684
+ // comptime_if_cond checks the condition of a compile-time `if` branch. It returns `true`
685
685
// if that branch's contents should be skipped (targets a different os for example)
686
- fn (mut c Checker) comptime_if_branch (mut cond ast.Expr, pos token.Pos) ComptimeBranchSkipState {
686
+ fn (mut c Checker) comptime_if_cond (mut cond ast.Expr, pos token.Pos) ComptimeBranchSkipState {
687
687
mut should_record_ident := false
688
688
mut is_user_ident := false
689
689
mut ident_name := ''
@@ -702,13 +702,13 @@ fn (mut c Checker) comptime_if_branch(mut cond ast.Expr, pos token.Pos) Comptime
702
702
return if cond.val { .eval } else { .skip }
703
703
}
704
704
ast.ParExpr {
705
- return c.comptime_if_branch (mut cond.expr, pos)
705
+ return c.comptime_if_cond (mut cond.expr, pos)
706
706
}
707
707
ast.PrefixExpr {
708
708
if cond.op != .not {
709
709
c.error ('invalid `\$ if` condition' , cond.pos)
710
710
}
711
- reversed := c.comptime_if_branch (mut cond.right, cond.pos)
711
+ reversed := c.comptime_if_cond (mut cond.right, cond.pos)
712
712
return if reversed == .eval {
713
713
.skip
714
714
} else if reversed == .skip {
@@ -732,16 +732,16 @@ fn (mut c Checker) comptime_if_branch(mut cond ast.Expr, pos token.Pos) Comptime
732
732
ast.InfixExpr {
733
733
match cond.op {
734
734
.and {
735
- l := c.comptime_if_branch (mut cond.left, cond.pos)
736
- r := c.comptime_if_branch (mut cond.right, cond.pos)
735
+ l := c.comptime_if_cond (mut cond.left, cond.pos)
736
+ r := c.comptime_if_cond (mut cond.right, cond.pos)
737
737
if l == .unknown || r == .unknown {
738
738
return .unknown
739
739
}
740
740
return if l == .eval && r == .eval { .eval } else { .skip }
741
741
}
742
742
.logical_or {
743
- l := c.comptime_if_branch (mut cond.left, cond.pos)
744
- r := c.comptime_if_branch (mut cond.right, cond.pos)
743
+ l := c.comptime_if_cond (mut cond.left, cond.pos)
744
+ r := c.comptime_if_cond (mut cond.right, cond.pos)
745
745
if l == .unknown || r == .unknown {
746
746
return .unknown
747
747
}
0 commit comments