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

checker: disable op overloading on structures for translated code (#14209)

playX 2022-04-28 17:46:46 +00:00 committed by Jef Roosens
parent 134b594e4d
commit 59ddaa9ede
Signed by: Jef Roosens
GPG Key ID: B75D4F293C7052DB
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vlib/v/checker/checker.v
View File

@ -702,13 +702,11 @@ pub fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
&& c.table.sym((left_sym.info as ast.Alias).parent_type).is_primitive() { && c.table.sym((left_sym.info as ast.Alias).parent_type).is_primitive() {
left_sym = c.table.sym((left_sym.info as ast.Alias).parent_type) left_sym = c.table.sym((left_sym.info as ast.Alias).parent_type)
} }
if c.pref.translated && node.op in [.plus, .minus, .mul] if c.pref.translated && node.op in [.plus, .minus, .mul]
&& left_type.is_any_kind_of_pointer() && left_type.is_any_kind_of_pointer() && right_type.is_any_kind_of_pointer() {
&& (right_type.is_any_kind_of_pointer() || right_type.is_int()) {
return_type = left_type return_type = left_type
} } else if !c.pref.translated && left_sym.kind == .alias && left_sym.info is ast.Alias
// Check if the alias type is not a primitive then allow using operator overloading for aliased `arrays` and `maps`
else if !c.pref.translated && left_sym.kind == .alias && left_sym.info is ast.Alias
&& !(c.table.sym((left_sym.info as ast.Alias).parent_type).is_primitive()) { && !(c.table.sym((left_sym.info as ast.Alias).parent_type).is_primitive()) {
if left_sym.has_method(node.op.str()) { if left_sym.has_method(node.op.str()) {
if method := left_sym.find_method(node.op.str()) { if method := left_sym.find_method(node.op.str()) {
@ -745,7 +743,8 @@ pub fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
} }
} }
} }
if left_sym.kind in [.array, .array_fixed, .map, .struct_] {
if !c.pref.translated && left_sym.kind in [.array, .array_fixed, .map, .struct_] {
if left_sym.has_method_with_generic_parent(node.op.str()) { if left_sym.has_method_with_generic_parent(node.op.str()) {
if method := left_sym.find_method_with_generic_parent(node.op.str()) { if method := left_sym.find_method_with_generic_parent(node.op.str()) {
return_type = method.return_type return_type = method.return_type
@ -762,7 +761,7 @@ pub fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
c.error('mismatched types `$left_name` and `$right_name`', left_right_pos) c.error('mismatched types `$left_name` and `$right_name`', left_right_pos)
} }
} }
} else if right_sym.kind in [.array, .array_fixed, .map, .struct_] { } else if !c.pref.translated && right_sym.kind in [.array, .array_fixed, .map, .struct_] {
if right_sym.has_method_with_generic_parent(node.op.str()) { if right_sym.has_method_with_generic_parent(node.op.str()) {
if method := right_sym.find_method_with_generic_parent(node.op.str()) { if method := right_sym.find_method_with_generic_parent(node.op.str()) {
return_type = method.return_type return_type = method.return_type