Skip to content

Treat char as c_char #609

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
merged 1 commit into from
Apr 4, 2017
Merged

Treat char as c_char #609

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
36 changes: 4 additions & 32 deletions src/ir/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,38 +1090,10 @@ impl<'ctx> BindgenContext<'ctx> {
CXType_Bool => TypeKind::Int(IntKind::Bool),
CXType_Int => TypeKind::Int(IntKind::Int),
CXType_UInt => TypeKind::Int(IntKind::UInt),
CXType_SChar | CXType_Char_S |
CXType_UChar | CXType_Char_U => {
let spelling = ty.spelling();

debug_assert!(spelling.contains("char"),
"This is the canonical type, so no aliases or \
typedefs!");

let signed = match ty.kind() {
CXType_SChar | CXType_Char_S => true,
_ => false,
};

// Clang only gives us the signedness of the target platform.
//
// Match the spelling for common cases we can handle
// cross-platform.
match &*spelling {
"char" | "const char" => {
TypeKind::Int(IntKind::Char {
is_signed: signed,
})
},
_ => {
if signed {
TypeKind::Int(IntKind::SChar)
} else {
TypeKind::Int(IntKind::UChar)
}
},
}
}
CXType_Char_S => TypeKind::Int(IntKind::Char { is_signed: true }),
CXType_Char_U => TypeKind::Int(IntKind::Char { is_signed: false }),
CXType_SChar => TypeKind::Int(IntKind::SChar),
CXType_UChar => TypeKind::Int(IntKind::UChar),
CXType_Short => TypeKind::Int(IntKind::Short),
CXType_UShort => TypeKind::Int(IntKind::UShort),
CXType_WChar | CXType_Char16 => TypeKind::Int(IntKind::U16),
Expand Down