vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

all: rename result to _result (#14232)
ci/woodpecker/push/vc Pipeline was successful Details
ci/woodpecker/push/docker Pipeline was successful Details
ci/woodpecker/push/arch Pipeline was successful Details

Daniel Däschle 2022-04-30 16:10:30 +02:00 committed by Jef Roosens
parent b90c59d90c
commit 91a9137b36
Signed by: Jef Roosens
GPG Key ID: B75D4F293C7052DB
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/builtin/option.v
View File

@ -121,7 +121,7 @@ fn opt_ok(data voidptr, mut option Option, size int) {
} }
} }
struct result { struct _result {
is_error bool is_error bool
err IError = none__ err IError = none__
// Data is trailing after err // Data is trailing after err
@ -129,9 +129,9 @@ struct result {
// derived Result_xxx types // derived Result_xxx types
} }
fn result_ok(data voidptr, mut res result, size int) { fn _result_ok(data voidptr, mut res _result, size int) {
unsafe { unsafe {
*res = result{} *res = _result{}
// use err to get the end of ResultBase and then memcpy into it // use err to get the end of ResultBase and then memcpy into it
vmemcpy(&u8(&res.err) + sizeof(IError), data, size) vmemcpy(&u8(&res.err) + sizeof(IError), data, size)
} }

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

@ -31,6 +31,7 @@ const (
cmp_str = ['eq', 'ne', 'gt', 'lt', 'ge', 'le'] cmp_str = ['eq', 'ne', 'gt', 'lt', 'ge', 'le']
// when operands are switched // when operands are switched
cmp_rev = ['eq', 'ne', 'lt', 'gt', 'le', 'ge'] cmp_rev = ['eq', 'ne', 'lt', 'gt', 'le', 'ge']
result_name = '_result'
) )
fn string_array_to_map(a []string) map[string]bool { fn string_array_to_map(a []string) map[string]bool {
@ -980,7 +981,7 @@ fn (mut g Gen) optional_type_name(t ast.Type) (string, string) {
fn (mut g Gen) result_type_name(t ast.Type) (string, string) { fn (mut g Gen) result_type_name(t ast.Type) (string, string) {
base := g.base_type(t) base := g.base_type(t)
mut styp := 'result_$base' mut styp := '${c.result_name}_$base'
if t.is_ptr() { if t.is_ptr() {
styp = styp.replace('*', '_ptr') styp = styp.replace('*', '_ptr')
} }
@ -4039,10 +4040,10 @@ fn (mut g Gen) return_stmt(node ast.Return) {
return return
} }
} }
// handle promoting error/function returning 'result' // handle promoting error/function returning result
if fn_return_is_result { if fn_return_is_result {
ftyp := g.typ(node.types[0]) ftyp := g.typ(node.types[0])
mut is_regular_result := ftyp == 'result' mut is_regular_result := ftyp == c.result_name
if is_regular_result || node.types[0] == ast.error_type_idx { if is_regular_result || node.types[0] == ast.error_type_idx {
if !isnil(g.fn_decl) && g.fn_decl.is_test { if !isnil(g.fn_decl) && g.fn_decl.is_test {
test_error_var := g.new_tmp_var() test_error_var := g.new_tmp_var()
@ -4215,10 +4216,10 @@ fn (mut g Gen) return_stmt(node ast.Return) {
node.types[0].has_flag(.result) node.types[0].has_flag(.result)
} }
} }
if fn_return_is_result && !expr_type_is_result && return_sym.name != 'result' { if fn_return_is_result && !expr_type_is_result && return_sym.name != c.result_name {
styp := g.base_type(g.fn_decl.return_type) styp := g.base_type(g.fn_decl.return_type)
g.writeln('$ret_typ $tmpvar;') g.writeln('$ret_typ $tmpvar;')
g.write('result_ok(&($styp[]) { ') g.write('${c.result_name}_ok(&($styp[]) { ')
if !g.fn_decl.return_type.is_ptr() && node.types[0].is_ptr() { if !g.fn_decl.return_type.is_ptr() && node.types[0].is_ptr() {
if !(node.exprs[0] is ast.Ident && !g.is_amp) { if !(node.exprs[0] is ast.Ident && !g.is_amp) {
g.write('*') g.write('*')
@ -4230,7 +4231,7 @@ fn (mut g Gen) return_stmt(node ast.Return) {
g.write(', ') g.write(', ')
} }
} }
g.writeln(' }, (result*)(&$tmpvar), sizeof($styp));') g.writeln(' }, ($c.result_name*)(&$tmpvar), sizeof($styp));')
g.write_defer_stmts_when_needed() g.write_defer_stmts_when_needed()
g.autofree_scope_vars(node.pos.pos - 1, node.pos.line_nr, true) g.autofree_scope_vars(node.pos.pos - 1, node.pos.line_nr, true)
g.writeln('return $tmpvar;') g.writeln('return $tmpvar;')
@ -4723,7 +4724,7 @@ fn (mut g Gen) write_init_function() {
} }
const ( const (
builtins = ['string', 'array', 'DenseArray', 'map', 'Error', 'IError', 'Option', 'result'] builtins = ['string', 'array', 'DenseArray', 'map', 'Error', 'IError', 'Option', result_name]
) )
fn (mut g Gen) write_builtin_types() { fn (mut g Gen) write_builtin_types() {
@ -5160,7 +5161,7 @@ fn (mut g Gen) or_block(var_name string, or_block ast.OrExpr, return_type ast.Ty
styp := g.typ(g.fn_decl.return_type) styp := g.typ(g.fn_decl.return_type)
err_obj := g.new_tmp_var() err_obj := g.new_tmp_var()
g.writeln('\t$styp $err_obj;') g.writeln('\t$styp $err_obj;')
g.writeln('\tmemcpy(&$err_obj, &$cvar_name, sizeof(result));') g.writeln('\tmemcpy(&$err_obj, &$cvar_name, sizeof($c.result_name));')
g.writeln('\treturn $err_obj;') g.writeln('\treturn $err_obj;')
} }
} }