Skip to content

Commit 55d004e

Browse files
medvednikovmedvednikov
committed
cgen: reduce v.c size by ~4% by removing comments and using shorter literals
1 parent d7061cb commit 55d004e

42 files changed

Lines changed: 356 additions & 328 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎vlib/builtin/string_interpolation.v‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -721,12 +721,12 @@ pub const si_g64_code = '0xfe0f'
721721

722722
@[inline]
723723
pub fn str_intp_sq(in_str string) string {
724-
return 'str_intp(2, _MOV((StrIntpData[]){{_SLIT("\'"), ${si_s_code}, {.d_s = ${in_str}}},{_SLIT("\'"), 0, {.d_c = 0 }}}))'
724+
return 'str_intp(2, _MOV((StrIntpData[]){{_S("\'"), ${si_s_code}, {.d_s = ${in_str}}},{_S("\'"), 0, {.d_c = 0 }}}))'
725725
}
726726

727727
@[inline]
728728
pub fn str_intp_rune(in_str string) string {
729-
return 'str_intp(2, _MOV((StrIntpData[]){{_SLIT("\`"), ${si_s_code}, {.d_s = ${in_str}}},{_SLIT("\`"), 0, {.d_c = 0 }}}))'
729+
return 'str_intp(2, _MOV((StrIntpData[]){{_S("\`"), ${si_s_code}, {.d_s = ${in_str}}},{_S("\`"), 0, {.d_c = 0 }}}))'
730730
}
731731

