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

vfmt: support for 64bit int 2

Browse source
This commit is contained in:
kbkpbot 2025-09-13 17:04:10 +08:00
parent c221b3226b
commit 98d207fdd0
8 changed files with 103 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/tools/check_os_api_parity.v
View file

@ -99,7 +99,7 @@ fn gen_api_for_module_in_os(mod_name string, os_ pref.OS) string {
fn_mod := s.modname()
if fn_mod == mod_name {
fn_signature := b.table.stringify_fn_decl(&s, mod_name, map[string]string{},
false)
false, false)
fline := '${fn_mod}: ${fn_signature}'
res << fline
}

3
cmd/tools/vdoc/document/utils.v
View file

@ -142,7 +142,8 @@ pub fn (mut d Doc) stmt_signature(stmt ast.Stmt) string {
return 'module ${stmt.name}'
}
ast.FnDecl {
return d.table.stringify_fn_decl(&stmt, d.fmt.cur_mod, d.fmt.mod2alias, false)
return d.table.stringify_fn_decl(&stmt, d.fmt.cur_mod, d.fmt.mod2alias, false,
false)
}
else {
d.fmt.out = strings.new_builder(1000)

11
cmd/tools/vfmt.v
View file

@ -27,6 +27,7 @@ struct FormatOptions {
is_worker bool // true *only* in the worker processes. Note: workers can crash.
is_backup bool // make a `file.v.bak` copy *before* overwriting a `file.v` in place with `-w`
in_process bool // do not fork a worker process; potentially faster, but more prone to crashes for invalid files
is_new_int bool // Forcefully cast the `int` type in @[translated] modules or in the definition of `C.func` to the `i32` type.
mut:
diff_cmd string // filled in when -diff or -verify is passed
}
@ -55,6 +56,7 @@ fn main() {
is_verify: '-verify' in args
is_backup: '-backup' in args
in_process: '-inprocess' in args
is_new_int: '-new_int' in args
}
if term_colors {
os.setenv('VCOLORS', 'always', true)
@ -184,7 +186,9 @@ fn (foptions &FormatOptions) vlog(msg string) {
fn (foptions &FormatOptions) formated_content_from_file(prefs &pref.Preferences, file string) string {
mut table := ast.new_table()
file_ast := parser.parse_file(file, mut table, .parse_comments, prefs)
formated_content := fmt.fmt(file_ast, mut table, prefs, foptions.is_debug)
formated_content := fmt.fmt(file_ast, mut table, prefs, foptions.is_debug,
new_int: foptions.is_new_int
)
return formated_content
}
@ -202,7 +206,9 @@ fn (foptions &FormatOptions) format_file(file string) {
prefs, mut table := setup_preferences_and_table()
file_ast := parser.parse_file(file, mut table, .parse_comments, prefs)
// checker.new_checker(table, prefs).check(file_ast)
formatted_content := fmt.fmt(file_ast, mut table, prefs, foptions.is_debug)
formatted_content := fmt.fmt(file_ast, mut table, prefs, foptions.is_debug,
new_int: foptions.is_new_int
)
os.write_file(vfmt_output_path, formatted_content) or { panic(err) }
foptions.vlog('fmt.fmt worked and ${formatted_content.len} bytes were written to ${vfmt_output_path} .')
eprintln('${formatted_file_token}${vfmt_output_path}')
@ -216,6 +222,7 @@ fn (foptions &FormatOptions) format_pipe() {
// checker.new_checker(table, prefs).check(file_ast)
formatted_content := fmt.fmt(file_ast, mut table, prefs, foptions.is_debug,
source_text: input_text
new_int: foptions.is_new_int
)
print(formatted_content)
flush_stdout()

38
vlib/v/ast/str.v
View file

@ -72,7 +72,7 @@ pub fn (node &CallExpr) fkey() string {
}
// These methods are used only by vfmt, vdoc, and for debugging.
pub fn (t &Table) stringify_anon_decl(node &AnonFn, cur_mod string, m2a map[string]string) string {
pub fn (t &Table) stringify_anon_decl(node &AnonFn, cur_mod string, m2a map[string]string, new_int bool) string {
mut f := strings.new_builder(30)
f.write_string('fn ')
if node.inherited_vars.len > 0 {
@ -92,11 +92,11 @@ pub fn (t &Table) stringify_anon_decl(node &AnonFn, cur_mod string, m2a map[stri
}
f.write_string('] ')
}
t.stringify_fn_after_name(node.decl, mut f, cur_mod, m2a)
t.stringify_fn_after_name(node.decl, mut f, cur_mod, m2a, new_int)
return f.str()
}
pub fn (t &Table) stringify_fn_decl(node &FnDecl, cur_mod string, m2a map[string]string, needs_wrap bool) string {
pub fn (t &Table) stringify_fn_decl(node &FnDecl, cur_mod string, m2a map[string]string, needs_wrap bool, new_int bool) string {
mut f := strings.new_builder(30)
if node.is_pub {
f.write_string('pub ')
@ -119,6 +119,9 @@ pub fn (t &Table) stringify_fn_decl(node &FnDecl, cur_mod string, m2a map[string
}
f.write_string(node.receiver.name + ' ')
styp = util.no_cur_mod(styp, cur_mod)
if new_int && styp == 'int' {
styp = 'i32'
}
f.write_string(styp + ') ')
} else if node.is_static_type_method {
mut styp := util.no_cur_mod(t.type_to_code(node.receiver.typ.clear_flag(.shared_f)),
@ -137,11 +140,11 @@ pub fn (t &Table) stringify_fn_decl(node &FnDecl, cur_mod string, m2a map[string
if name in ['+', '-', '*', '/', '%', '<', '>', '==', '!=', '>=', '<='] {
f.write_string(' ')
}
t.stringify_fn_after_name(node, mut f, cur_mod, m2a)
t.stringify_fn_after_name(node, mut f, cur_mod, m2a, new_int)
return f.str()
}
fn (t &Table) stringify_fn_after_name(node &FnDecl, mut f strings.Builder, cur_mod string, m2a map[string]string) {
fn (t &Table) stringify_fn_after_name(node &FnDecl, mut f strings.Builder, cur_mod string, m2a map[string]string, new_int bool) {
mut add_para_types := true
if node.generic_names.len > 0 {
if node.is_method {
@ -176,6 +179,7 @@ fn (t &Table) stringify_fn_after_name(node &FnDecl, mut f strings.Builder, cur_m
if param.is_hidden {
continue
}
param_typ := if new_int && param.typ == int_type { i32_type } else { param.typ }
is_last_param := i == node.params.len - 1
is_type_only := param.name == ''
if param.on_newline {
@ -187,19 +191,20 @@ fn (t &Table) stringify_fn_after_name(node &FnDecl, mut f strings.Builder, cur_m
f.write_string(' ')
}
if param.is_mut {
f.write_string(param.typ.share().str() + ' ')
f.write_string(param_typ.share().str() + ' ')
}
f.write_string(param.name)
param_sym := t.sym(param.typ)
param_sym := t.sym(param_typ)
if param_sym.info is Struct && param_sym.info.is_anon {
if param.typ.has_flag(.option) {
if param_typ.has_flag(.option) {
f.write_string(' ?')
} else {
f.write_string(' ')
}
f.write_string('struct {')
for field in param_sym.info.fields {
f.write_string(' ${field.name} ${t.type_to_str(field.typ)}')
field_typ := if new_int && field.typ == int_type { i32_type } else { field.typ }
f.write_string(' ${field.name} ${t.type_to_str(field_typ)}')
if field.has_default_expr {
f.write_string(' = ${field.default_expr}')
}
@ -209,14 +214,14 @@ fn (t &Table) stringify_fn_after_name(node &FnDecl, mut f strings.Builder, cur_m
}
f.write_string('}')
} else {
mut s := t.type_to_str(param.typ.clear_flag(.shared_f))
mut s := t.type_to_str(param_typ.clear_flag(.shared_f))
if param.is_mut {
if s.starts_with('&') && ((!param_sym.is_number() && param_sym.kind != .bool)
|| node.language != .v
|| (param.typ.is_ptr() && param_sym.kind == .struct)) {
|| (param_typ.is_ptr() && param_sym.kind == .struct)) {
s = s[1..]
} else if param.typ.is_ptr() && param_sym.kind == .struct && !s.contains('[') {
s = t.type_to_str(param.typ.clear_flag(.shared_f).deref())
} else if param_typ.is_ptr() && param_sym.kind == .struct && !s.contains('[') {
s = t.type_to_str(param_typ.clear_flag(.shared_f).deref())
}
}
s = util.no_cur_mod(s, cur_mod)
@ -239,7 +244,12 @@ fn (t &Table) stringify_fn_after_name(node &FnDecl, mut f strings.Builder, cur_m
}
f.write_string(')')
if node.return_type != void_type {
sreturn_type := util.no_cur_mod(t.type_to_str(node.return_type), cur_mod)
return_type := if new_int && node.return_type == int_type {
i32_type
} else {
node.return_type
}
sreturn_type := util.no_cur_mod(t.type_to_str(return_type), cur_mod)
short_sreturn_type := shorten_full_name_based_on_aliases(sreturn_type, m2a)
f.write_string(' ${short_sreturn_type}')
}

2
vlib/v/builder/builder.v
View file

@ -625,7 +625,7 @@ pub fn (mut b Builder) print_warnings_and_errors() {
if stmt is ast.FnDecl {
if stmt.name == fn_name {
fheader := b.table.stringify_fn_decl(&stmt, 'main', map[string]string{},
false)
false, false)
redefines << FunctionRedefinition{
fpath: file.path
fline: stmt.pos.line_nr

94
vlib/v/fmt/fmt.v
View file

@ -53,12 +53,16 @@ pub mut:
source_text string // can be set by `echo "println('hi')" | v fmt`, i.e. when processing source not from a file, but from stdin. In this case, it will contain the entire input text. You can use f.file.path otherwise, and read from that file.
global_processed_imports []string
branch_processed_imports []string
new_int bool // Forcefully cast the `int` type in @[translated] modules or in the definition of `C.func` to the `i32` type.
is_translated_module bool // @[translated]
is_c_function bool // C.func(...)
}
@[params]
pub struct FmtOptions {
pub:
source_text string
new_int bool
}
pub fn fmt(file ast.File, mut table ast.Table, pref_ &pref.Preferences, is_debug bool, options FmtOptions) string {
@ -70,6 +74,7 @@ pub fn fmt(file ast.File, mut table ast.Table, pref_ &pref.Preferences, is_debug
out: strings.new_builder(1000)
}
f.source_text = options.source_text
f.new_int = options.new_int
f.process_file_imports(file)
// Compensate for indent increase of toplevel stmts done in `f.stmts()`.
f.indent--
@ -107,7 +112,7 @@ pub fn fmt(file ast.File, mut table ast.Table, pref_ &pref.Preferences, is_debug
// vfmt has a special type_to_str which calls Table.type_to_str, but does extra work.
// Having it here and not in Table saves cpu cycles when not running the compiler in vfmt mode.
pub fn (f &Fmt) type_to_str_using_aliases(typ ast.Type, import_aliases map[string]string) string {
mut s := f.table.type_to_str_using_aliases(typ, import_aliases)
mut s := f.type_to_str_using_aliases(typ, import_aliases)
if s.contains('Result') {
println('${s}')
}
@ -118,9 +123,22 @@ pub fn (f &Fmt) type_to_str_using_aliases(typ ast.Type, import_aliases map[strin
}
pub fn (f &Fmt) type_to_str(typ ast.Type) string {
return f.table.type_to_str(typ)
return f.type_to_str(typ)
}
*/
fn (f &Fmt) type_to_str_using_aliases(typ ast.Type, import_aliases map[string]string) string {
if f.new_int && typ == ast.int_type && (f.is_translated_module || f.is_c_function) {
return f.type_to_str_using_aliases(ast.i32_type, import_aliases)
}
return f.table.type_to_str_using_aliases(typ, import_aliases)
}
fn (f &Fmt) type_to_str(typ ast.Type) string {
if f.new_int && typ == ast.int_type && (f.is_translated_module || f.is_c_function) {
return 'i32'
}
return f.table.type_to_str(typ)
}
pub fn (mut f Fmt) process_file_imports(file &ast.File) {
mut sb := strings.new_builder(128)
@ -232,7 +250,7 @@ fn (mut f Fmt) write_language_prefix(lang ast.Language) {
fn (mut f Fmt) write_generic_types(gtypes []ast.Type) {
if gtypes.len > 0 {
f.write('[')
gtypes_string := gtypes.map(f.table.type_to_str(it)).join(', ')
gtypes_string := gtypes.map(f.type_to_str(it)).join(', ')
f.write(gtypes_string)
f.write(']')
}
@ -882,7 +900,7 @@ pub fn (mut f Fmt) branch_stmt(node ast.BranchStmt) {
pub fn (mut f Fmt) comptime_for(node ast.ComptimeFor) {
typ := if node.typ != ast.void_type {
f.no_cur_mod(f.table.type_to_str_using_aliases(node.typ, f.mod2alias))
f.no_cur_mod(f.type_to_str_using_aliases(node.typ, f.mod2alias))
} else {
(node.expr as ast.Ident).name
}
@ -941,7 +959,7 @@ pub fn (mut f Fmt) const_decl(node ast.ConstDecl) {
f.write('${name} ')
if field.is_virtual_c {
// f.typ(field.typ)
f.write(f.table.type_to_str(field.typ))
f.write(f.type_to_str(field.typ))
} else {
f.write('= ')
f.expr(field.expr)
@ -1005,7 +1023,7 @@ pub fn (mut f Fmt) enum_decl(node ast.EnumDecl) {
}
mut name := node.name.after('.')
if node.typ != ast.int_type && node.typ != ast.invalid_type {
senum_type := f.table.type_to_str_using_aliases(node.typ, f.mod2alias)
senum_type := f.type_to_str_using_aliases(node.typ, f.mod2alias)
name += ' as ${senum_type}'
}
if node.fields.len == 0 && node.pos.line_nr == node.pos.last_line {
@ -1082,7 +1100,12 @@ pub fn (mut f Fmt) enum_decl(node ast.EnumDecl) {
pub fn (mut f Fmt) fn_decl(node ast.FnDecl) {
f.attrs(node.attrs)
f.write(f.table.stringify_fn_decl(&node, f.cur_mod, f.mod2alias, true))
if node.name.starts_with('C.') {
f.is_c_function = true
}
f.write(f.table.stringify_fn_decl(&node, f.cur_mod, f.mod2alias, true, f.new_int
&& (f.is_translated_module || f.is_c_function)))
f.is_c_function = false
// Handle trailing comments after fn header declarations
if node.no_body && node.end_comments.len > 0 {
first_comment := node.end_comments[0]
@ -1107,7 +1130,8 @@ pub fn (mut f Fmt) fn_decl(node ast.FnDecl) {
}
pub fn (mut f Fmt) anon_fn(node ast.AnonFn) {
f.write(f.table.stringify_anon_decl(&node, f.cur_mod, f.mod2alias)) // `Expr` instead of `ast.Expr` in mod ast
f.write(f.table.stringify_anon_decl(&node, f.cur_mod, f.mod2alias, f.new_int
&& (f.is_translated_module || f.is_c_function))) // `Expr` instead of `ast.Expr` in mod ast
f.fn_body(node.decl)
}
@ -1297,7 +1321,7 @@ pub fn (mut f Fmt) global_decl(node ast.GlobalDecl) {
f.write('= ')
f.expr(field.expr)
} else {
f.write('${f.table.type_to_str_using_aliases(field.typ, f.mod2alias)}')
f.write('${f.type_to_str_using_aliases(field.typ, f.mod2alias)}')
}
if node.is_block {
f.writeln('')
@ -1382,7 +1406,8 @@ pub fn (mut f Fmt) interface_decl(node ast.InterfaceDecl) {
for method in node.methods {
end_comments := method.comments.filter(it.pos.pos > method.pos.pos)
if end_comments.len > 0 {
method_str := f.table.stringify_fn_decl(&method, f.cur_mod, f.mod2alias, false).all_after_first('fn ')
method_str := f.table.stringify_fn_decl(&method, f.cur_mod, f.mod2alias, false,
f.new_int && (f.is_translated_module || f.is_c_function)).all_after_first('fn ')
method_comment_align.add_info(method_str.len, method.pos.line_nr, method.has_break_line)
}
}
@ -1430,7 +1455,7 @@ pub fn (mut f Fmt) calculate_alignment(fields []ast.StructField, mut type_align
// Calculate the alignments first
mut prev_state := AlignState.plain
for field in fields {
ft := f.no_cur_mod(f.table.type_to_str_using_aliases(field.typ, f.mod2alias))
ft := f.no_cur_mod(f.type_to_str_using_aliases(field.typ, f.mod2alias))
// Handle anon structs recursively
field_types << ft
attrs_len := inline_attrs_len(field.attrs)
@ -1477,7 +1502,7 @@ pub fn (mut f Fmt) calculate_alignment(fields []ast.StructField, mut type_align
}
pub fn (mut f Fmt) interface_field(field ast.StructField, mut type_align FieldAlign, mut comment_align FieldAlign) {
ft := f.no_cur_mod(f.table.type_to_str_using_aliases(field.typ, f.mod2alias))
ft := f.no_cur_mod(f.type_to_str_using_aliases(field.typ, f.mod2alias))
mut pre_cmts, mut end_cmts, mut next_line_cmts := []ast.Comment{}, []ast.Comment{}, []ast.Comment{}
for cmt in field.comments {
match true {
@ -1523,7 +1548,8 @@ pub fn (mut f Fmt) interface_method(method ast.FnDecl, mut comment_align FieldAl
f.comments(before_comments, level: .indent)
}
f.write('\t')
method_str := f.table.stringify_fn_decl(&method, f.cur_mod, f.mod2alias, false).all_after_first('fn ')
method_str := f.table.stringify_fn_decl(&method, f.cur_mod, f.mod2alias, false, f.new_int
&& (f.is_translated_module || f.is_c_function)).all_after_first('fn ')
f.write(method_str)
if end_comments.len > 0 {
f.write(' '.repeat(comment_align.max_len(method.pos.line_nr) - method_str.len + 1))
@ -1539,6 +1565,7 @@ pub fn (mut f Fmt) module_stmt(mod ast.Module) {
if mod.is_skipped {
return
}
f.is_translated_module = mod.attrs.any(it.name == 'translated')
f.attrs(mod.attrs)
f.writeln('module ${mod.short_name}\n')
if f.import_pos == 0 {
@ -1655,7 +1682,7 @@ pub fn (mut f Fmt) alias_type_decl(node ast.AliasTypeDecl) {
return
}
}
ptype := f.table.type_to_str_using_aliases(node.parent_type, f.mod2alias)
ptype := f.type_to_str_using_aliases(node.parent_type, f.mod2alias)
f.write('type ${node.name} = ${ptype}')
f.comments(node.comments, has_nl: false)
@ -1681,7 +1708,7 @@ pub fn (mut f Fmt) fn_type_decl(node ast.FnTypeDecl) {
f.write(arg.typ.share().str() + ' ')
}
f.write(arg.name)
mut s := f.no_cur_mod(f.table.type_to_str_using_aliases(arg.typ, f.mod2alias))
mut s := f.no_cur_mod(f.type_to_str_using_aliases(arg.typ, f.mod2alias))
if arg.is_mut {
if s.starts_with('&') {
s = s[1..]
@ -1706,8 +1733,7 @@ pub fn (mut f Fmt) fn_type_decl(node ast.FnTypeDecl) {
}
f.write(')')
if fn_info.return_type.idx() != ast.void_type_idx {
ret_str := f.no_cur_mod(f.table.type_to_str_using_aliases(fn_info.return_type,
f.mod2alias))
ret_str := f.no_cur_mod(f.type_to_str_using_aliases(fn_info.return_type, f.mod2alias))
f.write(' ${ret_str}')
} else if fn_info.return_type.has_flag(.option) {
f.write(' ?')
@ -1736,7 +1762,7 @@ pub fn (mut f Fmt) sum_type_decl(node ast.SumTypeDecl) {
mut variants := []Variant{cap: node.variants.len}
for i, variant in node.variants {
variants << Variant{f.table.type_to_str_using_aliases(variant.typ, f.mod2alias), i}
variants << Variant{f.type_to_str_using_aliases(variant.typ, f.mod2alias), i}
}
// The first variant is now used as the default variant when doing `a:= Sumtype{}`, i.e. a change in semantics.
// Sorting is disabled, because it is no longer a cosmetic change - it can change the default variant.
@ -1787,9 +1813,9 @@ pub fn (mut f Fmt) array_init(node ast.ArrayInit) {
if node.exprs.len == 0 && node.typ != 0 && node.typ != ast.void_type {
// `x := []string{}`
if node.alias_type != ast.void_type {
f.write(f.table.type_to_str_using_aliases(node.alias_type, f.mod2alias))
f.write(f.type_to_str_using_aliases(node.alias_type, f.mod2alias))
} else {
f.write(f.table.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(f.type_to_str_using_aliases(node.typ, f.mod2alias))
}
f.write('{')
if node.has_len {
@ -1976,7 +2002,7 @@ pub fn (mut f Fmt) array_init(node ast.ArrayInit) {
f.write('!')
return
}
f.write(f.table.type_to_str_using_aliases(node.elem_type, f.mod2alias))
f.write(f.type_to_str_using_aliases(node.elem_type, f.mod2alias))
if node.has_init {
f.write('{init: ')
f.expr(node.init_expr)
@ -1988,7 +2014,7 @@ pub fn (mut f Fmt) array_init(node ast.ArrayInit) {
}
pub fn (mut f Fmt) as_cast(node ast.AsCast) {
type_str := f.table.type_to_str_using_aliases(node.typ, f.mod2alias)
type_str := f.type_to_str_using_aliases(node.typ, f.mod2alias)
f.expr(node.expr)
f.write(' as ${type_str}')
}
@ -2070,7 +2096,7 @@ fn (mut f Fmt) write_generic_call_if_require(node ast.CallExpr) {
if node.concrete_types.len > 0 {
f.write('[')
for i, concrete_type in node.concrete_types {
mut name := f.table.type_to_str_using_aliases(concrete_type, f.mod2alias)
mut name := f.type_to_str_using_aliases(concrete_type, f.mod2alias)
tsym := f.table.sym(concrete_type)
if tsym.language != .js && !tsym.name.starts_with('JS.') {
name = f.short_module(name)
@ -2128,7 +2154,7 @@ pub fn (mut f Fmt) call_args(args []ast.CallArg) {
}
pub fn (mut f Fmt) cast_expr(node ast.CastExpr) {
typ := f.table.type_to_str_using_aliases(node.typ, f.mod2alias)
typ := f.type_to_str_using_aliases(node.typ, f.mod2alias)
if typ == 'voidptr' {
// `voidptr(0)` => `nil`
if node.expr is ast.IntegerLiteral {
@ -2166,7 +2192,7 @@ pub fn (mut f Fmt) chan_init(mut node ast.ChanInit) {
if is_mut {
f.write('mut ')
}
f.write(f.table.type_to_str_using_aliases(el_typ, f.mod2alias))
f.write(f.type_to_str_using_aliases(el_typ, f.mod2alias))
f.write('{')
if node.has_cap {
f.write('cap: ')
@ -2333,7 +2359,7 @@ pub fn (mut f Fmt) ident(node ast.Ident) {
if node.concrete_types.len > 0 {
f.write('[')
for i, concrete_type in node.concrete_types {
typ_name := f.table.type_to_str_using_aliases(concrete_type, f.mod2alias)
typ_name := f.type_to_str_using_aliases(concrete_type, f.mod2alias)
f.write(typ_name)
if i != node.concrete_types.len - 1 {
f.write(', ')
@ -2704,7 +2730,7 @@ pub fn (mut f Fmt) lock_expr(node ast.LockExpr) {
pub fn (mut f Fmt) map_init(node ast.MapInit) {
if node.keys.len == 0 && !node.has_update_expr {
if node.typ > ast.void_type {
f.write(f.table.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(f.type_to_str_using_aliases(node.typ, f.mod2alias))
}
if node.pos.line_nr == node.pos.last_line {
f.write('{}')
@ -2837,7 +2863,7 @@ pub fn (mut f Fmt) match_expr(node ast.MatchExpr) {
}
pub fn (mut f Fmt) offset_of(node ast.OffsetOf) {
f.write('__offsetof(${f.table.type_to_str_using_aliases(node.struct_type, f.mod2alias)}, ${node.field})')
f.write('__offsetof(${f.type_to_str_using_aliases(node.struct_type, f.mod2alias)}, ${node.field})')
}
pub fn (mut f Fmt) or_expr(node ast.OrExpr) {
@ -3001,13 +3027,13 @@ pub fn (mut f Fmt) size_of(node ast.SizeOf) {
if node.is_type && !node.guessed_type {
// the new form was explicitly written in the source code; keep it:
f.write('[')
f.write(f.table.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(f.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(']()')
return
}
if node.is_type {
f.write('(')
f.write(f.table.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(f.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(')')
} else {
f.write('(')
@ -3021,13 +3047,13 @@ pub fn (mut f Fmt) is_ref_type(node ast.IsRefType) {
if node.is_type && !node.guessed_type {
// the new form was explicitly written in the source code; keep it:
f.write('[')
f.write(f.table.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(f.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(']()')
return
}
if node.is_type {
f.write('(')
f.write(f.table.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(f.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(')')
} else {
f.write('(')
@ -3180,7 +3206,7 @@ pub fn (mut f Fmt) string_inter_literal(node ast.StringInterLiteral) {
pub fn (mut f Fmt) type_expr(node ast.TypeNode) {
if node.stmt == ast.empty_stmt {
f.write(f.table.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(f.type_to_str_using_aliases(node.typ, f.mod2alias))
} else {
f.struct_decl(ast.StructDecl{ fields: (node.stmt as ast.StructDecl).fields },
true)
@ -3191,7 +3217,7 @@ pub fn (mut f Fmt) type_of(node ast.TypeOf) {
f.write('typeof')
if node.is_type {
f.write('[')
f.write(f.table.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(f.type_to_str_using_aliases(node.typ, f.mod2alias))
f.write(']()')
} else {
f.write('(')

6
vlib/v/gen/golang/golang.v
View file

@ -905,13 +905,13 @@ pub fn (mut f Gen) enum_decl(node ast.EnumDecl) {
pub fn (mut f Gen) fn_decl(node ast.FnDecl) {
f.attrs(node.attrs)
f.write(f.table.stringify_fn_decl(&node, f.cur_mod, f.mod2alias, false).replace('fn ',
f.write(f.table.stringify_fn_decl(&node, f.cur_mod, f.mod2alias, false, false).replace('fn ',
'func '))
f.fn_body(node)
}
pub fn (mut f Gen) anon_fn(node ast.AnonFn) {
f.write(f.table.stringify_anon_decl(&node, f.cur_mod, f.mod2alias)) // `Expr` instead of `ast.Expr` in mod ast
f.write(f.table.stringify_anon_decl(&node, f.cur_mod, f.mod2alias, false)) // `Expr` instead of `ast.Expr` in mod ast
f.fn_body(node.decl)
}
@ -1136,7 +1136,7 @@ pub fn (mut f Gen) interface_field(field ast.StructField) {
pub fn (mut f Gen) interface_method(method ast.FnDecl) {
f.write('\t')
f.write(f.table.stringify_fn_decl(&method, f.cur_mod, f.mod2alias, false).after('fn '))
f.write(f.table.stringify_fn_decl(&method, f.cur_mod, f.mod2alias, false, false).after('fn '))
f.writeln('')
for param in method.params {
f.mark_types_import_as_used(param.typ)

3
vlib/v/help/common/fmt.txt
View file

@ -37,6 +37,9 @@ Options:
more memory, but it is faster for thousands of files, since
it avoids the interprocess communication overhead.
-new_int Forcefully cast the `int` type in @[translated] modules or
in the definition of `C.func` to the `i32` type.
Environment Variables:
VDIFF_CMD A custom tool and options that will be used for viewing the
differences between the original and the temporarily formatted