mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
cgen: support ==
, !=
on FixedArray (#6119)
This commit is contained in:
parent
2ad2b4c5ba
commit
078ab47a9a
@ -2117,6 +2117,29 @@ fn (mut g Gen) infix_expr(node ast.InfixExpr) {
|
||||
}
|
||||
g.expr(node.right)
|
||||
g.write(')')
|
||||
} else if node.op in [.eq, .ne] &&
|
||||
left_sym.kind == .array_fixed && right_sym.kind == .array_fixed {
|
||||
af := left_sym.info as table.ArrayFixed
|
||||
et := af.elem_type
|
||||
if !et.is_ptr() && !et.is_pointer() && !et.is_number() && et.idx() !in [table.bool_type_idx, table.char_type_idx] {
|
||||
verror('`==` on fixed array only supported with POD element types ATM')
|
||||
}
|
||||
g.write('(memcmp(')
|
||||
g.expr(node.left)
|
||||
g.write(', ')
|
||||
if node.right is ast.ArrayInit {
|
||||
s := g.typ(left_type)
|
||||
g.write('($s)')
|
||||
}
|
||||
g.expr(node.right)
|
||||
g.write(', sizeof(')
|
||||
g.expr(node.left)
|
||||
if node.op == .eq {
|
||||
g.write(')) == 0')
|
||||
} else if node.op == .ne {
|
||||
g.write(')) != 0')
|
||||
}
|
||||
g.write(')')
|
||||
} else if node.op in [.eq, .ne] && left_sym.kind == .map && right_sym.kind == .map {
|
||||
ptr_typ := g.gen_map_equality_fn(left_type)
|
||||
if node.op == .eq {
|
||||
@ -3653,6 +3676,12 @@ fn (mut g Gen) gen_expr_to_string(expr ast.Expr, etype table.Type) ?bool {
|
||||
if !is_p && str_method_expects_ptr {
|
||||
g.write('${str_fn_name}( &')
|
||||
}
|
||||
if expr is ast.ArrayInit {
|
||||
if expr.is_fixed {
|
||||
s := g.typ(expr.typ)
|
||||
g.write('($s)')
|
||||
}
|
||||
}
|
||||
g.expr(expr)
|
||||
if sym.kind == .struct_ && !sym_has_str_method {
|
||||
if is_p {
|
||||
@ -4681,11 +4710,15 @@ fn (mut g Gen) array_init(it ast.ArrayInit) {
|
||||
}
|
||||
if type_sym.kind == .array_fixed {
|
||||
g.write('{')
|
||||
for i, expr in it.exprs {
|
||||
g.expr(expr)
|
||||
if i != it.exprs.len - 1 {
|
||||
g.write(', ')
|
||||
if it.has_val {
|
||||
for i, expr in it.exprs {
|
||||
g.expr(expr)
|
||||
if i != it.exprs.len - 1 {
|
||||
g.write(', ')
|
||||
}
|
||||
}
|
||||
} else {
|
||||
g.write('0')
|
||||
}
|
||||
g.write('}')
|
||||
return
|
||||
|
@ -31,3 +31,13 @@ fn test_fixed_array_init() {
|
||||
assert typeof(d2) == '[3]f32'
|
||||
assert '$d2' == '[1.1, 2.2, 3.3]'
|
||||
}
|
||||
|
||||
fn test_fixed_type_init() {
|
||||
a := [2]int
|
||||
assert a == [2]int
|
||||
assert a == [0,0]!!
|
||||
assert a == a
|
||||
c := [3,3]!!
|
||||
assert a != c
|
||||
assert c == [3,3]!!
|
||||
}
|
||||
|
@ -23,6 +23,7 @@ fn test_fixed_array_can_be_assigned_to_a_struct_field() {
|
||||
ctx.vb = [1.1, x, 3.3, 4.4, 5.0, 6.0, 7.0, 8.9]!!
|
||||
assert ctx.vb[1] == x
|
||||
assert ctx.vb[7] == 8.9
|
||||
assert ctx.vb == ctx.vb
|
||||
/*
|
||||
println( ctx.vb[0] )
|
||||
println( ctx.vb[1] )
|
||||
|
Loading…
Reference in New Issue
Block a user