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

cgen: fix array of reference sumtype index() (#14812)

Browse Source
This commit is contained in:
yuyi 2022-06-21 17:37:54 +08:00 committed by GitHub
parent f08c768c8e
commit cab6355a38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vlib/v/gen/c/array.v
View File

@ -858,10 +858,18 @@ fn (mut g Gen) gen_array_index_methods() {
fn_builder.writeln('\t\tif (${ptr_typ}_struct_eq(*pelem, v)) {')
} else if elem_sym.kind == .interface_ {
ptr_typ := g.equality_fn(info.elem_type)
fn_builder.writeln('\t\tif (${ptr_typ}_interface_eq(*pelem, v)) {')
if info.elem_type.is_ptr() {
fn_builder.writeln('\t\tif (${ptr_typ}_interface_eq(**pelem, *v)) {')
} else {
fn_builder.writeln('\t\tif (${ptr_typ}_interface_eq(*pelem, v)) {')
}
} else if elem_sym.kind == .sum_type {
ptr_typ := g.equality_fn(info.elem_type)
fn_builder.writeln('\t\tif (${ptr_typ}_sumtype_eq(*pelem, v)) {')
if info.elem_type.is_ptr() {
fn_builder.writeln('\t\tif (${ptr_typ}_sumtype_eq(**pelem, *v)) {')
} else {
fn_builder.writeln('\t\tif (${ptr_typ}_sumtype_eq(*pelem, v)) {')
}
} else if elem_sym.kind == .alias {
ptr_typ := g.equality_fn(info.elem_type)
fn_builder.writeln('\t\tif (${ptr_typ}_alias_eq(*pelem, v)) {')

12
vlib/v/tests/array_of_reference_sumtype_append_test.v → vlib/v/tests/array_of_reference_sumtype_test.v
View File

@ -1,11 +1,14 @@
struct Element {
AbstractNode
mut:
name string
value string
attributes []&Attribute
}
struct Attribute {
AbstractNode
mut:
name string
value string
}
@ -21,7 +24,11 @@ pub fn (mut n AbstractNode) append_child(child &Node) {
n.child_nodes << child
}
fn test_array_of_reference_sumtype_append() {
pub fn (n &AbstractNode) has_child(child &Node) int {
return n.child_nodes.index(child)
}
fn test_array_of_reference_sumtype() {
mut parent := &Element{
name: 'parent'
}
@ -30,6 +37,9 @@ fn test_array_of_reference_sumtype_append() {
}
parent.append_child(child)
ret := parent.has_child(child)
println(ret)
dump(parent)
assert parent.child_nodes[0].name == 'child'
assert ret == 0
}