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

checker/cgen: fix mutable generic fn args

pull/5209/head
joe-conigliaro 2020-06-04 19:32:31 +10:00
parent 8a24d7d723
commit 41dca3ef58
No known key found for this signature in database
GPG Key ID: C12F7136C08206F1
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1749,7 +1749,7 @@ fn (mut c Checker) stmts(stmts []ast.Stmt) {
} }
pub fn (mut c Checker) unwrap_generic(typ table.Type) table.Type { pub fn (mut c Checker) unwrap_generic(typ table.Type) table.Type {
if typ == table.t_type { if typ.idx() == table.t_type_idx {
return c.cur_generic_type return c.cur_generic_type
} }
return typ return typ

7
vlib/v/gen/fn.v
View File

@ -315,8 +315,9 @@ fn (mut g Gen) fn_args(args []table.Arg, is_variadic bool) ([]string, []string)
no_names := args.len > 0 && args[0].name == 'arg_1' no_names := args.len > 0 && args[0].name == 'arg_1'
for i, arg in args { for i, arg in args {
caname := c_name(arg.name) caname := c_name(arg.name)
arg_type_sym := g.table.get_type_symbol(arg.typ) typ := g.unwrap_generic(arg.typ).set_nr_muls(arg.typ.nr_muls())
mut arg_type_name := g.typ(arg.typ) // arg_type_sym.name.replace('.', '__') arg_type_sym := g.table.get_type_symbol(typ)
mut arg_type_name := g.typ(typ) // arg_type_sym.name.replace('.', '__')
// if arg.name == 'xxx' { // if arg.name == 'xxx' {
// println('! ' + arg_type_name) // println('! ' + arg_type_name)
// } // }
@ -400,7 +401,7 @@ fn (mut g Gen) call_expr(node ast.CallExpr) {
} }
pub fn (mut g Gen) unwrap_generic(typ table.Type) table.Type { pub fn (mut g Gen) unwrap_generic(typ table.Type) table.Type {
if typ == table.t_type { if typ.idx() == table.t_type_idx {
return g.cur_generic_type return g.cur_generic_type
} }
return typ return typ

12
vlib/v/parser/fn.v
View File

@ -371,8 +371,10 @@ fn (mut p Parser) fn_args() ([]table.Arg, bool) {
} }
pos := p.tok.position() pos := p.tok.position()
mut arg_type := p.parse_type() mut arg_type := p.parse_type()
if is_mut && arg_type != table.t_type { if is_mut {
p.check_fn_mutable_arguments(arg_type, pos) if arg_type != table.t_type {
p.check_fn_mutable_arguments(arg_type, pos)
}
// if arg_type.is_ptr() { // if arg_type.is_ptr() {
// p.error('cannot mut') // p.error('cannot mut')
// } // }
@ -421,8 +423,10 @@ fn (mut p Parser) fn_args() ([]table.Arg, bool) {
} }
pos := p.tok.position() pos := p.tok.position()
mut typ := p.parse_type() mut typ := p.parse_type()
if is_mut && typ != table.t_type { if is_mut {
p.check_fn_mutable_arguments(typ, pos) if typ != table.t_type {
p.check_fn_mutable_arguments(typ, pos)
}
typ = typ.set_nr_muls(1) typ = typ.set_nr_muls(1)
} }
if is_variadic { if is_variadic {

2
vlib/v/tests/generics_test.v
View File

@ -72,7 +72,7 @@ fn test_create() {
create<User>() create<User>()
create<City>() create<City>()
u := User{} u := User{}
//gen_arg<User>(mut u) gen_arg<User>(mut u)
} }
/* /*