Skip to content

Commit f31ba78

Browse files
yuyi98yuyi98
authored
backends: change gen.typ() to gen.styp() ; change gen.ret_typ() to gen.ret_styp() (#22597)
1 parent 72f6368 commit f31ba78

32 files changed

+415
-402
lines changed

‎vlib/v/gen/c/array.v

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ fn (mut g Gen) array_init(node ast.ArrayInit, var_name string) {
1616
g.go_back(1) // delete the `&` already generated in `prefix_expr()
1717
}
1818
if g.is_shared {
19-
shared_styp = g.typ(array_type.typ.set_flag(.shared_f))
19+
shared_styp = g.styp(array_type.typ.set_flag(.shared_f))
2020
g.writeln('(${shared_styp}*)__dup_shared_array(&(${shared_styp}){.mtx = {0}, .val =')
2121
} else if is_amp {
22-
array_styp = g.typ(array_type.typ)
22+
array_styp = g.styp(array_type.typ)
2323
g.write('HEAP(${array_styp}, ')
2424
}
2525
len := node.exprs.len
@@ -33,7 +33,7 @@ fn (mut g Gen) array_init(node ast.ArrayInit, var_name string) {
3333
g.array_init_with_fields(node, elem_type, is_amp, shared_styp, var_name)
3434
} else {
3535
// `[1, 2, 3]`
36-
elem_styp := g.typ(elem_type.typ)
36+
elem_styp := g.styp(elem_type.typ)
3737
noscan := g.check_noscan(elem_type.typ)
3838
if elem_type.unaliased_sym.kind == .function {
3939
g.write('new_array_from_c_array(${len}, ${len}, sizeof(voidptr), _MOV((voidptr[${len}]){')
@@ -93,8 +93,8 @@ fn (mut g Gen) fixed_array_init(node ast.ArrayInit, array_type Type, var_name st
9393
g.past_tmp_var_done(past)
9494
}
9595

96-
ret_typ_str := g.typ(node.typ)
97-
elem_typ_str := g.typ(node.elem_type)
96+
ret_typ_str := g.styp(node.typ)
97+
elem_typ_str := g.styp(node.elem_type)
9898
if var_name == '' {
9999
g.write('${ret_typ_str} ${past.tmp_var} =')
100100
}
@@ -137,7 +137,7 @@ fn (mut g Gen) fixed_array_init(node ast.ArrayInit, array_type Type, var_name st
137137
return
138138
}
139139
if g.inside_struct_init && g.inside_cast {
140-
ret_typ_str := g.typ(node.typ)
140+
ret_typ_str := g.styp(node.typ)
141141
g.write('(${ret_typ_str})')
142142
}
143143
elem_sym := g.table.final_sym(node.elem_type)
@@ -262,7 +262,7 @@ fn (mut g Gen) array_init_with_fields(node ast.ArrayInit, elem_type Type, is_amp
262262
defer {
263263
g.inside_lambda = prev_inside_lambda
264264
}
265-
elem_styp := g.typ(elem_type.typ)
265+
elem_styp := g.styp(elem_type.typ)
266266
noscan := g.check_noscan(elem_type.typ)
267267
is_default_array := elem_type.unaliased_sym.kind == .array && node.has_init
268268
is_default_map := elem_type.unaliased_sym.kind == .map && node.has_init
@@ -275,8 +275,8 @@ fn (mut g Gen) array_init_with_fields(node ast.ArrayInit, elem_type Type, is_amp
275275
g.past_tmp_var_done(past)
276276
}
277277

278-
ret_typ := g.typ(node.typ)
279-
elem_typ := g.typ(node.elem_type)
278+
ret_typ := g.styp(node.typ)
279+
elem_typ := g.styp(node.elem_type)
280280
if var_name == '' {
281281
g.write('${ret_typ} ${past.tmp_var} =')
282282
}
@@ -472,13 +472,13 @@ fn (mut g Gen) gen_array_map(node ast.CallExpr) {
472472
g.past_tmp_var_done(past)
473473
}
474474

475-
ret_typ := g.typ(node.return_type)
475+
ret_typ := g.styp(node.return_type)
476476
ret_sym := g.table.final_sym(node.return_type)
477477
inp_sym := g.table.final_sym(node.receiver_type)
478478
ret_info := ret_sym.info as ast.Array
479-
mut ret_elem_type := g.typ(ret_info.elem_type)
479+
mut ret_elem_type := g.styp(ret_info.elem_type)
480480
inp_info := inp_sym.info as ast.Array
481-
inp_elem_type := g.typ(inp_info.elem_type)
481+
inp_elem_type := g.styp(inp_info.elem_type)
482482
if inp_sym.kind != .array {
483483
verror('map() requires an array')
484484
}
@@ -600,7 +600,7 @@ fn (mut g Gen) gen_array_sorted(node ast.CallExpr) {
600600
defer {
601601
g.past_tmp_var_done(past)
602602
}
603-
atype := g.typ(node.return_type)
603+
atype := g.styp(node.return_type)
604604
sym := g.table.final_sym(node.return_type)
605605
info := sym.info as ast.Array
606606
depth := g.get_array_depth(info.elem_type)
@@ -645,7 +645,7 @@ fn (mut g Gen) gen_array_sort(node ast.CallExpr) {
645645
info := rec_sym.info as ast.Array
646646
// `users.sort(a.age > b.age)`
647647
// Generate a comparison function for a custom type
648-
elem_stype := g.typ(info.elem_type)
648+
elem_stype := g.styp(info.elem_type)
649649
mut compare_fn := 'compare_${g.unique_file_path_hash}_${elem_stype.replace('*', '_ptr')}'
650650
mut comparison_type := g.unwrap(ast.void_type)
651651
mut left_expr, mut right_expr := '', ''
@@ -715,12 +715,12 @@ fn (mut g Gen) gen_array_sort(node ast.CallExpr) {
715715
g.array_sort_fn << compare_fn
716716
}
717717

718-
stype_arg := g.typ(info.elem_type)
718+
stype_arg := g.styp(info.elem_type)
719719
g.definitions.writeln('VV_LOCAL_SYMBOL ${g.static_modifier} int ${compare_fn}(${stype_arg}* a, ${stype_arg}* b) {')
720720
c_condition := if comparison_type.sym.has_method('<') {
721-
'${g.typ(comparison_type.typ)}__lt(${left_expr}, ${right_expr})'
721+
'${g.styp(comparison_type.typ)}__lt(${left_expr}, ${right_expr})'
722722
} else if comparison_type.unaliased_sym.has_method('<') {
723-
'${g.typ(comparison_type.unaliased)}__lt(${left_expr}, ${right_expr})'
723+
'${g.styp(comparison_type.unaliased)}__lt(${left_expr}, ${right_expr})'
724724
} else if use_lambda {
725725
'${lambda_fn_name}(a, b)'
726726
} else {
@@ -768,8 +768,8 @@ fn (mut g Gen) gen_array_filter(node ast.CallExpr) {
768768
verror('filter() requires an array')
769769
}
770770
info := sym.info as ast.Array
771-
styp := g.typ(node.return_type)
772-
elem_type_str := g.typ(info.elem_type)
771+
styp := g.styp(node.return_type)
772+
elem_type_str := g.styp(info.elem_type)
773773
noscan := g.check_noscan(info.elem_type)
774774
has_infix_left_var_name := g.write_prepared_tmp_value(past.tmp_var, node, styp, '{0}')
775775
g.writeln('${past.tmp_var} = __new_array${noscan}(0, ${past.tmp_var}_len, sizeof(${elem_type_str}));\n')
@@ -852,7 +852,7 @@ fn (mut g Gen) gen_array_filter(node ast.CallExpr) {
852852
fn (mut g Gen) gen_array_insert(node ast.CallExpr) {
853853
left_sym := g.table.final_sym(node.left_type)
854854
left_info := left_sym.info as ast.Array
855-
elem_type_str := g.typ(left_info.elem_type)
855+
elem_type_str := g.styp(left_info.elem_type)
856856
arg2_sym := g.table.final_sym(node.args[1].typ)
857857
is_arg2_array := arg2_sym.kind == .array
858858
&& g.table.unaliased_type(node.args[1].typ.clear_flag(.variadic)) == g.table.unaliased_type(node.left_type)
@@ -889,7 +889,7 @@ fn (mut g Gen) gen_array_insert(node ast.CallExpr) {
889889
fn (mut g Gen) gen_array_prepend(node ast.CallExpr) {
890890
left_sym := g.table.final_sym(node.left_type)
891891
left_info := left_sym.info as ast.Array
892-
elem_type_str := g.typ(left_info.elem_type)
892+
elem_type_str := g.styp(left_info.elem_type)
893893
arg_sym := g.table.final_sym(node.args[0].typ)
894894
is_arg_array := arg_sym.kind == .array
895895
&& g.table.unaliased_type(node.args[0].typ) == g.table.unaliased_type(node.left_type)
@@ -917,7 +917,7 @@ fn (mut g Gen) gen_array_prepend(node ast.CallExpr) {
917917
fn (mut g Gen) get_array_contains_method(typ ast.Type) string {
918918
t := g.table.final_sym(g.unwrap_generic(typ).set_nr_muls(0)).idx
919919
g.array_contains_types << t
920-
return g.typ(ast.idx_to_type(t)) + '_contains'
920+
return g.styp(ast.idx_to_type(t)) + '_contains'
921921
}
922922

923923
fn (mut g Gen) gen_array_contains_methods() {
@@ -933,7 +933,7 @@ fn (mut g Gen) gen_array_contains_methods() {
933933
}
934934
done << t
935935
mut fn_builder := strings.new_builder(512)
936-
mut left_type_str := g.typ(t)
936+
mut left_type_str := g.styp(t)
937937
fn_name := '${left_type_str}_contains'
938938

939939
$if new_int ? {
@@ -952,7 +952,7 @@ fn (mut g Gen) gen_array_contains_methods() {
952952

953953
if left_final_sym.kind == .array {
954954
elem_type := (left_final_sym.info as ast.Array).elem_type
955-
mut elem_type_str := g.typ(elem_type)
955+
mut elem_type_str := g.styp(elem_type)
956956
elem_kind := g.table.sym(elem_type).kind
957957
elem_is_not_ptr := elem_type.nr_muls() == 0
958958
if elem_kind == .function {
@@ -991,7 +991,7 @@ fn (mut g Gen) gen_array_contains_methods() {
991991
left_info := left_final_sym.info as ast.ArrayFixed
992992
size := left_info.size
993993
elem_type := left_info.elem_type
994-
mut elem_type_str := g.typ(elem_type)
994+
mut elem_type_str := g.styp(elem_type)
995995
elem_kind := g.table.sym(elem_type).kind
996996
elem_is_not_ptr := elem_type.nr_muls() == 0
997997
if elem_kind == .function {
@@ -1067,11 +1067,11 @@ fn (mut g Gen) gen_array_contains(left_type ast.Type, left ast.Expr, right_type
10671067
if g.is_cc_msvc {
10681068
stmts := g.go_before_last_stmt().trim_space()
10691069
tmp_var := g.new_tmp_var()
1070-
g.write('${g.typ(right_type)} ${tmp_var} = ${g.expr_string(right)};')
1070+
g.write('${g.styp(right_type)} ${tmp_var} = ${g.expr_string(right)};')
10711071
g.write(stmts)
10721072
g.write(tmp_var)
10731073
} else {
1074-
g.write('(${g.typ(right.typ)})')
1074+
g.write('(${g.styp(right.typ)})')
10751075
g.expr(right)
10761076
}
10771077
} else {
@@ -1083,7 +1083,7 @@ fn (mut g Gen) gen_array_contains(left_type ast.Type, left ast.Expr, right_type
10831083
fn (mut g Gen) get_array_index_method(typ ast.Type) string {
10841084
t := g.unwrap_generic(typ).set_nr_muls(0)
10851085
g.array_index_types << t
1086-
return g.typ(t) + '_index'
1086+
return g.styp(t) + '_index'
10871087
}
10881088

10891089
fn (mut g Gen) gen_array_index_methods() {
@@ -1094,13 +1094,13 @@ fn (mut g Gen) gen_array_index_methods() {
10941094
}
10951095
done << t
10961096
final_left_sym := g.table.final_sym(t)
1097-
mut left_type_str := g.typ(t)
1097+
mut left_type_str := g.styp(t)
10981098
fn_name := '${left_type_str}_index'
10991099
mut fn_builder := strings.new_builder(512)
11001100

11011101
if final_left_sym.kind == .array {
11021102
info := final_left_sym.info as ast.Array
1103-
mut elem_type_str := g.typ(info.elem_type)
1103+
mut elem_type_str := g.styp(info.elem_type)
11041104
elem_sym := g.table.sym(info.elem_type)
11051105
if elem_sym.kind == .function {
11061106
left_type_str = 'Array_voidptr'
@@ -1145,7 +1145,7 @@ fn (mut g Gen) gen_array_index_methods() {
11451145
}
11461146
} else if final_left_sym.kind == .array_fixed {
11471147
info := final_left_sym.info as ast.ArrayFixed
1148-
mut elem_type_str := g.typ(info.elem_type)
1148+
mut elem_type_str := g.styp(info.elem_type)
11491149
elem_sym := g.table.sym(info.elem_type)
11501150
if elem_sym.kind == .function {
11511151
elem_type_str = 'voidptr'
@@ -1223,11 +1223,11 @@ fn (mut g Gen) gen_array_index(node ast.CallExpr) {
12231223
if g.is_cc_msvc {
12241224
stmts := g.go_before_last_stmt().trim_space()
12251225
tmp_var := g.new_tmp_var()
1226-
g.write('${g.typ(node.args[0].typ)} ${tmp_var} = ${g.expr_string(node.args[0].expr)};')
1226+
g.write('${g.styp(node.args[0].typ)} ${tmp_var} = ${g.expr_string(node.args[0].expr)};')
12271227
g.write(stmts)
12281228
g.write(tmp_var)
12291229
} else {
1230-
g.write('(${g.typ(node.args[0].typ)})')
1230+
g.write('(${g.styp(node.args[0].typ)})')
12311231
g.expr(node.args[0].expr)
12321232
}
12331233
} else {
@@ -1268,8 +1268,8 @@ fn (mut g Gen) gen_array_any(node ast.CallExpr) {
12681268

12691269
sym := g.table.final_sym(node.left_type)
12701270
info := sym.info as ast.Array
1271-
// styp := g.typ(node.return_type)
1272-
elem_type_str := g.typ(info.elem_type)
1271+
// styp := g.styp(node.return_type)
1272+
elem_type_str := g.styp(info.elem_type)
12731273
has_infix_left_var_name := g.write_prepared_tmp_value(past.tmp_var, node, 'bool',
12741274
'false')
12751275

@@ -1357,8 +1357,8 @@ fn (mut g Gen) gen_array_all(node ast.CallExpr) {
13571357

13581358
sym := g.table.final_sym(node.left_type)
13591359
info := sym.info as ast.Array
1360-
// styp := g.typ(node.return_type)
1361-
elem_type_str := g.typ(info.elem_type)
1360+
// styp := g.styp(node.return_type)
1361+
elem_type_str := g.styp(info.elem_type)
13621362

13631363
has_infix_left_var_name := g.write_prepared_tmp_value(past.tmp_var, node, 'bool',
13641364
'true')
@@ -1455,7 +1455,7 @@ fn (mut g Gen) write_prepared_tmp_value(tmp string, node &ast.CallExpr, tmp_styp
14551455
} else {
14561456
node.left_type
14571457
}
1458-
g.write('${g.typ(left_type)} ${tmp}_orig = ')
1458+
g.write('${g.styp(left_type)} ${tmp}_orig = ')
14591459
if !node.left_type.has_flag(.shared_f) && node.left_type.is_ptr() {
14601460
g.write('*')
14611461
}

0 commit comments

Comments
 (0)