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

fix wasm, fix vast

Browse source
This commit is contained in:
kbkpbot 2025-08-22 10:39:37 +08:00
parent d39364aa13
commit 893bae8423
2 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cmd/tools/vast/vast.v
View file

@ -1538,7 +1538,6 @@ fn (t Tree) if_branch(node ast.IfBranch) &Node {
obj.add_terse('cond', t.expr(node.cond)) obj.add_terse('cond', t.expr(node.cond))
obj.add('pos', t.pos(node.pos)) obj.add('pos', t.pos(node.pos))
obj.add('body_pos', t.pos(node.body_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_terse('stmts', t.array_node_stmt(node.stmts))
obj.add('scope', t.number_node(int(node.scope))) obj.add('scope', t.number_node(int(node.scope)))
obj.add('comments', t.array_node_comment(node.comments)) obj.add('comments', t.array_node_comment(node.comments))

22
vlib/v/gen/wasm/comptime.v
View file

@ -5,36 +5,32 @@ module wasm
import v.ast import v.ast
pub fn (mut g Gen) comptime_cond(cond ast.Expr, pkg_exists bool) bool { pub fn (mut g Gen) comptime_cond(cond ast.Expr) bool {
match cond { match cond {
ast.BoolLiteral { ast.BoolLiteral {
return cond.val return cond.val
} }
ast.ParExpr { ast.ParExpr {
g.comptime_cond(cond.expr, pkg_exists) g.comptime_cond(cond.expr)
} }
ast.PrefixExpr { ast.PrefixExpr {
if cond.op == .not { if cond.op == .not {
return !g.comptime_cond(cond.right, pkg_exists) return !g.comptime_cond(cond.right)
} }
} }
ast.InfixExpr { ast.InfixExpr {
match cond.op { match cond.op {
.and { .and {
return g.comptime_cond(cond.left, pkg_exists) return g.comptime_cond(cond.left) && g.comptime_cond(cond.right)
&& g.comptime_cond(cond.right, pkg_exists)
} }
.logical_or { .logical_or {
return g.comptime_cond(cond.left, pkg_exists) return g.comptime_cond(cond.left) || g.comptime_cond(cond.right)
|| g.comptime_cond(cond.right, pkg_exists)
} }
.eq { .eq {
return g.comptime_cond(cond.left, pkg_exists) == g.comptime_cond(cond.right, return g.comptime_cond(cond.left) == g.comptime_cond(cond.right)
pkg_exists)
} }
.ne { .ne {
return g.comptime_cond(cond.left, pkg_exists) != g.comptime_cond(cond.right, return g.comptime_cond(cond.left) != g.comptime_cond(cond.right)
pkg_exists)
} }
// wasm doesn't support generics // wasm doesn't support generics
// .key_is, .not_is // .key_is, .not_is
@ -45,7 +41,7 @@ pub fn (mut g Gen) comptime_cond(cond ast.Expr, pkg_exists bool) bool {
return g.comptime_if_to_ifdef(cond.name, false) return g.comptime_if_to_ifdef(cond.name, false)
} }
ast.ComptimeCall { ast.ComptimeCall {
return pkg_exists // more documentation needed here... return false // pkg_exists, more documentation needed here...
} }
ast.PostfixExpr { ast.PostfixExpr {
return g.comptime_if_to_ifdef((cond.expr as ast.Ident).name, true) return g.comptime_if_to_ifdef((cond.expr as ast.Ident).name, true)
@ -66,7 +62,7 @@ pub fn (mut g Gen) comptime_if_expr(node ast.IfExpr, expected ast.Type, existing
for i, branch in node.branches { for i, branch in node.branches {
has_expr := !(node.has_else && i + 1 >= node.branches.len) has_expr := !(node.has_else && i + 1 >= node.branches.len)
if has_expr && !g.comptime_cond(branch.cond, branch.pkg_exist) { if has_expr && !g.comptime_cond(branch.cond) {
continue continue
} }
// !node.is_expr || cond // !node.is_expr || cond