732732
@[inline]
@@ -752,12 +752,12 @@ pub fn str_intp_sub(base_str string, in_str string) string {
752752
st_str := base_str[..index]
753753
if index + 2 < base_str.len {
754754
en_str := base_str[index + 2..]
755-
res_str := 'str_intp(2, _MOV((StrIntpData[]){{_SLIT("${st_str}"), ${si_s_code}, {.d_s = ${in_str} }},{_SLIT("${en_str}"), 0, {.d_c = 0}}}))'
755+
res_str := 'str_intp(2, _MOV((StrIntpData[]){{_S("${st_str}"), ${si_s_code}, {.d_s = ${in_str} }},{_S("${en_str}"), 0, {.d_c = 0}}}))'
756756
st_str.free()
757757
en_str.free()
758758
return res_str
759759
}
760-
res2_str := 'str_intp(1, _MOV((StrIntpData[]){{_SLIT("${st_str}"), ${si_s_code}, {.d_s = ${in_str} }}}))'
760+
res2_str := 'str_intp(1, _MOV((StrIntpData[]){{_S("${st_str}"), ${si_s_code}, {.d_s = ${in_str} }}}))'
761761
st_str.free()
762762
return res2_str
763763
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ fn (mut g Gen) array_init_with_fields(node ast.ArrayInit, elem_type Type, is_amp
338338
g.write2('(${elem_styp}[]){', g.type_default(node.elem_type))
339339
g.write('}[0], ${depth})')
340340
} else if node.has_len && node.elem_type == ast.string_type {
341-
g.write2('&(${elem_styp}[]){', '_SLIT("")')
341+
g.write2('&(${elem_styp}[]){', '_S("")')
342342
g.write('})')
343343
} else if node.has_len && elem_type.unaliased_sym.kind in [.array, .map] {
344344
g.write2('(voidptr)&(${elem_styp}[]){', g.type_default(node.elem_type))
@@ -447,7 +447,7 @@ fn (mut g Gen) array_init_with_fields(node ast.ArrayInit, elem_type Type, is_amp
447447
g.expr_with_opt(ast.None{}, ast.none_type, node.elem_type)
448448
g.write(')')
449449
} else if node.has_len && node.elem_type == ast.string_type {
450-
g.write2('&(${elem_styp}[]){', '_SLIT("")')
450+
g.write2('&(${elem_styp}[]){', '_S("")')
451451
g.write('})')
452452
} else if node.has_len && elem_type.unaliased_sym.kind in [.struct, .array, .map] {
453453
g.write2('(voidptr)&(${elem_styp}[]){', g.type_default(node.elem_type))
@@ -743,7 +743,7 @@ fn (mut g Gen) gen_array_sort(node ast.CallExpr) {
743743
verror('.sort() is an array method or a fixed array method')
744744
}
745745
if g.pref.is_bare {
746-
g.writeln('bare_panic(_SLIT("sort does not work with -freestanding"))')
746+
g.writeln('bare_panic(_S("sort does not work with -freestanding"))')
747747
return
748748
}
749749
left_is_array := rec_sym.kind == .array
@@ -825,7 +825,7 @@ fn (mut g Gen) gen_array_sort(node ast.CallExpr) {
825825
}
826826

827827
stype_arg := g.styp(elem_type)
828-
g.sort_fn_definitions.writeln('VV_LOCAL_SYMBOL ${g.static_modifier} int ${compare_fn}(${stype_arg}* a, ${stype_arg}* b) {')
828+
g.sort_fn_definitions.writeln('VV_LOC ${g.static_modifier} int ${compare_fn}(${stype_arg}* a, ${stype_arg}* b) {')
829829
c_condition := if comparison_type.sym.has_method('<') {
830830
'${g.styp(comparison_type.typ)}__lt(${left_expr}, ${right_expr})'
831831
} else if comparison_type.unaliased_sym.has_method('<') {
@@ -1159,7 +1159,7 @@ fn (mut g Gen) gen_array_contains_methods() {
11591159
left_type_str = 'Array_voidptr'
11601160
elem_type_str = 'voidptr'
11611161
}
1162-
g.type_definitions.writeln('${g.static_non_parallel}bool ${fn_name}(${left_type_str} a, ${elem_type_str} v); // auto')
1162+
g.type_definitions.writeln('${g.static_non_parallel}bool ${fn_name}(${left_type_str} a, ${elem_type_str} v);')
11631163
fn_builder.writeln('${g.static_non_parallel}bool ${fn_name}(${left_type_str} a, ${elem_type_str} v) {')
11641164
fn_builder.writeln('\tfor (int i = 0; i < a.len; ++i) {')
11651165
if elem_kind == .string {
@@ -1201,7 +1201,7 @@ fn (mut g Gen) gen_array_contains_methods() {
12011201
if elem_kind == .function {
12021202
elem_type_str = 'voidptr'
12031203
}
1204-
g.type_definitions.writeln('${g.static_non_parallel}bool ${fn_name}(${left_type_str} a, ${elem_type_str} v); // auto')
1204+
g.type_definitions.writeln('${g.static_non_parallel}bool ${fn_name}(${left_type_str} a, ${elem_type_str} v);')
12051205
fn_builder.writeln('${g.static_non_parallel}bool ${fn_name}(${left_type_str} a, ${elem_type_str} v) {')
12061206
fn_builder.writeln('\tfor (int i = 0; i < ${size}; ++i) {')
12071207
if elem_kind == .string {
@@ -1307,7 +1307,7 @@ fn (mut g Gen) gen_array_index_methods() {
13071307
left_type_str = 'Array_voidptr'
13081308
elem_type_str = 'voidptr'
13091309
}
1310-
g.type_definitions.writeln('${g.static_non_parallel}int ${fn_name}(${left_type_str} a, ${elem_type_str} v); // auto')
1310+
g.type_definitions.writeln('${g.static_non_parallel}int ${fn_name}(${left_type_str} a, ${elem_type_str} v);')
13111311
fn_builder.writeln('${g.static_non_parallel}int ${fn_name}(${left_type_str} a, ${elem_type_str} v) {')
13121312
fn_builder.writeln('\t${elem_type_str}* pelem = a.data;')
13131313
fn_builder.writeln('\tfor (int i = 0; i < a.len; ++i, ++pelem) {')
@@ -1351,7 +1351,7 @@ fn (mut g Gen) gen_array_index_methods() {
13511351
if elem_sym.kind == .function {
13521352
elem_type_str = 'voidptr'
13531353
}
1354-
g.type_definitions.writeln('${g.static_non_parallel}int ${fn_name}(${left_type_str} a, ${elem_type_str} v); // auto')
1354+
g.type_definitions.writeln('${g.static_non_parallel}int ${fn_name}(${left_type_str} a, ${elem_type_str} v);')
13551355
fn_builder.writeln('${g.static_non_parallel}int ${fn_name}(${left_type_str} a, ${elem_type_str} v) {')
13561356
fn_builder.writeln('\tfor (int i = 0; i < ${info.size}; ++i) {')
13571357
if elem_sym.kind == .string {

‎vlib/v/gen/c/assert.v‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ fn (mut g Gen) gen_assert_postfailure_mode(node ast.AssertStmt) {
125125
}
126126
g.writeln2('\t// TODO', '\t// Maybe print all vars in a test function if it fails?')
127127
if g.pref.assert_failure_mode != .continues {
128-
g.writeln('\t_v_panic(_SLIT("Assertion failed..."));')
128+
g.writeln('\t_v_panic(_S("Assertion failed..."));')
129129
}
130130
}
131131

@@ -173,7 +173,7 @@ fn (mut g Gen) gen_assert_metainfo(node ast.AssertStmt, kind AssertMetainfoKind)
173173
}
174174
}
175175
ast.CallExpr {
176-
g.writeln('\t${metaname}.op = _SLIT("call");')
176+
g.writeln('\t${metaname}.op = _S("call");')
177177
}
178178
else {}
179179
}

‎vlib/v/gen/c/assign.v‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn (mut g Gen) expr_with_opt_or_block(expr ast.Expr, expr_typ ast.Type, var_expr
2727
}
2828
g.writeln('if (${c_name(expr_var)}.state != 0) { // assign')
2929
if expr is ast.Ident && expr.or_expr.kind == .propagate_option {
30-
g.writeln('\tpanic_option_not_set(_SLIT("none"));')
30+
g.writeln('\tpanic_option_not_set(_S("none"));')
3131
} else {
3232
g.inside_or_block = true
3333
defer {
@@ -63,7 +63,7 @@ fn (mut g Gen) expr_opt_with_alias(expr ast.Expr, expr_typ ast.Type, ret_typ ast
6363

6464
ret_var := g.new_tmp_var()
6565
ret_styp := g.styp(ret_typ).replace('*', '_ptr')
66-
g.writeln('${ret_styp} ${ret_var} = {.state=2, .err=_const_none__, .data={EMPTY_STRUCT_INITIALIZATION}};')
66+
g.writeln('${ret_styp} ${ret_var} = {.state=2, .err=_const_none__, .data={E_STRUCT}};')
6767

6868
if expr !is ast.None {
6969
is_option_expr := expr_typ.has_flag(.option)

‎vlib/v/gen/c/auto_eq_methods.v‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fn (mut g Gen) gen_sumtype_equality_fn(left_type ast.Type) string {
6060
g.generated_eq_fns << left_no_ptr
6161

6262
info := left.sym.sumtype_info()
63-
g.definitions.writeln('bool ${ptr_styp}_sumtype_eq(${ptr_styp} a, ${ptr_styp} b); // auto')
63+
g.definitions.writeln('bool ${ptr_styp}_sumtype_eq(${ptr_styp} a, ${ptr_styp} b);')
6464

6565
left_typ := g.read_field(left_type, '_typ', 'a')
6666
right_typ := g.read_field(left_type, '_typ', 'b')
@@ -184,7 +184,7 @@ fn (mut g Gen) gen_struct_equality_fn(left_type ast.Type) string {
184184
g.generated_eq_fns << left_no_ptr
185185

186186
info := left.sym.struct_info()
187-
g.definitions.writeln('bool ${fn_name}_struct_eq(${ptr_styp} a, ${ptr_styp} b); // auto')
187+
g.definitions.writeln('bool ${fn_name}_struct_eq(${ptr_styp} a, ${ptr_styp} b);')
188188

189189
mut fn_builder := strings.new_builder(512)
190190
defer {
@@ -293,7 +293,7 @@ fn (mut g Gen) gen_alias_equality_fn(left_type ast.Type) string {
293293
g.generated_eq_fns << left_no_ptr
294294

295295
info := left.sym.info as ast.Alias
296-
g.definitions.writeln('bool ${ptr_styp}_alias_eq(${ptr_styp} a, ${ptr_styp} b); // auto')
296+
g.definitions.writeln('bool ${ptr_styp}_alias_eq(${ptr_styp} a, ${ptr_styp} b);')
297297

298298
mut fn_builder := strings.new_builder(512)
299299
fn_builder.writeln('inline bool ${ptr_styp}_alias_eq(${ptr_styp} a, ${ptr_styp} b) {')
@@ -354,7 +354,7 @@ fn (mut g Gen) gen_array_equality_fn(left_type ast.Type) string {
354354

355355
elem := g.unwrap(left.sym.array_info().elem_type)
356356
ptr_elem_styp := g.styp(elem.typ)
357-
g.definitions.writeln('bool ${ptr_styp}_arr_eq(${ptr_styp} a, ${ptr_styp} b); // auto')
357+
g.definitions.writeln('bool ${ptr_styp}_arr_eq(${ptr_styp} a, ${ptr_styp} b);')
358358

359359
mut fn_builder := strings.new_builder(512)
360360
fn_builder.writeln('inline bool ${ptr_styp}_arr_eq(${ptr_styp} a, ${ptr_styp} b) {')
@@ -442,7 +442,7 @@ fn (mut g Gen) gen_fixed_array_equality_fn(left_type ast.Type) string {
442442
if elem_info.is_fn_ret {
443443
arg_styp = ptr_styp[3..] // removes the _v_ prefix for returning fixed array
444444
}
445-
g.definitions.writeln('bool ${ptr_styp}_arr_eq(${arg_styp} a, ${arg_styp} b); // auto')
445+
g.definitions.writeln('bool ${ptr_styp}_arr_eq(${arg_styp} a, ${arg_styp} b);')
446446

447447
is_option := left_type.has_flag(.option)
448448
left := if is_option { 'a.data' } else { 'a' }
@@ -516,7 +516,7 @@ fn (mut g Gen) gen_map_equality_fn(left_type ast.Type) string {
516516

517517
value := g.unwrap(left.sym.map_info().value_type)
518518
ptr_value_styp := g.styp(value.typ)
519-
g.definitions.writeln('bool ${ptr_styp}_map_eq(${ptr_styp} a, ${ptr_styp} b); // auto')
519+
g.definitions.writeln('bool ${ptr_styp}_map_eq(${ptr_styp} a, ${ptr_styp} b);')
520520

521521
left_len := g.read_map_field_from_option(left.typ, 'len', 'a')
522522
right_len := g.read_map_field_from_option(left.typ, 'len', 'b')
@@ -545,7 +545,7 @@ fn (mut g Gen) gen_map_equality_fn(left_type ast.Type) string {
545545
}
546546
match kind {
547547
.string {
548-
fn_builder.writeln('\t\tif (!fast_string_eq(*(string*)map_get(${b}, k, &(string[]){_SLIT("")}), v)) {')
548+
fn_builder.writeln('\t\tif (!fast_string_eq(*(string*)map_get(${b}, k, &(string[]){_S("")}), v)) {')
549549
}
550550
.sum_type {
551551
eq_fn := g.gen_sumtype_equality_fn(value.typ)
@@ -608,7 +608,7 @@ fn (mut g Gen) gen_interface_equality_fn(left_type ast.Type) string {
608608
g.generated_eq_fns << left_no_ptr
609609

610610
info := left.sym.info
611-
g.definitions.writeln('${g.static_non_parallel}bool ${ptr_styp}_interface_eq(${ptr_styp} a, ${ptr_styp} b); // auto')
611+
g.definitions.writeln('${g.static_non_parallel}bool ${ptr_styp}_interface_eq(${ptr_styp} a, ${ptr_styp} b);')
612612

613613
mut fn_builder := strings.new_builder(512)
614614
defer {

‎vlib/v/gen/c/auto_free_methods.v‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fn (mut g Gen) gen_free_method(typ ast.Type) string {
8484
}
8585

8686
fn (mut g Gen) gen_free_for_interface(sym ast.TypeSymbol, info ast.Interface, styp string, fn_name string) {
87-
g.definitions.writeln('${g.static_non_parallel}void ${fn_name}(${styp}* it); // auto')
87+
g.definitions.writeln('${g.static_non_parallel}void ${fn_name}(${styp}* it);')
8888
mut fn_builder := strings.new_builder(128)
8989
defer {
9090
g.auto_fn_definitions << fn_builder.str()
@@ -106,7 +106,7 @@ fn (mut g Gen) gen_free_for_interface(sym ast.TypeSymbol, info ast.Interface, st
106106
}
107107

108108
fn (mut g Gen) gen_free_for_struct(typ ast.Type, info ast.Struct, styp string, fn_name string) {
109-
g.definitions.writeln('${g.static_non_parallel}void ${fn_name}(${styp}* it); // auto')
109+
g.definitions.writeln('${g.static_non_parallel}void ${fn_name}(${styp}* it);')
110110
mut fn_builder := strings.new_builder(128)
111111
defer {
112112
g.auto_fn_definitions << fn_builder.str()
@@ -176,7 +176,7 @@ fn (mut g Gen) gen_type_name_for_free_call(typ ast.Type) string {
176176
}
177177

178178
fn (mut g Gen) gen_free_for_array(info ast.Array, styp string, fn_name string) {
179-
g.definitions.writeln('${g.static_non_parallel}void ${fn_name}(${styp}* it); // auto')
179+
g.definitions.writeln('${g.static_non_parallel}void ${fn_name}(${styp}* it);')
180180
mut fn_builder := strings.new_builder(128)
181181
defer {
182182
g.auto_fn_definitions << fn_builder.str()
@@ -201,7 +201,7 @@ fn (mut g Gen) gen_free_for_array(info ast.Array, styp string, fn_name string) {
201201
}
202202

203203
fn (mut g Gen) gen_free_for_map(typ ast.Type, styp string, fn_name string) {
204-
g.definitions.writeln('${g.static_non_parallel}void ${fn_name}(${styp}* it); // auto')
204+
g.definitions.writeln('${g.static_non_parallel}void ${fn_name}(${styp}* it);')
205205
mut fn_builder := strings.new_builder(128)
206206
defer {
207207
g.auto_fn_definitions << fn_builder.str()

0 commit comments

Comments
 (0)