Skip to content

Reduce some nesting in cstruct_to_rs. #3

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

Merged
emilio merged 1 commit into from
Jun 1, 2016
Merged

Reduce some nesting in cstruct_to_rs. #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 9 additions & 17 deletions src/gen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,24 +883,16 @@ fn cstruct_to_rs(ctx: &mut GenCtx, name: &str, ci: CompInfo) -> Vec<P<ast::Item>

if ci.has_vtable {
let mut vffields = vec![];
let base_vftable = if !members.is_empty() {
if let CompMember::Field(ref fi) = members[0] {
match fi.ty {
TComp(ref ci2) => {
let ci2 = ci2.borrow();
if ci2.has_vtable {
Some(format!("_vftable_{}", ci2.name))
} else {
None
}
},
_ => None
let base_vftable = match members.get(0) {
Some(&CompMember::Field(FieldInfo { ty: TComp(ref ci2), .. })) => {
let ci2 = ci2.borrow();
if ci2.has_vtable {
Some(format!("_vftable_{}", ci2.name))
} else {
None
}
} else {
None
}
} else {
None
},
_ => None,
};

if let Some(ref base) = base_vftable {
Expand Down