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

[]interface

pull/2705/head
Alexander Medvednikov 2019-11-08 17:59:01 +03:00
parent 6f95be60a1
commit cac719c078
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vlib/compiler/parser.v
View File

@ -1613,9 +1613,9 @@ fn (p mut Parser) var_expr(v Var) string {
// typ = p.index_expr(typ, fn_ph, v) // typ = p.index_expr(typ, fn_ph, v)
} }
} }
// a++ and a-- // `a++` and `a--`
if p.tok == .inc || p.tok == .dec { if p.tok == .inc || p.tok == .dec {
if !v.is_mut && !v.is_arg && !p.pref.translated { if !v.is_mut && !p.pref.translated {
p.error('`$v.name` is immutable') p.error('`$v.name` is immutable')
} }
if !v.is_changed { if !v.is_changed {
@ -1629,7 +1629,7 @@ fn (p mut Parser) var_expr(v Var) string {
p.gen(p.tok.str()) p.gen(p.tok.str())
p.fgen(p.tok.str()) p.fgen(p.tok.str())
p.next()// ++/-- p.next()// ++/--
// allow `a := c++` in translated code // allow `a := c++` in translated code TODO remove once c2v handles this
if p.pref.translated { if p.pref.translated {
//return p.index_expr(typ, fn_ph) //return p.index_expr(typ, fn_ph)
} }
@ -2324,6 +2324,10 @@ fn (p mut Parser) map_init() string {
// `nums := [1, 2, 3]` // `nums := [1, 2, 3]`
fn (p mut Parser) array_init() string { fn (p mut Parser) array_init() string {
expected_array_type := p.expected_type
//if p.fileis('interface_') {
//println('a exp='+p.expected_type)
//}
p.is_alloc = true p.is_alloc = true
p.check(.lsbr) p.check(.lsbr)
mut is_integer := p.tok == .number // for `[10]int` mut is_integer := p.tok == .number // for `[10]int`
@ -2380,7 +2384,17 @@ fn (p mut Parser) array_init() string {
} }
if val_typ != typ { if val_typ != typ {
if !p.check_types_no_throw(val_typ, typ) { if !p.check_types_no_throw(val_typ, typ) {
p.error('bad array element type `$val_typ` instead of `$typ`') mut ok := false
// `foo([cat, dog])` where foo is `fn foo([]Animal) {`
// `expected_type` is `[]Animaler`
if expected_array_type.ends_with('er') {
if p.satisfies_interface(expected_array_type, typ, false) {
ok = true
}
}
if !ok {
p.error('bad array element type `$val_typ` instead of `$typ`')
}
} }
} }
if p.tok != .rsbr && p.tok != .semicolon { if p.tok != .rsbr && p.tok != .semicolon {
@ -2391,15 +2405,7 @@ fn (p mut Parser) array_init() string {
i++ i++
// Repeat (a = [0;5] ) // Repeat (a = [0;5] )
if i == 1 && p.tok == .semicolon { if i == 1 && p.tok == .semicolon {
p.warn('`[0 ; len]` syntax was removed. Use `[0].repeat(len)` instead') p.error('`[0 ; len]` syntax was removed. Use `[0].repeat(len)` instead')
p.check_space(.semicolon)
val := p.cgen.cur_line[pos..]
p.cgen.resetln(p.cgen.cur_line[..pos])
p.gen('array_repeat_old(& ($typ[]){ $val }, ')
p.check_types(p.bool_expression(), 'int')
p.gen(', sizeof($typ) )')
p.check(.rsbr)
return 'array_$typ'
} }
} }
p.check(.rsbr) p.check(.rsbr)

24
vlib/compiler/tests/interface_test.v
View File

@ -25,6 +25,7 @@ interface Speak2er {
struct Foo { struct Foo {
speaker Speaker speaker Speaker
speakers []Speaker
} }
fn perform_speak(s Speaker) { fn perform_speak(s Speaker) {
@ -34,14 +35,21 @@ fn perform_speak(s Speaker) {
assert name == 'Dog' || name == 'Cat' assert name == 'Dog' || name == 'Cat'
} }
fn test_perform_speak() { fn perform_speakers(speakers []Speaker) {
d := Dog{}
perform_speak(d) }
cat := Cat{}
perform_speak(cat) fn test_perform_speak() {
f := Foo { dog := Dog{}
//speaker: d perform_speak(dog)
} cat := Cat{}
perform_speak(cat)
//perform_speakers([dog, cat])
/*
f := Foo {
speaker: dog
}
*/
} }