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: c2v infix fix

Browse Source
This commit is contained in:
Alexander Medvednikov 2022-06-01 06:14:28 +03:00
parent 84e375e38a
commit c54c9b817c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/v/gen/c/cgen.v
View File

@ -1825,7 +1825,7 @@ fn (mut g Gen) stmt(node ast.Stmt) {
g.global_decl(node) g.global_decl(node)
} }
ast.GotoLabel { ast.GotoLabel {
g.writeln('${c_name(node.name)}: {}') g.writeln('${c_name(node.name)}: ')
} }
ast.GotoStmt { ast.GotoStmt {
g.write_v_source_line_info(node.pos) g.write_v_source_line_info(node.pos)

8
vlib/v/gen/c/infix.v
View File

@ -87,6 +87,10 @@ fn (mut g Gen) infix_expr_eq_op(node ast.InfixExpr) {
right := g.unwrap(node.right_type) right := g.unwrap(node.right_type)
has_defined_eq_operator := g.table.has_method(left.sym, '==') has_defined_eq_operator := g.table.has_method(left.sym, '==')
has_alias_eq_op_overload := left.sym.info is ast.Alias && left.sym.has_method('==') has_alias_eq_op_overload := left.sym.info is ast.Alias && left.sym.has_method('==')
if g.pref.translated && !g.is_builtin_mod {
g.gen_plain_infix_expr(node)
return
}
if (left.typ.is_ptr() && right.typ.is_int()) || (right.typ.is_ptr() && left.typ.is_int()) { if (left.typ.is_ptr() && right.typ.is_int()) || (right.typ.is_ptr() && left.typ.is_int()) {
g.gen_plain_infix_expr(node) g.gen_plain_infix_expr(node)
} else if (left.typ.idx() == ast.string_type_idx || (!has_defined_eq_operator } else if (left.typ.idx() == ast.string_type_idx || (!has_defined_eq_operator
@ -291,6 +295,10 @@ fn (mut g Gen) infix_expr_cmp_op(node ast.InfixExpr) {
left := g.unwrap(node.left_type) left := g.unwrap(node.left_type)
right := g.unwrap(node.right_type) right := g.unwrap(node.right_type)
has_operator_overloading := g.table.has_method(left.sym, '<') has_operator_overloading := g.table.has_method(left.sym, '<')
if g.pref.translated && !g.is_builtin_mod {
g.gen_plain_infix_expr(node)
return
}
if left.sym.kind == .struct_ && (left.sym.info as ast.Struct).generic_types.len > 0 { if left.sym.kind == .struct_ && (left.sym.info as ast.Struct).generic_types.len > 0 {
if node.op in [.le, .ge] { if node.op in [.le, .ge] {
g.write('!') g.write('!')