cgen: fix error for struct with reference alias field (#13380)

pull/12662/head
yuyi 2022-02-06 16:52:36 +08:00 committed by GitHub
parent 4e13ee22e9
commit ece73836aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 1 deletions

View File

@ -916,7 +916,8 @@ fn (mut g Gen) gen_str_for_struct(info ast.Struct, styp string, str_fn_name stri
funcprefix += 'isnil(it.${c_name(field.name)})' funcprefix += 'isnil(it.${c_name(field.name)})'
funcprefix += ' ? _SLIT("nil") : ' funcprefix += ' ? _SLIT("nil") : '
// struct, floats and ints have a special case through the _str function // struct, floats and ints have a special case through the _str function
if sym.kind != .struct_ && !field.typ.is_int_valptr() && !field.typ.is_float_valptr() { if sym.kind !in [.struct_, .alias] && !field.typ.is_int_valptr()
&& !field.typ.is_float_valptr() {
funcprefix += '*' funcprefix += '*'
} }
} }

View File

@ -4530,6 +4530,12 @@ fn (mut g Gen) cast_expr(node ast.CastExpr) {
g.gen_optional_error(node.typ, node.expr) g.gen_optional_error(node.typ, node.expr)
} else { } else {
g.write('(${cast_label}(') g.write('(${cast_label}(')
if sym.kind == .alias && g.table.final_sym(node.typ).kind == .string {
ptr_cnt := node.typ.nr_muls() - node.expr_type.nr_muls()
if ptr_cnt > 0 {
g.write('&'.repeat(ptr_cnt))
}
}
g.expr(node.expr) g.expr(node.expr)
if node.expr is ast.IntegerLiteral { if node.expr is ast.IntegerLiteral {
if node.typ in [ast.u64_type, ast.u32_type, ast.u16_type] { if node.typ in [ast.u64_type, ast.u32_type, ast.u16_type] {

View File

@ -85,6 +85,9 @@ fn (mut g Gen) gen_expr_to_string(expr ast.Expr, etype ast.Type) {
g.expr(expr) g.expr(expr)
g.write(')') g.write(')')
} else if typ == ast.string_type { } else if typ == ast.string_type {
if etype.is_ptr() {
g.write('*')
}
g.expr(expr) g.expr(expr)
} else if typ == ast.bool_type { } else if typ == ast.bool_type {
g.expr(expr) g.expr(expr)

View File

@ -0,0 +1,13 @@
type SS = string
struct ST {
data &SS
}
fn test_struct_with_reference_alias_fields() {
mut val := ST{
data: &SS('hi')
}
println(val.data)
assert '$val.data' == 'hi'
}