vlang
diff --git a/Collapse file
‎cmd/tools/vast/vast.v‎
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion b/Collapse file
‎cmd/tools/vast/vast.v‎
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion
diff --git a/Collapse file
‎vlib/v/ast/ast.v‎
Copy file name to clipboard
+5-4Lines changed: 5 additions & 4 deletions b/Collapse file
‎vlib/v/ast/ast.v‎
Copy file name to clipboard
+5-4Lines changed: 5 additions & 4 deletions
diff --git a/Collapse file
‎vlib/v/ast/table.v‎
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/Collapse file
‎vlib/v/ast/table.v‎
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
@@ -1538,7 +1538,6 @@ fn (t Tree) if_branch(node ast.IfBranch) &Node {
 	obj.add_terse('cond', t.expr(node.cond))
 	obj.add('pos', t.pos(node.pos))
 	obj.add('body_pos', t.pos(node.body_pos))
-	obj.add_terse('pkg_exist', t.bool_node(node.pkg_exist))
 	obj.add_terse('stmts', t.array_node_stmt(node.stmts))
 	obj.add('scope', t.number_node(int(node.scope)))
 	obj.add('comments', t.array_node_comment(node.comments))
 
@@ -1234,10 +1234,9 @@ pub:
 	body_pos token.Pos
 	comments []Comment
 pub mut:
-	cond      Expr
-	pkg_exist bool
-	stmts     []Stmt
-	scope     &Scope = unsafe { nil }
+	cond  Expr
+	stmts []Stmt
+	scope &Scope = unsafe { nil }
 }
 
 pub struct UnsafeExpr {
@@ -2131,6 +2130,8 @@ pub fn (cc ComptimeCall) expr_str() string {
 		if arg.expr.is_pure_literal() {
 			str = "\$${cc.method_name}('${cc.args_var}', ${arg})"
 		}
+	} else if cc.kind == .pkgconfig {
+		str = "\$${cc.method_name}('${cc.args_var}')"
 	}
 	return str
 }
 
@@ -94,6 +94,13 @@ pub mut:
 	anon_struct_counter int
 	anon_union_names    map[string]int // anon union name -> union sym idx
 	anon_union_counter  int
+	comptime_is_true    map[string]ComptTimeCondResult // The evaluate cond results for different generic types combination, such as `comptime_is_true['T=int,X=string|main.v|pos ...'] = {true, '!DEFINED(WINDOWS)'}`
+}
+
+pub struct ComptTimeCondResult {
+pub mut:
+	val   bool
+	c_str string
 }
 
 // used by vls to avoid leaks
Original file line number	Diff line number	Diff line change
`@@ -1234,10 +1234,9 @@ pub:`
`1234`	`1234`	`body_pos token.Pos`
`1235`	`1235`	`comments []Comment`
`1236`	`1236`	`pub mut:`
`1237`		`- cond Expr`
`1238`		`- pkg_exist bool`
`1239`		`- stmts []Stmt`
`1240`		`- scope &Scope = unsafe { nil }`
	`1237`	`+ cond Expr`
	`1238`	`+ stmts []Stmt`
	`1239`	`+ scope &Scope = unsafe { nil }`
`1241`	`1240`	`}`
`1242`	`1241`
`1243`	`1242`	`pub struct UnsafeExpr {`
`@@ -2131,6 +2130,8 @@ pub fn (cc ComptimeCall) expr_str() string {`
`2131`	`2130`	`if arg.expr.is_pure_literal() {`
`2132`	`2131`	`str = "\$${cc.method_name}('${cc.args_var}', ${arg})"`
`2133`	`2132`	`}`
	`2133`	`+ } else if cc.kind == .pkgconfig {`
	`2134`	`+ str = "\$${cc.method_name}('${cc.args_var}')"`
`2134`	`2135`	`}`
`2135`	`2136`	`return str`
`2136`	`2137`	`}`