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: minor optimization of index_expr()

Browse Source
This commit is contained in:
yuyi 2020-06-30 20:11:59 +08:00 committed by GitHub
parent a45ad47841
commit 628f13f1c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 105 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

215
vlib/v/gen/cgen.v
View File

@ -2136,12 +2136,9 @@ fn (mut g Gen) if_expr(node ast.IfExpr) {
} }
fn (mut g Gen) index_expr(node ast.IndexExpr) { fn (mut g Gen) index_expr(node ast.IndexExpr) {
// TODO else doesn't work with sum types
mut is_range := false
match node.index { match node.index {
ast.RangeExpr { ast.RangeExpr {
sym := g.table.get_type_symbol(node.left_type) sym := g.table.get_type_symbol(node.left_type)
is_range = true
if sym.kind == .string { if sym.kind == .string {
g.write('string_substr(') g.write('string_substr(')
g.expr(node.left) g.expr(node.left)
@ -2176,130 +2173,128 @@ fn (mut g Gen) index_expr(node ast.IndexExpr) {
g.write('.len') g.write('.len')
} }
g.write(')') g.write(')')
return
} }
else {} else {
} sym := g.table.get_type_symbol(node.left_type)
if !is_range { left_is_ptr := node.left_type.is_ptr()
sym := g.table.get_type_symbol(node.left_type) if node.left_type.has_flag(.variadic) {
left_is_ptr := node.left_type.is_ptr()
if node.left_type.has_flag(.variadic) {
g.expr(node.left)
g.write('.args')
g.write('[')
g.expr(node.index)
g.write(']')
} else if sym.kind == .array {
info := sym.info as table.Array
elem_type_str := g.typ(info.elem_type)
// `vals[i].field = x` is an exception and requires `array_get`:
// `(*(Val*)array_get(vals, i)).field = x;`
is_selector := node.left is ast.SelectorExpr
if g.is_assign_lhs && !is_selector && node.is_setter {
g.is_array_set = true
g.write('array_set(')
if !left_is_ptr {
g.write('&')
}
g.expr(node.left) g.expr(node.left)
g.write(', ') g.write('.args')
g.write('[')
g.expr(node.index) g.expr(node.index)
mut need_wrapper := true g.write(']')
/* } else if sym.kind == .array {
match node.right { info := sym.info as table.Array
ast.EnumVal, ast.Ident { elem_type_str := g.typ(info.elem_type)
// `&x` is enough for variables and enums // `vals[i].field = x` is an exception and requires `array_get`:
// `&(Foo[]){ ... }` is only needed for function calls and literals // `(*(Val*)array_get(vals, i)).field = x;`
need_wrapper = false is_selector := node.left is ast.SelectorExpr
if g.is_assign_lhs && !is_selector && node.is_setter {
g.is_array_set = true
g.write('array_set(')
if !left_is_ptr {
g.write('&')
}
g.expr(node.left)
g.write(', ')
g.expr(node.index)
mut need_wrapper := true
/*
match node.right {
ast.EnumVal, ast.Ident {
// `&x` is enough for variables and enums
// `&(Foo[]){ ... }` is only needed for function calls and literals
need_wrapper = false
}
else {}
}
*/
if need_wrapper {
g.write(', &($elem_type_str[]) { ')
} else {
g.write(', &')
}
// `x[0] *= y`
if g.assign_op != .assign &&
g.assign_op in token.assign_tokens &&
info.elem_type != table.string_type {
// TODO move this
g.write('*($elem_type_str*)array_get(')
if left_is_ptr {
g.write('*')
}
g.expr(node.left)
g.write(', ')
g.expr(node.index)
g.write(') ')
op := match g.assign_op {
.mult_assign { '*' }
.plus_assign { '+' }
.minus_assign { '-' }
.div_assign { '/' }
.xor_assign { '^' }
.mod_assign { '%' }
.or_assign { '|' }
.and_assign { '&' }
.left_shift_assign { '<<' }
.right_shift_assign { '>>' }
else { '' }
}
g.write(op)
} }
else {}
}
*/
if need_wrapper {
g.write(', &($elem_type_str[]) { ')
} else { } else {
g.write(', &') g.write('(*($elem_type_str*)array_get(')
}
// `x[0] *= y`
if g.assign_op != .assign &&
g.assign_op in token.assign_tokens &&
info.elem_type != table.string_type {
// TODO move this
g.write('*($elem_type_str*)array_get(')
if left_is_ptr { if left_is_ptr {
g.write('*') g.write('*')
} }
g.expr(node.left) g.expr(node.left)
g.write(', ') g.write(', ')
g.expr(node.index) g.expr(node.index)
g.write(') ') g.write('))')
op := match g.assign_op { }
.mult_assign { '*' } } else if sym.kind == .map {
.plus_assign { '+' } info := sym.info as table.Map
.minus_assign { '-' } elem_type_str := g.typ(info.value_type)
.div_assign { '/' } if g.is_assign_lhs && !g.is_array_set {
.xor_assign { '^' } g.is_array_set = true
.mod_assign { '%' } g.write('map_set(')
.or_assign { '|' } if !left_is_ptr {
.and_assign { '&' } g.write('&')
.left_shift_assign { '<<' }
.right_shift_assign { '>>' }
else { '' }
} }
g.write(op) g.expr(node.left)
g.write(', ')
g.expr(node.index)
g.write(', &($elem_type_str[]) { ')
} else if g.inside_map_postfix || g.inside_map_infix {
zero := g.type_default(info.value_type)
g.write('(*($elem_type_str*)map_get_and_set(')
if !left_is_ptr {
g.write('&')
}
g.expr(node.left)
g.write(', ')
g.expr(node.index)
g.write(', &($elem_type_str[]){ $zero }))\n')
} else {
zero := g.type_default(info.value_type)
g.write('(*($elem_type_str*)map_get(')
g.expr(node.left)
g.write(', ')
g.expr(node.index)
g.write(', &($elem_type_str[]){ $zero }))\n')
} }
} else if sym.kind == .string && !node.left_type.is_ptr() {
g.write('string_at(')
g.expr(node.left)
g.write(', ')
g.expr(node.index)
g.write(')')
} else { } else {
g.write('(*($elem_type_str*)array_get(')
if left_is_ptr {
g.write('*')
}
g.expr(node.left) g.expr(node.left)
g.write(', ') g.write('[')
g.expr(node.index) g.expr(node.index)
g.write('))') g.write(']')
} }
} else if sym.kind == .map {
info := sym.info as table.Map
elem_type_str := g.typ(info.value_type)
if g.is_assign_lhs && !g.is_array_set {
g.is_array_set = true
g.write('map_set(')
if !left_is_ptr {
g.write('&')
}
g.expr(node.left)
g.write(', ')
g.expr(node.index)
g.write(', &($elem_type_str[]) { ')
} else if g.inside_map_postfix || g.inside_map_infix {
zero := g.type_default(info.value_type)
g.write('(*($elem_type_str*)map_get_and_set(')
if !left_is_ptr {
g.write('&')
}
g.expr(node.left)
g.write(', ')
g.expr(node.index)
g.write(', &($elem_type_str[]){ $zero }))\n')
} else {
zero := g.type_default(info.value_type)
g.write('(*($elem_type_str*)map_get(')
g.expr(node.left)
g.write(', ')
g.expr(node.index)
g.write(', &($elem_type_str[]){ $zero }))\n')
}
} else if sym.kind == .string && !node.left_type.is_ptr() {
g.write('string_at(')
g.expr(node.left)
g.write(', ')
g.expr(node.index)
g.write(')')
} else {
g.expr(node.left)
g.write('[')
g.expr(node.index)
g.write(']')
} }
} }
} }