TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-16 10:57:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

cgen: add missing sync auto import, when using SelectExpr (#19998)

Browse Source
This commit is contained in:
Felipe Pena 2023-11-27 15:14:23 -03:00 committed by GitHub
parent 2964855d15
commit b5ba12256d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vlib/v/gen/c/cgen.v
View File

@ -4245,6 +4245,9 @@ fn (mut g Gen) select_expr(node ast.SelectExpr) {
} }
} }
chan_array := g.new_tmp_var() chan_array := g.new_tmp_var()
if n_channels == 0 {
g.writeln('Array_sync__Channel_ptr ${chan_array} = __new_array_with_default(0, 0, sizeof(sync__Channel*), 0);')
} else {
g.write('Array_sync__Channel_ptr ${chan_array} = new_array_from_c_array(${n_channels}, ${n_channels}, sizeof(sync__Channel*), _MOV((sync__Channel*[${n_channels}]){') g.write('Array_sync__Channel_ptr ${chan_array} = new_array_from_c_array(${n_channels}, ${n_channels}, sizeof(sync__Channel*), _MOV((sync__Channel*[${n_channels}]){')
for i in 0 .. n_channels { for i in 0 .. n_channels {
if i > 0 { if i > 0 {
@ -4255,7 +4258,11 @@ fn (mut g Gen) select_expr(node ast.SelectExpr) {
g.write(')') g.write(')')
} }
g.writeln('}));\n') g.writeln('}));\n')
}
directions_array := g.new_tmp_var() directions_array := g.new_tmp_var()
if n_channels == 0 {
g.writeln('Array_sync__Direction ${directions_array} = __new_array_with_default(0, 0, sizeof(sync__Direction), 0);')
} else {
g.write('Array_sync__Direction ${directions_array} = new_array_from_c_array(${n_channels}, ${n_channels}, sizeof(sync__Direction), _MOV((sync__Direction[${n_channels}]){') g.write('Array_sync__Direction ${directions_array} = new_array_from_c_array(${n_channels}, ${n_channels}, sizeof(sync__Direction), _MOV((sync__Direction[${n_channels}]){')
for i in 0 .. n_channels { for i in 0 .. n_channels {
if i > 0 { if i > 0 {
@ -4268,7 +4275,11 @@ fn (mut g Gen) select_expr(node ast.SelectExpr) {
} }
} }
g.writeln('}));\n') g.writeln('}));\n')
}
objs_array := g.new_tmp_var() objs_array := g.new_tmp_var()
if n_channels == 0 {
g.writeln('Array_voidptr ${objs_array} = __new_array_with_default(0, 0, sizeof(voidptr), 0);')
} else {
g.write('Array_voidptr ${objs_array} = new_array_from_c_array(${n_channels}, ${n_channels}, sizeof(voidptr), _MOV((voidptr[${n_channels}]){') g.write('Array_voidptr ${objs_array} = new_array_from_c_array(${n_channels}, ${n_channels}, sizeof(voidptr), _MOV((voidptr[${n_channels}]){')
for i in 0 .. n_channels { for i in 0 .. n_channels {
if i > 0 { if i > 0 {
@ -4283,6 +4294,7 @@ fn (mut g Gen) select_expr(node ast.SelectExpr) {
} }
} }
g.writeln('}));\n') g.writeln('}));\n')
}
select_result := g.new_tmp_var() select_result := g.new_tmp_var()
g.write('int ${select_result} = sync__channel_select(&/*arr*/${chan_array}, ${directions_array}, &/*arr*/${objs_array}, ') g.write('int ${select_result} = sync__channel_select(&/*arr*/${chan_array}, ${directions_array}, &/*arr*/${objs_array}, ')
if has_timeout { if has_timeout {

1
vlib/v/parser/if_match.v
View File

@ -532,6 +532,7 @@ fn (mut p Parser) select_expr() ast.SelectExpr {
if p.tok.kind == .rcbr { if p.tok.kind == .rcbr {
p.check(.rcbr) p.check(.rcbr)
} }
p.register_auto_import('sync')
return ast.SelectExpr{ return ast.SelectExpr{
branches: branches branches: branches
pos: pos.extend_with_last_line(p.prev_tok.pos(), p.prev_tok.line_nr) pos: pos.extend_with_last_line(p.prev_tok.pos(), p.prev_tok.line_nr)

8
vlib/v/tests/select_auto_sync_test.v Normal file
View File

@ -0,0 +1,8 @@
import time
fn test_main() {
select {
1 * time.second {}
}
assert true
}