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

checker: fix treating C structs with capitalized fields as embeds (#8343)

Browse Source
This commit is contained in:
spaceface 2021-01-25 17:47:14 +01:00 committed by GitHub
parent cb04e6dccc
commit daff085033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlib/v/checker/checker.v
View File

@ -2081,7 +2081,8 @@ pub fn (mut c Checker) selector_expr(mut selector_expr ast.SelectorExpr) table.T
mut unknown_field_msg := 'type `$sym.name` has no field or method `$field_name`'
mut has_field := false
mut field := table.Field{}
if field_name.len > 0 && field_name[0].is_capital() && sym.info is table.Struct {
if field_name.len > 0 && field_name[0].is_capital() && sym.info is table.Struct
&& sym.language == .v {
// x.Foo.y => access the embedded struct
sym_info := sym.info as table.Struct
for embed in sym_info.embeds {

1
vlib/v/tests/project_with_c_code/main.v
View File

@ -5,4 +5,5 @@ import mod1
fn main() {
res := mod1.vadd(1, 2)
println(res)
assert res == 1003
}

4
vlib/v/tests/project_with_c_code/mod1/c/header.h
View File

@ -3,4 +3,8 @@
int cadd(int a, int b);
struct MyStruct {
int UppercaseField;
};
#endif

9
vlib/v/tests/project_with_c_code/mod1/wrapper.v
View File

@ -5,8 +5,13 @@ module mod1
#include "header.h"
fn C.cadd(int,int) int
struct C.MyStruct {
UppercaseField int
}
fn C.cadd(int, int) int
pub fn vadd(a int, b int) int {
return 1000 + C.cadd(a,b)
x := C.MyStruct{ 100 }
return 900 + x.UppercaseField + C.cadd(a, b)
}