mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

all: minor cleanup of optional and result (#16382)

Browse Source
This commit is contained in:
yuyi 2022-11-11 02:14:20 +08:00 committed by GitHub
parent 26d643fc5d
commit 196b01aef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlib/v/ast/types.v
View File

@ -282,6 +282,9 @@ pub fn (t Type) debug() []string {
if t.has_flag(.optional) { if t.has_flag(.optional) {
res << 'optional' res << 'optional'
} }
if t.has_flag(.result) {
res << 'result'
}
if t.has_flag(.variadic) { if t.has_flag(.variadic) {
res << 'variadic' res << 'variadic'
} }

2
vlib/v/checker/str.v
View File

@ -32,7 +32,7 @@ pub fn (mut c Checker) get_default_fmt(ftyp ast.Type, typ ast.Type) u8 {
} }
if ftyp in [ast.string_type, ast.bool_type] if ftyp in [ast.string_type, ast.bool_type]
|| sym.kind in [.enum_, .array, .array_fixed, .struct_, .map, .multi_return, .sum_type, .interface_, .none_] || sym.kind in [.enum_, .array, .array_fixed, .struct_, .map, .multi_return, .sum_type, .interface_, .none_]
|| ftyp.has_flag(.optional) || sym.has_method('str') { || ftyp.has_flag(.optional) || ftyp.has_flag(.result) || sym.has_method('str') {
return `s` return `s`
} else { } else {
return `_` return `_`

3
vlib/v/gen/c/auto_str_methods.v
View File

@ -67,6 +67,9 @@ fn (mut g Gen) get_str_fn(typ ast.Type) string {
if typ.has_flag(.optional) { if typ.has_flag(.optional) {
unwrapped.set_flag(.optional) unwrapped.set_flag(.optional)
} }
if typ.has_flag(.result) {
unwrapped.set_flag(.result)
}
styp := g.typ(unwrapped) styp := g.typ(unwrapped)
mut sym := g.table.sym(unwrapped) mut sym := g.table.sym(unwrapped)
mut str_fn_name := styp_to_str_fn_name(styp) mut str_fn_name := styp_to_str_fn_name(styp)