Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added pointer arrays option #1564

Merged
merged 5 commits into from
May 22, 2019
Merged

Added pointer arrays option #1564

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f1e94a
Added array_pointers to the builder
elichai May 20, 2019
b6cfdd8
Added array pointers codegen
elichai May 20, 2019
27ee59b
Added array pointers to the CLI
elichai May 20, 2019
d03960a
Added tests for array pointers
elichai May 20, 2019
e0efd59
Added tests with typedef for array pointers
elichai May 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/codegen/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3908,9 +3908,13 @@ mod utils {
// [1]: http://c0x.coding-guidelines.com/6.7.5.3.html
let arg_ty = match *arg_ty.canonical_type(ctx).kind() {
TypeKind::Array(t, _) => {
t.to_rust_ty_or_opaque(ctx, &())
.to_ptr(ctx.resolve_type(t).is_const())
},
let stream = if ctx.options().array_pointers_in_arguments {
(*arg_ty).to_rust_ty_or_opaque(ctx, &arg_item)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need the explicit dereference?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird. I did this because it complained but now it works without

} else {
t.to_rust_ty_or_opaque(ctx, &())
};
stream.to_ptr(ctx.resolve_type(t).is_const())
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is much more concise than the initial version :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks :)

TypeKind::Pointer(inner) => {
let inner = ctx.resolve_item(inner);
let inner_ty = inner.expect_type();
Expand Down