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

interface: enable calling interface with multi-args

pull/2815/head
cloudsong 2019-11-19 23:27:32 +08:00 committed by Alexander Medvednikov
parent 4bbed4f910
commit 787f49b7a0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vlib/compiler/fn.v
View File

@ -722,6 +722,8 @@ fn (p mut Parser) fn_call(f mut Fn, method_ph int, receiver_var, receiver_type s
// we need to preappend "method(receiver, ...)" // we need to preappend "method(receiver, ...)"
if f.is_method { if f.is_method {
receiver := f.args.first() receiver := f.args.first()
mut receiver_is_interface := false
if receiver.typ.ends_with('er') { if receiver.typ.ends_with('er') {
// I absolutely love this syntax // I absolutely love this syntax
// `s.speak()` => // `s.speak()` =>
@ -740,7 +742,8 @@ fn (p mut Parser) fn_call(f mut Fn, method_ph int, receiver_var, receiver_type s
p.cgen.resetln('') p.cgen.resetln('')
var := p.expr_var.name var := p.expr_var.name
iname := f.args[0].typ // Speaker iname := f.args[0].typ // Speaker
p.gen('(($f.typ (*)())(${iname}_name_table[${var}._interface_idx][$idx]))(${var}._object)') p.gen('(($f.typ (*)())(${iname}_name_table[${var}._interface_idx][$idx]))(${var}._object')
receiver_is_interface = true
} }
} }
//println('r=$receiver.typ RT=$receiver_type') //println('r=$receiver.typ RT=$receiver_type')
@ -756,7 +759,10 @@ fn (p mut Parser) fn_call(f mut Fn, method_ph int, receiver_var, receiver_type s
if !p.expr_var.is_changed && receiver.is_mut { if !p.expr_var.is_changed && receiver.is_mut {
p.mark_var_changed(p.expr_var) p.mark_var_changed(p.expr_var)
} }
if !receiver_is_interface {
p.gen_method_call(receiver, receiver_type, cgen_name, f.typ, method_ph) p.gen_method_call(receiver, receiver_type, cgen_name, f.typ, method_ph)
}
} else { } else {
// Normal function call // Normal function call
p.gen('$cgen_name (') p.gen('$cgen_name (')